Merge branch 'dev' into staging

This commit is contained in:
Maxime Lalo 2023-09-29 17:45:44 +02:00
commit f2dc752428
3 changed files with 9 additions and 4 deletions

View File

@ -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);

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 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;

View File

@ -311,7 +311,10 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
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;