re structure

src/app/app.module.ts

@@ -27,7 +27,7 @@ import { NgxPaginationModule } from 'ngx-pagination';
 import { CustomerRoutingModule } from './customers/routing/customer-routing.module';
 import { LoadingInterceptor } from './core/interceptors/loading.interceptor';
 import { ProjectsModule } from './projects/projects.module';
-import { ProjectRoutingModule } from './projects/project-routing.module';
+import { ProjectRoutingModule } from './projects/routing/project-routing.module';
 import { ProjectFAQComponent } from './pages/project-faq/project-faq.component';
 import { PsmStartComponent } from './pages/psm-start/psm-start.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

src/app/employees/employees.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { EmployeesRoutingModule } from './employees-routing.module';
+import { EmployeesRoutingModule } from './routing/employees-routing.module';
 import { EmployeeProfileComponent } from './pages/employee-profile/employee-profile.component';
 import { EmployeeParticipatesComponent } from './pages/employee-participates/employee-participates.component';
 import { EmployeeParticipateComponent } from './components/employee-participate/employee-participate.component';

src/app/employees/employees-routing.module.ts → src/app/employees/routing/employees-routing.module.ts

-import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { ConfigurationService } from '../core/services/configuration/configuration.service';
-import { Observable } from 'rxjs';
-import { Result } from '../core/models/result';
-import { Employee } from './models/responses/employee';
-import { EmployeeProfileComponent } from './pages/employee-profile/employee-profile.component';
-import { EmployeeParticipateComponent } from './components/employee-participate/employee-participate.component';
-import { EmployeeParticipatesComponent } from './pages/employee-participates/employee-participates.component';
+import { EmployeeParticipatesComponent } from '../pages/employee-participates/employee-participates.component';
+import { EmployeeProfileComponent } from '../pages/employee-profile/employee-profile.component';
 
 const routes: Routes = [
   {path:"profile", component:EmployeeProfileComponent},

src/app/projects/components/modals/add-step-modal/add-step-modal.component.html

@@ -18,7 +18,7 @@
 
     <div class="mb-3 col-3">
       <label for="worker" class="form-label">عدد العمال المطلوب</label>
-      <input  id="worker" class="form-control" [(ngModel)]="request.stepInfo.NumberOfWorker" name="worker" required>
+      <input  id="worker" class="form-control" [(ngModel)]="request.stepInfo.numberOfWorker" name="worker" required>
     </div>
     
     </div>
@@ -36,7 +36,7 @@
         </div>
         
       <div class="mb-3 col-3">
-        <label for="duration" class="form-label">المدة</label>
+        <label for="duration" class="form-label"> المدة (أسبوع)</label>
         <input  id="duration" class="form-control" [(ngModel)]="request.stepInfo.duration" name="duration" required>
       </div>
 
@@ -46,8 +46,8 @@
     </div>
       </div>
     <div class="row ">
-      <button type="submit" class="btn btn-primary">إضافة</button>
-      <button  class="btn btn-seondary" (click)="onClose()" >إغلاق</button>
+      <button type="submit" [disabled]="projectForm.invalid" class="col-5 m-4 btn btn-primary">إضافة</button>
+      <div  class="col-5 m-4 btn btn-secondary" (click)="onClose()" >إغلاق</div>
    
     </div>
      </form>

src/app/projects/components/modals/add-step-modal/add-step-modal.component.ts

@@ -25,7 +25,7 @@ export class AddStepModalComponent implements OnInit {
       stepInfo: {
         startDate:new Date (),
         description :'',
-        NumberOfWorker :0,
+        numberOfWorker :0,
         stepName:'',
         duration:0
       },

src/app/projects/components/steps/step-row-item/step-row-item.component.html

@@ -20,7 +20,7 @@
           <div class="small mb-2 d-flex">
             <span class="text-muted mr-4 ">نسبة الانجاز {{step.currentCompletionRatio}}</span>
             <span class="text-muted mr-4 ">الثقل {{step.weight}}</span>
-            <span class="text-muted mr-4 ">عدد العمال المطلوب {{step.stepInfo.NumberOfWorker}}</span>
+            <span class="text-muted mr-4 ">عدد العمال المطلوب {{step.stepInfo.numberOfWorker}}</span>
           
           
           </div>

src/app/projects/models/valueObjects/StepInfo.ts

@@ -4,6 +4,6 @@ export interface StepInfo {
     description: string;
     startDate: Date;
     duration: number;
-    NumberOfWorker : number 
+    numberOfWorker : number 
 }
 

src/app/projects/pages/step-list/step-list.component.ts

@@ -64,7 +64,6 @@ export class StepListComponent {
       }
     }, (reason) => {
       
-      this.toastr.error("لقد حدث خطاء ما")
 
     });
   }

src/app/projects/project-routing.module.ts → src/app/projects/routing/project-routing.module.ts

 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { ProjectListComponent } from './pages/project-list/project-list.component';
-import { ProjectDetailsComponent } from './pages/project-details/project-details.component';
-import { ProjectCreateComponent } from './pages/project-create/project-create.component';
-import { StepListComponent } from './pages/step-list/step-list.component';
-import { ParticipantsListComponent } from './pages/participants-list/participants-list.component';
-import { FinancialSpendingComponent } from './pages/financial-spending/financial-spending.component';
-import { ParticipantChangesComponent } from './pages/participant-changes/participant-changes.component';
-import { ProjectAttachmentsComponent } from './pages/project-attachments/project-attachments.component';
+import { FinancialSpendingComponent } from '../pages/financial-spending/financial-spending.component';
+import { ParticipantChangesComponent } from '../pages/participant-changes/participant-changes.component';
+import { ParticipantsListComponent } from '../pages/participants-list/participants-list.component';
+import { ProjectAttachmentsComponent } from '../pages/project-attachments/project-attachments.component';
+import { ProjectCreateComponent } from '../pages/project-create/project-create.component';
+import { ProjectDetailsComponent } from '../pages/project-details/project-details.component';
+import { ProjectListComponent } from '../pages/project-list/project-list.component';
+import { StepListComponent } from '../pages/step-list/step-list.component';
 
 
 const routes: Routes = [

src/app/shared/sharedLayout/sidebar/sidebar.component.html

@@ -43,30 +43,6 @@
         </a>
       </li>
 
-      <li class="nav-heading">التقارير</li>
-
-      <li class="nav-item">
-        <a class="nav-link collapsed" data-bs-target="#Reports-nav" data-bs-toggle="collapse" href="#">
-          <i class="fe fe-printer"></i><span>إصدار تقرير</span><i class="bi bi-chevron-down ms-auto"></i>
-        </a>
-        <ul id="Reports-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
-          <li>
-            <a href="components-alerts.html">
-              <i class="fe fe-circle"></i><span>تقرير متابعة</span>
-            </a>
-          </li>
-          <li>
-            <a href="components-accordion.html">
-              <i class="fe fe-circle"></i><span> تقرير انجاز</span>
-            </a>
-          </li>
-          <li>
-            <a href="components-badges.html">
-              <i class="fe fe-circle"></i><span>تقرير انشغالية</span>
-            </a>
-          </li>
-        </ul>
-
       </li><!-- End Components Nav -->
       <li class="nav-heading">الجهات الطارحة</li>
       <li class="nav-item">

src/app/tracks/pages/track-details/track-details.component.ts

@@ -189,7 +189,7 @@ export class TrackDetailsComponent implements OnInit {
       stepInfo:s?.stepInfo ?? {
         startDate:new Date(),
         stepName :'',
-        NumberOfWorker:0,
+        numberOfWorker:0,
         description:'',
         duration:0,