Show endCustomer in facturation modal.

itenium-be · Dec 27, 2024 · e976d35 · e976d35
1 parent 1bc1070
commit e976d35
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/frontend/src/components/hooks/useProjects.tsx b/frontend/src/components/hooks/useProjects.tsx
@@ -126,6 +126,7 @@ export function mapToProjectMonth(confacState: ProjectMonthResolverState, projec
     consultant,
     client,
     partner: project.partner && confacState.clients.find(c => project.partner && c._id === project.partner.clientId),
+    endCustomer: !!project.endCustomer?.clientId ? confacState.clients.find(c=> c._id === project.endCustomer!.clientId): undefined,
     invoice: invoice || confacState.invoices.find(i => i.projectMonth && i.projectMonth.projectMonthId === projectMonth._id),
   };
 

diff --git a/frontend/src/components/project/controls/ProjectMonthModal.tsx b/frontend/src/components/project/controls/ProjectMonthModal.tsx
@@ -75,7 +75,7 @@ export const ProjectMonthModal = ({onClose, projectMonth}: ProjectMonthModalProp
         <ProjectDuration project={fullProjectMonth.project} />
 
         <hr />
-
+        
         <div className="project-client">
           {fullProjectMonth.client.name}
           <small><ProjectClientTariff projectClient={fullProjectMonth.project.client} /></small>
@@ -88,6 +88,13 @@ export const ProjectMonthModal = ({onClose, projectMonth}: ProjectMonthModalProp
           )}
         </div>
 
+        {fullProjectMonth.endCustomer &&  
+          <div>
+             <hr/>
+             <h5>{fullProjectMonth.endCustomer.name}</h5>
+          </div>
+        }
+
       </div>
     </Modal>
   );

diff --git a/frontend/src/components/project/models/FullProjectMonthModel.ts b/frontend/src/components/project/models/FullProjectMonthModel.ts
@@ -20,6 +20,7 @@ export class FullProjectMonthModel {
   consultant: ConsultantModel;
   client: ClientModel;
   partner?: ClientModel;
+  endCustomer?: ClientModel;
   invoice?: InvoiceModel;
 
   constructor(json: IFullProjectMonthModel) {
@@ -28,6 +29,7 @@ export class FullProjectMonthModel {
     this.consultant = json.consultant;
     this.client = json.client;
     this.partner = json.partner;
+    this.endCustomer = json.endCustomer;
     this.invoice = json.invoice;
   }
 }
@@ -40,5 +42,6 @@ export interface IFullProjectMonthModel {
   consultant: ConsultantModel;
   client: ClientModel;
   partner?: ClientModel;
+  endCustomer?: ClientModel;
   invoice?: InvoiceModel;
 }