Merge branch 'dev' into staging
This commit is contained in:
commit
f2dc752428
@ -23,8 +23,8 @@
|
|||||||
|
|
||||||
input[type="radio"]::before {
|
input[type="radio"]::before {
|
||||||
content: "";
|
content: "";
|
||||||
width: 10px;
|
width: 11px;
|
||||||
height: 10px;
|
height: 11px;
|
||||||
background-color: $turquoise-flash;
|
background-color: $turquoise-flash;
|
||||||
border-radius: 100px;
|
border-radius: 100px;
|
||||||
transform: scale(0);
|
transform: scale(0);
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user