From 0de0c7f2afee275435e8c04d34e0d23921d01c10 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Fri, 29 Sep 2023 17:29:59 +0200 Subject: [PATCH 1/2] :bug: Bouton radio qui louche --- .../Components/DesignSystem/RadioBox/classes.module.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/front/Components/DesignSystem/RadioBox/classes.module.scss b/src/front/Components/DesignSystem/RadioBox/classes.module.scss index 5052b70f..a464e51e 100644 --- a/src/front/Components/DesignSystem/RadioBox/classes.module.scss +++ b/src/front/Components/DesignSystem/RadioBox/classes.module.scss @@ -23,8 +23,8 @@ input[type="radio"]::before { content: ""; - width: 10px; - height: 10px; + width: 11px; + height: 11px; background-color: $turquoise-flash; border-radius: 100px; transform: scale(0); From 179b0294d2e688c71733d17d400cfb284ed5dd94 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Fri, 29 Sep 2023 17:45:31 +0200 Subject: [PATCH 2/2] :bug: Fixing completion % in folders --- src/front/Components/DesignSystem/UserFolder/index.tsx | 4 +++- .../Components/Layouts/Folder/FolderInformation/index.tsx | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx index 33a4ab42..3e2ca7da 100644 --- a/src/front/Components/DesignSystem/UserFolder/index.tsx +++ b/src/front/Components/DesignSystem/UserFolder/index.tsx @@ -142,7 +142,9 @@ export default class UserFolder extends React.Component { const documents = this.props.customer.documents.filter((document) => document.folder?.uid === this.props.folder.uid); const totalDocuments: number = 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) + + (this.getDocumentsByStatus(EDocumentStatus.DEPOSITED)?.length || 0); const depositedDocuments: number = totalDocuments - numberDocumentsAsked - numberDocumentsRefused; const percentage = (depositedDocuments / totalDocuments) * 100; diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 098250b2..77921a72 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -311,7 +311,10 @@ class FolderInformationClass extends BasePage { if (!documents) return 0; const totalDocuments = documents.length; 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 percentage = (depositedDocuments / totalDocuments) * 100; return isNaN(percentage) ? 0 : percentage;