4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

🐛 Hotfix percentage completion

Browse Source
This commit is contained in:
Maxime Lalo 2023-05-09 17:22:28 +02:00
parent 8e6903b2f9
commit 85c8136e5b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/front/Components/DesignSystem/UserFolder/index.tsx
View File

@ -139,11 +139,13 @@ export default class UserFolder extends React.Component<IProps, IState> {
private calculateDocumentsPercentageProgress(): number { private calculateDocumentsPercentageProgress(): number {
if (!this.props.customer.documents) return 0; if (!this.props.customer.documents) return 0;
const totalDocuments: number = this.props.customer.documents.length; 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 numberDocumentsAsked: number = this.getDocumentsByStatus(EDocumentStatus.ASKED)?.length || 0;
const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused;
const percentage = Math.round(((totalDocuments - numberDocumentsAsked) / totalDocuments) * 100); console.log(numberDocumentsRefused, numberDocumentsAsked, depositedDocuments, totalDocuments)
if(!percentage) return 0; const percentage = (depositedDocuments / totalDocuments) * 100;
return percentage; return isNaN(percentage) ? 0 : percentage;
} }
private getDocumentsByStatus(status: string): Document[] | null { private getDocumentsByStatus(status: string): Document[] | null {

5
src/front/Components/Layouts/Folder/FolderInformation/index.tsx
View File

@ -150,8 +150,9 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
const documents = this.state.selectedFolder?.documents; const documents = this.state.selectedFolder?.documents;
if (!documents) return 0; if (!documents) return 0;
const totalDocuments = documents.length; const totalDocuments = documents.length;
const askedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.ASKED).length; const refusedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.REFUSED).length ?? 0;
const depositedDocuments = totalDocuments - askedDocuments; const askedDocuments = documents.filter((document) => document.document_status === EDocumentStatus.ASKED).length ?? 0;
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;
} }