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

🐛 Retours Melissa sprint planning

Browse Source
This commit is contained in:
Maxime Lalo 2023-04-28 14:53:28 +02:00
parent 2aaa5cd3ed
commit 247b0ba108
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/front/Components/DesignSystem/Form/Elements/InputField/classes.module.scss
View File

@ -26,6 +26,7 @@
border: 1px solid $grey-medium;
&:disabled {
cursor: not-allowed;
~ .fake-placeholder {
/**
TODO

5
src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx
View File

@ -22,7 +22,10 @@ export default class BurgerModal extends React.Component<IProps, IState> {
<NavigationLink
path={Module.getInstance().get().modules.pages.Folder.props.path}
text="Dossiers en cours"
routesActive={[Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path]}
routesActive={[
Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path,
Module.getInstance().get().modules.pages.Folder.pages.CreateFolder.props.path,
]}
/>
<NavigationLink
path={Module.getInstance().get().modules.pages.Folder.pages.FolderArchived.props.path}

5
src/front/Components/DesignSystem/Header/Navigation/index.tsx
View File

@ -14,7 +14,10 @@ export default class Navigation extends React.Component<IProps, IState> {
<HeaderLink
text={"Dossiers en cours"}
path={Module.getInstance().get().modules.pages.Folder.props.path}
routesActive={[Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path]}
routesActive={[
Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path,
Module.getInstance().get().modules.pages.Folder.pages.CreateFolder.props.path,
]}
/>
<HeaderLink
text={"Dossiers archivés"}

1
src/front/Components/DesignSystem/Header/Profile/ProfileModal/index.tsx
View File

@ -20,7 +20,6 @@ export default class ProfileModal extends React.Component<IProps, IState> {
<div className={classes["root"]}>
<NavigationLink path={Module.getInstance().get().modules.pages.MyAccount.props.path} text="Mon compte" />
<NavigationLink text="CGU" />
<NavigationLink path={Module.getInstance().get().modules.pages.Home.props.path} text="Home" />
<div className={classes["separator"]} />
<LogOutButton />
</div>

2
src/front/Components/DesignSystem/UserFolder/UserFolderHeader/index.tsx
View File

@ -73,8 +73,6 @@ export default class UserFolderHeader extends React.Component<IProps, IState> {
private hasPendingFiles(){
const documents = this.props.folder.documents?.filter((document) => document.depositor.contact.uid === this.props.contact.uid) ?? [];
const notAskedDocuments = documents.filter((document) => document.document_status === "PENDING") ?? [];
console.log(this.props.contact.uid);
console.log(notAskedDocuments.length);
return notAskedDocuments.length > 0;
}

11
src/front/Components/Layouts/Folder/ViewDocuments/index.tsx
View File

@ -35,6 +35,7 @@ type IState = {
hasValidateAnchoring: boolean;
selectedFileIndex: number;
selectedFile: File | null;
validatedPercentage: number;
};
class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
@ -48,6 +49,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
hasValidateAnchoring: false,
selectedFileIndex: 0,
selectedFile: null,
validatedPercentage: this.getRandomPercentageForOcr()
};
this.closeModals = this.closeModals.bind(this);
@ -97,7 +99,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
<div className={classes["footer"]}>
{this.props.selectedDocument?.document_type.name === "Carte d'identité" && (
<div className={classes["ocr-container"]}>
<OcrResult percentage={this.getRandomPercentageForOcr()} />
<OcrResult percentage={this.state.validatedPercentage} />
</div>
)}
@ -112,7 +114,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
</>
)}
{this.props.selectedDocument?.document_status === "VALIDATED" && (
<a href={this.state.selectedFile.file_path!} download>
<a href={this.state.selectedFile.file_path!} download target="_blank">
<Button>Télécharger</Button>
</a>
)}
@ -122,8 +124,8 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
isOpen={this.state.isValidateModalVisible}
onClose={this.closeModals}
onAccept={this.validateAnchoring}
closeBtn={!this.state.hasValidateAnchoring}
hasContainerClosable={!this.state.hasValidateAnchoring}
closeBtn={true}
hasContainerClosable={true}
header={this.state.hasValidateAnchoring ? "Document en cours de validation" : "Ancrer le document"}
cancelText={"Annuler"}
confirmText={"Confirmer"}
@ -280,7 +282,6 @@ export default function ViewDocuments(props: IProps) {
let { folderUid, documentUid } = router.query;
const folder = folders.find((folder) => folder.uid === folderUid) ?? null;
console.log(folder);
const documents = folder?.documents!.filter((document) => document.document_status !== "ASKED") ?? [];
const selectedDocument = documents.find((document) => document.uid === documentUid) ?? null;
return <ViewDocumentsClass {...props} selectedDocument={selectedDocument} router={router} folderUid={folderUid as string} />;