From 85c8136e5bf92c82194a9b0e4bbe229764e49c2d Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 9 May 2023 17:22:28 +0200 Subject: [PATCH] :bug: Hotfix percentage completion --- src/front/Components/DesignSystem/UserFolder/index.tsx | 10 ++++++---- .../Layouts/Folder/FolderInformation/index.tsx | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx index 289ef64c..59084cfa 100644 --- a/src/front/Components/DesignSystem/UserFolder/index.tsx +++ b/src/front/Components/DesignSystem/UserFolder/index.tsx @@ -139,11 +139,13 @@ export default class UserFolder extends React.Component { private calculateDocumentsPercentageProgress(): number { if (!this.props.customer.documents) return 0; const totalDocuments: number = this.props.customer.documents.length; + const numberDocumentsRefused: number = this.getDocumentsByStatus(EDocumentStatus.REFUSED)?.length || 0; const numberDocumentsAsked: number = this.getDocumentsByStatus(EDocumentStatus.ASKED)?.length || 0; - - const percentage = Math.round(((totalDocuments - numberDocumentsAsked) / totalDocuments) * 100); - if(!percentage) return 0; - return percentage; + const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused; + + console.log(numberDocumentsRefused, numberDocumentsAsked, depositedDocuments, totalDocuments) + const percentage = (depositedDocuments / totalDocuments) * 100; + return isNaN(percentage) ? 0 : percentage; } private getDocumentsByStatus(status: string): Document[] | null { diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index c4089796..a9efa69d 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -150,8 +150,9 @@ class FolderInformationClass extends BasePage { const documents = this.state.selectedFolder?.documents; if (!documents) return 0; const totalDocuments = documents.length; - const askedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.ASKED).length; - const depositedDocuments = totalDocuments - askedDocuments; + const refusedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.REFUSED).length ?? 0; + const askedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.ASKED).length ?? 0; + const depositedDocuments = totalDocuments - askedDocuments - refusedDocuments; const percentage = (depositedDocuments / totalDocuments) * 100; return isNaN(percentage) ? 0 : percentage; }