🐛 Fixing completion % in folders

This commit is contained in:
Maxime Lalo 2023-09-29 17:45:31 +02:00
parent 0de0c7f2af
commit 179b0294d2
2 changed files with 7 additions and 2 deletions

View File

@ -142,7 +142,9 @@ export default class UserFolder extends React.Component<IProps, IState> {
const documents = this.props.customer.documents.filter((document) => document.folder?.uid === this.props.folder.uid); const documents = this.props.customer.documents.filter((document) => document.folder?.uid === this.props.folder.uid);
const totalDocuments: number = documents.length; const totalDocuments: number = documents.length;
const numberDocumentsRefused: number = this.getDocumentsByStatus(EDocumentStatus.REFUSED)?.length || 0; const numberDocumentsRefused: number = this.getDocumentsByStatus(EDocumentStatus.REFUSED)?.length || 0;
const numberDocumentsAsked: number = this.getDocumentsByStatus(EDocumentStatus.ASKED)?.length || 0; const numberDocumentsAsked: number =
(this.getDocumentsByStatus(EDocumentStatus.ASKED)?.length || 0) +
(this.getDocumentsByStatus(EDocumentStatus.DEPOSITED)?.length || 0);
const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused; const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused;
const percentage = (depositedDocuments / totalDocuments) * 100; const percentage = (depositedDocuments / totalDocuments) * 100;

View File

@ -311,7 +311,10 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
if (!documents) return 0; if (!documents) return 0;
const totalDocuments = documents.length; const totalDocuments = documents.length;
const refusedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.REFUSED).length ?? 0; 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 askedDocuments =
documents.filter(
(document) => document.document_status === EDocumentStatus.ASKED || document.document_status === EDocumentStatus.DEPOSITED,
).length ?? 0;
const depositedDocuments = totalDocuments - askedDocuments - refusedDocuments; const depositedDocuments = totalDocuments - askedDocuments - refusedDocuments;
const percentage = (depositedDocuments / totalDocuments) * 100; const percentage = (depositedDocuments / totalDocuments) * 100;
return isNaN(percentage) ? 0 : percentage; return isNaN(percentage) ? 0 : percentage;