diff --git a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx index ec02f8f2..a140a18b 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx @@ -438,10 +438,11 @@ export default function DocumentTables(props: IProps) { ); const progress = useMemo(() => { - const total = askedDocuments.length + toValidateDocuments.length + validatedDocuments.length + refusedDocuments.length; + // Exclude refused documents from total - only count documents that are still in progress + const total = askedDocuments.length + toValidateDocuments.length + validatedDocuments.length; if (total === 0) return 0; return (validatedDocuments.length / total) * 100; - }, [askedDocuments.length, refusedDocuments.length, toValidateDocuments.length, validatedDocuments.length]); + }, [askedDocuments.length, toValidateDocuments.length, validatedDocuments.length]); if (documents.length === 0 && documentsNotary.length === 0) return ; diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 90749ed8..40092017 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -48,9 +48,11 @@ export default function FolderInformation(props: IProps) { let total = 0; let validatedDocuments = 0; folder?.customers?.forEach((customer: any) => { - const documents = customer.documents.filter((document: any) => document.depositor); - total += documents?.length ?? 0; - validatedDocuments += documents?.filter((document: any) => document.document_status === EDocumentStatus.VALIDATED).length ?? 0; + const documents = customer.documents; + // Only count documents that are not refused (still in progress) + const activeDocuments = documents?.filter((document: any) => document.document_status !== EDocumentStatus.REFUSED) ?? []; + total += activeDocuments.length; + validatedDocuments += activeDocuments.filter((document: any) => document.document_status === EDocumentStatus.VALIDATED).length; }); if (total === 0) return 0; const percentage = (validatedDocuments / total) * 100; diff --git a/src/front/Components/Layouts/Login/StepEmail/index.tsx b/src/front/Components/Layouts/Login/StepEmail/index.tsx index 17b108dd..85bead77 100644 --- a/src/front/Components/Layouts/Login/StepEmail/index.tsx +++ b/src/front/Components/Layouts/Login/StepEmail/index.tsx @@ -89,7 +89,7 @@ export default function StepEmail(props: IProps) {
- Pour les notaires et les colaborateurs : + Pour les notaires et les collaborateurs :