fix projects types info

src/app/customers/pages/customer-create/customer-create.component.html

@@ -7,29 +7,33 @@
         <div class="card p-4">
           <form class="php-email-form">
             <div class="row gy-4">
-
+              <div class="row text-center">
+                <p>
+                  إضافة جهة طارحة
+                </p>
+            </div>
               <div class="col-12">
                 <input type="text" [(ngModel)]="request.customerName"
-                name="name" class="form-control" placeholder="Your Name" required>
+                name="customerName" class="form-control" placeholder="اسم الجهة الطارحة" required>
               </div>
 
               <div class="col-6 ">
                 <input type="email" [(ngModel)]="request.email"
-                 class="form-control" name="email" placeholder="Your Email" required>
+                 class="form-control" name="email" placeholder="البريد الالكتروني" required>
               </div>
 
               <div class="col-6">
                 <input type="text" [(ngModel)]="request.address.streetName"
-                class="form-control" name="subject" placeholder="street Name" required>
+                class="form-control" name="streetName" placeholder="اسم الشارع" required>
               </div>
               <div class="col-6">
                 <input type="number" [(ngModel)]="request.address.streetNumber"
-                class="form-control" name="subject" placeholder="street Number" required>
+                class="form-control" name="streetNumber" placeholder="رقم الشارع" required>
               </div>
 
               <div class="col-6">
                 <input type="text" [(ngModel)]="request.address.city"
-                class="form-control" name="subject" placeholder="city " required>
+                class="form-control" name="city" placeholder="المدينة " required>
               </div>
 
  

src/app/customers/pages/customer-details/customer-details.component.html

@@ -48,10 +48,6 @@
           <form (ngSubmit)="saveCustomer()">
               <div class="row">
 
-                  <div class="mb-3 col-5  offset-1">
-                    <label for="stepName" class="form-label">الجهة الطارحة</label>
-                    <input type="text" name="stepName" id="stepName" class="form-control" [(ngModel)]="selectedCustomer.customerName" required>
-                  </div>
                   
                   <div class="mb-3 col-5">
                     <label for="expectedSpendingDate" class="form-label">البريد الاكتروني</label>

src/app/customers/pages/customer-details/customer-details.component.ts

@@ -64,7 +64,8 @@ export class CustomerDetailsComponent implements OnInit {
       
       let request : UpdateCustomerRequest ={
         ...this.selectedCustomer,
-        customerId: this.selectedCustomer.id
+        customerId: this.selectedCustomer.id,
+        customerName:this.selectedCustomer.customerName
       }
 
       this.customerService.updateCustomer(this.selectedCustomer.id,request).subscribe({

src/app/employees/services/employees.service.ts

@@ -9,7 +9,7 @@ import { EmployeeParticipate } from '../models/responses/employeeParticipate';
 import { GetEmployeeTrackHistoryRequest } from '../models/requests/getEmployeeTrackHistoryRequest';
 import { EmployeeTrack } from '../../tracks/models/responses/employeeTrack';
 import { UpdateEmplyeeWorkHours } from '../models/requests/updateEmployeeWorkHoursRequest';
-import { Department } from '../../projects/models/responses/Department';
+import { Department } from '../../projects/models/responses/department';
 
 @Injectable({
   providedIn: 'root'

src/app/projects-types/components/edit-type-modal/edit-type-modal.component.html

@@ -2,12 +2,12 @@
     <div class="row">
 
         <div class="mb-3 col-5  offset-1">
-          <label for="stepName" class="form-label">اسم النوع </label>
-          <input type="text" name="stepName" id="stepName" class="form-control" [(ngModel)]="selectedItem.typeName" required>
+          <label for="employee" class="form-label">عدد العمال المطلوب لهذا النوع  </label>
+          <input type="number" name="employee" id="employee" class="form-control"[min]="0"  [(ngModel)]="selectedItem.expectedNumberOfWorker" required>
         </div>
         <div class="mb-3 col-5 ">
-          <label for="local" class="form-label">الجهد لهذا النوع من المشاريع</label>
-          <input  id="local" class="form-control" [(ngModel)]="selectedItem.expectedEffort" name="local" required>
+          <label for="efort" class="form-label">الجهد لهذا النوع من المشاريع</label>
+          <input  id="efort" class="form-control" [(ngModel)]="selectedItem.expectedEffort" [min]="0" name="efort" required>
         </div>
     
         <div class="mb-3 col-9 offset-1">

src/app/projects-types/components/type-item/type-item.component.html

@@ -21,6 +21,13 @@
           
           </div>
         </div>
+        <div class="col-8 ">
+          <div class="small mb-2 d-flex">
+            <span class="text-muted flex-fill">عدد العمال  لهذا النوع من المشاريع :  {{item.expectedNumberOfWorker}}</span>
+          
+          </div>
+        </div>
+        
         <div  class="col-8 ">
           <div class="small mb-2 d-flex">
             <span class="text-muted">الجهد المتوقع لهذا النوع من المشاريع  {{item.expectedEffort}} ساعة عمل</span>

src/app/projects-types/models/requests/createNewTypeRequest.ts

@@ -3,5 +3,6 @@ export class CreateNewTypeRequest {
     typeName: string;
     description: string;
     expectedEffort: number;
+    expectedNumberOfWorker :number;
     
 }

src/app/projects-types/models/requests/updateProjectTypeRequest.ts

@@ -3,5 +3,6 @@ export class UpdateTypeRequest{
     typeName :string 
     description :String 
     expectedEffort :number 
+    expectedNumberOfWorker :number;
 }
 

src/app/projects-types/models/responses/projectType.ts

@@ -3,4 +3,6 @@ export class ProjectType {
     typeName  :string 
     description :string 
     expectedEffort :number 
+    expectedNumberOfWorker :number 
+   
 }
\ No newline at end of file

src/app/projects-types/pages/types-create/types-create.component.html

@@ -15,18 +15,22 @@
 
               <div class="col-12">
                 <input type="text" [(ngModel)]="request.typeName"
-                name="name" class="form-control" placeholder="اسم المشروع" required>
+                name="typeName" class="form-control" placeholder="اسم المشروع" required>
               </div>
 
               <div class="col-6 ">
                 <textarea type="tex" [(ngModel)]="request.description" [cols]="4" name="description"
-                 class="form-control" name="description" placeholder="الوصف" minlength="15" required>
+                 class="form-control" name="requestdescription" placeholder="الوصف" minlength="15" required>
                  </textarea>
               </div>
 
               <div class="col-6">
                 <input type="number" [(ngModel)]="request.expectedEffort"
-                class="form-control" name="subject" placeholder="ساعات العمل اللازمة" required  min="0" >
+                class="form-control" name="expectedNumberOfWorker" placeholder="ساعات العمل اللازمة" required  min="0" >
+              </div>
+              <div class="col-6">
+                <input type="number" [(ngModel)]="request.expectedNumberOfWorker"
+                class="form-control" name="expectedNumberOfWorker" placeholder="عدد العمال المتوقع" required  min="0" >
               </div>
  
  

src/app/projects-types/pages/types-detail/types-detail.component.html

@@ -15,6 +15,7 @@
                 <p><strong>الوصف</strong></p>
                 <p> {{type.description}}</p>
                 <p>عدد ساعات العمل المتوقعة لهذا النوع من المشاريع {{type.expectedEffort}}</p>
+                <p>عدد العمال المتوقع لهذا النوع من المشاريع {{type.expectedNumberOfWorker}}</p>
                 
                 
             </div>

src/app/projects/components/financial-item/financial-item.component.ts

 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { FinancialSpending } from '../../models/responses/FinancialSpending';
+import { FinancialSpending } from '../../models/responses/financialSpending';
 
 @Component({
   selector: 'financial-item',

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

 import { Component, Input } from '@angular/core';
-import { FinancialSpending } from '../../../models/responses/FinancialSpending';
+import { FinancialSpending } from '../../../models/responses/financialSpending';
 import { CreateFinancialSpendItemRequest } from '../../../models/requests/financial-reuqests/CreateFinancialSpendItemRequest';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrService } from 'ngx-toastr';

src/app/projects/models/responses/participationChange.ts

+export class ParticipationChange {
+
+    employeeId: number;
+    projectId: number;
+    partialTimeBefore: number;
+    partialTimeAfter: number;
+    roleBefore: string;
+    roleAfter: string;
+    changeDate: Date;
+}

src/app/projects/models/responses/project.ts

@@ -6,9 +6,9 @@ import { FinancialFund } from "../valueObjects/FinancialFund"
 import { ProjectInfo } from "../valueObjects/ProjectInfo"
 import { ProposalInfo } from "../valueObjects/proposalInfo"
 import { ProjectClassification } from "../valueObjects/ProjectClassification"
-import { Department } from "./Department"
+import { Department } from "./department"
 import { Step } from "./Step"
-import { FinancialSpending } from "./FinancialSpending"
+import { FinancialSpending } from "./financialSpending"
 import { ProjectType } from "../../../projects-types/models/responses/projectType"
 export class Project
 {

src/app/projects/pages/financial-spending/financial-spending.component.ts

 import { Component } from '@angular/core';
-import { FinancialSpending } from '../../models/responses/FinancialSpending';
+import { FinancialSpending } from '../../models/responses/financialSpending';
 import { FinancialSpendingService } from '../../services/financial-spending.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';

src/app/projects/pages/project-create/project-create.component.ts

@@ -10,7 +10,7 @@ import { ProjectService } from '../../services/project.service';
 import { CreateProjectRequest } from '../../models/requests/project-requests/createProjectRequest';
 import { ToastrComponentlessModule, ToastrService } from 'ngx-toastr';
 import { Router } from '@angular/router';
-import { Department } from '../../models/responses/Department';
+import { Department } from '../../models/responses/department';
 import { ProjectType } from '../../../projects-types/models/responses/projectType';
 import { ProjectsTypesService } from '../../../projects-types/services/projects-types.service';
 //#endregion imports

src/app/projects/services/financial-spending.service.ts

 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { ConfigurationService } from '../../core/services/configuration/configuration.service';
-import { FinancialSpending } from '../models/responses/FinancialSpending';
+import { FinancialSpending } from '../models/responses/financialSpending';
 import { Observable } from 'rxjs';
 import { CreateFinancialSpendItemRequest } from '../models/requests/financial-reuqests/CreateFinancialSpendItemRequest';
 import { GetFinancialSpendItemByProjecRequest } from '../models/requests/financial-reuqests/GetFinancialSpendItemByProjectRequest';

src/app/projects/services/project.service.ts

@@ -15,7 +15,7 @@ import { CancelProjectRequest } from '../models/requests/project-requests/Cancel
 import { RePlanProjectRequest } from '../models/requests/project-requests/RePlanProjectRequest';
 import { CreateProjectRequest } from '../models/requests/project-requests/createProjectRequest';
 import { AddAttachmentRequest } from '../models/requests/project-requests/AddAttachmentRequest';
-import { Attachment } from '../models/responses/Attachment';
+import { Attachment } from '../models/responses/attachment';
 import { CompleteProjectRequest } from '../models/requests/project-requests/completeProjectRequest';
 import { ChangeEmployeeParticipationRequest } from '../models/requests/project-requests/ChangeEmployeeParticipationRequest';
 

src/app/reports/componenets/financial-spend-table/financial-spend-table.component.ts

 import { Component, Input } from '@angular/core';
-import { FinancialSpending } from '../../../projects/models/responses/FinancialSpending';
+import { FinancialSpending } from '../../../projects/models/responses/financialSpending';
 
 @Component({
   selector: 'financial-spend-table',

src/app/reports/componenets/project-footer/project-footer.component.ts

 import { Component, Input } from '@angular/core';
 import { Customer } from '../../../customers/models/customer';
 import { Employee } from '../../../employees/models/responses/employee';
-import { Department } from '../../../projects/models/responses/Department';
+import { Department } from '../../../projects/models/responses/department';
 
 @Component({
   selector: 'project-footer',