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

…feature/contracts
code4romania · Sep 23, 2024 · 485a164 · 485a164
2 parents fc49240 + 2af2de6
commit 485a164
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/frontend/src/components/contracts/ContractTemplatePreview.tsx b/frontend/src/components/contracts/ContractTemplatePreview.tsx
@@ -2,11 +2,11 @@ import React, { useState } from 'react';
 import { InfoParagraph } from '../InfoParagraph';
 import { ContractTerms } from './ContractTerms';
 import { useTranslation } from 'react-i18next';
-import { Signatures } from '../Signatures';
 import { useOrganizationQuery } from '../../services/organization/organization.service';
 import LoadingContent from '../LoadingContent';
 import { OrganizationDataError } from '../OrganizationDataError';
 import { Control, FieldErrors, FieldValues, UseFormGetValues, UseFormReset } from 'react-hook-form';
+import { Signatures } from '../Signatures';
 
 export const ContractTemplatePreview = ({
   control,

diff --git a/frontend/src/pages/GenerateContract.tsx b/frontend/src/pages/GenerateContract.tsx
@@ -112,7 +112,6 @@ export const GenerateContract = () => {
           if (!volunteersData || !volunteersData[volunteer.id]) {
             return;
           }
-
           await addDocumentContract({
             documentTemplateId: selectedTemplate?.id as string,
             volunteerId: volunteer.id,
@@ -185,7 +184,7 @@ export const GenerateContract = () => {
     // if we have errors -> close the modal and keep in the list only the volunteers with errors
 
     // keep only the volunteers with errors in the list
-    if (contractsWithErrors) {
+    if (contractsWithErrors && Object.keys(contractsWithErrors).length > 0) {
       const volunteerIdsWithError = Object.keys(contractsWithErrors);
       setSelectedVolunteers((selectedVolunteers) => {
         return selectedVolunteers.filter((v) => volunteerIdsWithError.includes(v.id));
@@ -203,6 +202,14 @@ export const GenerateContract = () => {
       });
     }
 
+    // if we have no volunteers with errors -> navigate to all contracts
+    if (
+      !contractsWithErrors ||
+      (contractsWithErrors && Object.keys(contractsWithErrors).length === 0)
+    ) {
+      navigate('/documents/templates');
+    }
+
     // reset
     setSentContractsCount(0);
     // todo: close modal on success and navigate to all contracts
@@ -255,26 +262,34 @@ export const GenerateContract = () => {
             </>
           )}
           {/* success content */}
-          {!isLoadingAddDocumentContracts && !contractsWithErrors && (
-            <div className="flex flex-col gap-4">
-              <div className="flex flex-row justify-center">
-                <CheckCircleIcon width={70} height={70} className="text-yellow-500" />
+          {!isLoadingAddDocumentContracts &&
+            (!contractsWithErrors || Object.keys(contractsWithErrors).length === 0) && (
+              <div className="flex flex-col gap-4 items-center pb-4">
+                <div className="flex flex-row justify-center">
+                  <CheckCircleIcon width={70} height={70} className="text-yellow-500" />
+                </div>
+                <p className="text-center">Toate contractele au fost trimise cu succes!</p>
+                <Button
+                  label="Înapoi la lista de contracte"
+                  onClick={() => navigate('/documents/templates')}
+                  className="btn-primary"
+                />
               </div>
-              <p className="text-center">Toate contractele au fost trimise cu succes!</p>
-            </div>
-          )}
+            )}
           {/* error content */}
-          {!isLoadingAddDocumentContracts && contractsWithErrors && (
-            <div className="flex flex-col gap-2">
-              <div className="flex flex-row justify-center">
-                <ExclamationCircleIcon width={70} height={70} className="text-red-400" />
+          {!isLoadingAddDocumentContracts &&
+            contractsWithErrors &&
+            Object.keys(contractsWithErrors).length > 0 && (
+              <div className="flex flex-col gap-2">
+                <div className="flex flex-row justify-center">
+                  <ExclamationCircleIcon width={70} height={70} className="text-red-400" />
+                </div>
+                <p className="text-center">
+                  {`${t('modal.loading.description', { value1: sentContractsCount, value2: selectedVolunteers.length })}`}
+                </p>
+                <p className="text-center">{t('modal.error.description')}</p>
               </div>
-              <p className="text-center">
-                {`${t('modal.loading.description', { value1: sentContractsCount, value2: selectedVolunteers.length })}`}
-              </p>
-              <p className="text-center">{t('modal.error.description')}</p>
-            </div>
-          )}
+            )}
         </Modal>
       )}
     </>