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

Merge branch 'staging' into dev

Browse Source
This commit is contained in:
Maxime Lalo 2023-12-15 15:32:38 +01:00
commit 43081856be
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/front/Components/DesignSystem/Document/DocumentNotary/index.tsx
View File

@ -52,7 +52,6 @@ class DocumentNotaryClass extends React.Component<IPropsClass, IState> {
private getDocumentsTitle() { private getDocumentsTitle() {
const documentFiles = this.props.document.files?.filter((file) => !file.archived_at); const documentFiles = this.props.document.files?.filter((file) => !file.archived_at);
if (documentFiles) { if (documentFiles) {
console.log(this.props.document);
if ( if (
documentFiles.length === 1 && documentFiles.length === 1 &&
(this.props.document.document_status === EDocumentStatus.VALIDATED || (this.props.document.document_status === EDocumentStatus.VALIDATED ||
@ -60,7 +59,7 @@ class DocumentNotaryClass extends React.Component<IPropsClass, IState> {
) { ) {
const fileName = documentFiles[0]?.file_path?.split("/").pop(); const fileName = documentFiles[0]?.file_path?.split("/").pop();
if (fileName && fileName.length > 20) { if (fileName && fileName.length > 20) {
return `${fileName.substring(0, 7)}...${fileName.substring(fileName.length - 7, fileName.length)}`; return `Nombre de documents : 1`;
} else { } else {
return fileName; return fileName;
} }
@ -74,7 +73,7 @@ class DocumentNotaryClass extends React.Component<IPropsClass, IState> {
return "Aucun document déposé"; return "Aucun document déposé";
} }
return `${documentFileLength} documents déposés`; return `Nombre de documents : ${documentFileLength}`;
} }
} else { } else {
return "Aucun document déposé"; return "Aucun document déposé";

23
src/front/Components/Layouts/Folder/AskDocuments/index.tsx
View File

@ -59,14 +59,19 @@ class AskDocumentsClass extends BasePage<IPropsClass, IState> {
<Form onSubmit={this.onFormSubmit}> <Form onSubmit={this.onFormSubmit}>
<div className={classes["form-container"]}> <div className={classes["form-container"]}>
<div className={classes["checkbox-container"]}> <div className={classes["checkbox-container"]}>
{this.state.documentTypes.map((documentType) => ( {this.state.documentTypes.map((documentType) => {
<CheckBox if (documentType.description && documentType.description.length > 1) {
name="document_types" return (
toolTip={documentType.description} <CheckBox
option={documentType} name="document_types"
key={documentType.value as string} toolTip={documentType.description}
/> option={documentType}
))} key={documentType.value as string}
/>
);
}
return <CheckBox name="document_types" option={documentType} key={documentType.value as string} />;
})}
</div> </div>
<div className={classes["add-document-container"]}> <div className={classes["add-document-container"]}>
<Button <Button
@ -161,7 +166,7 @@ class AskDocumentsClass extends BasePage<IPropsClass, IState> {
}; };
}); });
documentTypesOptions.sort((a, b) => a.label > b.label ? 1 : -1); documentTypesOptions.sort((a, b) => (a.label > b.label ? 1 : -1));
return documentTypesOptions; return documentTypesOptions;
} }