Merge branch 'feature/contracts' of github.com:code4romania/teo into …

…feature/contracts
code4romania · Sep 20, 2024 · 12f0316 · 12f0316
2 parents d2cb41c + 584ba90
commit 12f0316
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/frontend/src/common/interfaces/document-contract.interface.ts b/frontend/src/common/interfaces/document-contract.interface.ts
@@ -5,5 +5,4 @@ export interface IAddDocumentContractDTO {
   documentEndDate: Date;
   volunteerId: string;
   documentTemplateId: string;
-  status: 'CREATED';
 }
diff --git a/frontend/src/common/interfaces/template.interface.ts b/frontend/src/common/interfaces/template.interface.ts
@@ -1,4 +1,3 @@
-import { IOrganization } from './organization.interface';
 import { IUser } from './user.interface';
 
 export interface ITemplate {

diff --git a/frontend/src/components/contracts/ContractTemplatePreview.tsx b/frontend/src/components/contracts/ContractTemplatePreview.tsx
@@ -158,7 +158,15 @@ export const ContractTemplatePreview = ({
         getValues={getValues}
         formErrors={formErrors}
       />
-      <Signatures />
+      <Signatures
+        organization={{
+          officialName: organization?.name || '',
+          registeredOffice: organization?.address || '',
+          CUI: organization?.cui || '',
+          legalRepresentativeName: organization?.legalReprezentativeFullName || '',
+          legalRepresentativeRole: organization?.legalReprezentativeRole || '',
+        }}
+      />
     </div>
   );
 };
diff --git a/frontend/src/pages/GenerateContract.tsx b/frontend/src/pages/GenerateContract.tsx
@@ -119,8 +119,6 @@ export const GenerateContract = () => {
             documentDate: volunteersData[volunteer.id].documentDate,
             documentStartDate: volunteersData[volunteer.id].documentPeriod[0],
             documentEndDate: volunteersData[volunteer.id].documentPeriod[1],
-            // todo: delete
-            status: volunteer.id === '907e1016-2d76-45d5-b274-549ae5b3ca13' ? 'CREATED' : '', // TODO: change to status enum value
           });
           success.push(volunteer.id);
           setSentContractsCount((prev) => prev + 1);