add openedCustomer arg

This commit is contained in:
OxSaitama 2023-10-12 23:18:47 +02:00
parent 930b51c140
commit 90006e8b69
8 changed files with 23 additions and 6 deletions

View File

@ -21,6 +21,7 @@ export type IGetDeedTypesParams = {
where?: {}; where?: {};
include?: {}; include?: {};
select?: {}; select?: {};
orderBy?: {};
}; };
export default class DeedTypes extends BaseNotary { export default class DeedTypes extends BaseNotary {

View File

@ -6,6 +6,7 @@ import BaseNotary from "../BaseNotary";
export interface IGetDocumentTypesparams { export interface IGetDocumentTypesparams {
where?: {}; where?: {};
include?: {}; include?: {};
orderBy?: {};
} }
// TODO Type getbyuid query params // TODO Type getbyuid query params

View File

@ -97,7 +97,9 @@ export default class UserFolder extends React.Component<IProps, IState> {
documents={documentsAsked} documents={documentsAsked}
title="Documents demandés" title="Documents demandés"
subtitle={ subtitle={
documentsAsked && documentsAsked?.length === 0 ? "Vous n'avez pas encore demandé de documents" : "" documentsAsked && documentsAsked?.length === 0
? "Vous n'avez pas encore demandé de documents"
: "Un mail de demande de documents a été envoyé pour ces documents :"
} }
openDeletionModal={this.openDeletionModal} openDeletionModal={this.openDeletionModal}
folderUid={this.props.folder.uid!} folderUid={this.props.folder.uid!}

View File

@ -91,6 +91,9 @@ export default class DefaultDeedTypesDashboard extends React.Component<IProps, I
where: { where: {
archived_at: null, archived_at: null,
}, },
orderBy: {
name: "asc",
},
}; };
const deedTypes = await DeedTypes.getInstance().get(query); const deedTypes = await DeedTypes.getInstance().get(query);

View File

@ -94,6 +94,9 @@ export default class DefaultDocumentTypesDashboard extends React.Component<IProp
where: { where: {
office_uid: jwt.office_Id, office_uid: jwt.office_Id,
}, },
orderBy: {
name: "asc",
},
}); });
this.setState({ documentTypes }); this.setState({ documentTypes });
} }

View File

@ -14,6 +14,7 @@ type IProps = {
folder: OfficeFolder; folder: OfficeFolder;
anchorStatus: AnchorStatus; anchorStatus: AnchorStatus;
getFolderCallback: () => Promise<void>; getFolderCallback: () => Promise<void>;
openedCustomer?: string;
}; };
type IState = { type IState = {
openedCustomer: string; openedCustomer: string;
@ -23,10 +24,10 @@ export default class ClientSection extends React.Component<IProps, IState> {
public constructor(props: IProps) { public constructor(props: IProps) {
super(props); super(props);
this.state = { this.state = {
openedCustomer: "", openedCustomer: this.props.openedCustomer ?? "",
}; };
this.changeUserFolder = this.changeUserFolder.bind(this); this.changeUserFolder = this.changeUserFolder.bind(this);
this.renderCustomerFolders = this.renderCustomerFolders.bind(this);
} }
public override render(): JSX.Element { public override render(): JSX.Element {

View File

@ -38,6 +38,7 @@ type IPropsClass = IProps & {
selectedFolder: OfficeFolder | null; selectedFolder: OfficeFolder | null;
getAnchoringStatus: () => Promise<void>; getAnchoringStatus: () => Promise<void>;
getFolderCallback: () => Promise<void>; getFolderCallback: () => Promise<void>;
openedCustomer?: string;
}; };
type IState = { type IState = {
@ -120,6 +121,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
folder={this.props.selectedFolder} folder={this.props.selectedFolder}
anchorStatus={this.props.isAnchored} anchorStatus={this.props.isAnchored}
getFolderCallback={this.props.getFolderCallback} getFolderCallback={this.props.getFolderCallback}
openedCustomer={this.props.openedCustomer}
/> />
)} )}
</div> </div>
@ -129,6 +131,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
folder={this.props.selectedFolder} folder={this.props.selectedFolder}
anchorStatus={this.props.isAnchored} anchorStatus={this.props.isAnchored}
getFolderCallback={this.props.getFolderCallback} getFolderCallback={this.props.getFolderCallback}
openedCustomer={this.props.openedCustomer}
/> />
)} )}
@ -254,8 +257,8 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
{this.state.hasValidateAnchoring && ( {this.state.hasValidateAnchoring && (
<div className={classes["document-validating-container"]}> <div className={classes["document-validating-container"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK} className={classes["validate-text"]}> <Typography typo={ITypo.P_16} color={ITypoColor.BLACK} className={classes["validate-text"]}>
Vous pouvez désormais télécharger les feuilles d'ancrage et les mettre dans la GED de votre logiciel de Veuillez revenir sur le dossier dans 5 minutes et rafraîchir la page pour télécharger le dossier de
rédaction d'acte. preuve d'ancrage et le glisser dans la GED de votre logiciel de rédaction d'acte.
</Typography> </Typography>
<Image src={ValidateAnchoringGif} alt="Anchoring animation" className={classes["validate-gif"]} /> <Image src={ValidateAnchoringGif} alt="Anchoring animation" className={classes["validate-gif"]} />
</div> </div>
@ -413,6 +416,7 @@ export default function FolderInformation(props: IProps) {
const [selectedFolder, setSelectedFolder] = useState<OfficeFolder | null>(null); const [selectedFolder, setSelectedFolder] = useState<OfficeFolder | null>(null);
let { folderUid } = router.query; let { folderUid } = router.query;
const customerUid = router.query["customerUid"] as string | undefined;
folderUid = folderUid as string; folderUid = folderUid as string;
const getAnchoringStatus = useCallback(async () => { const getAnchoringStatus = useCallback(async () => {
@ -481,6 +485,7 @@ export default function FolderInformation(props: IProps) {
selectedFolder={selectedFolder} selectedFolder={selectedFolder}
getAnchoringStatus={getAnchoringStatus} getAnchoringStatus={getAnchoringStatus}
getFolderCallback={getFolder} getFolderCallback={getFolder}
openedCustomer={customerUid}
/> />
); );
} }

View File

@ -175,6 +175,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
}, },
document_type: true, document_type: true,
folder: true, folder: true,
depositor: true,
}); });
this.setState( this.setState(
{ {
@ -296,7 +297,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
this.props.router.push( this.props.router.push(
Module.getInstance() Module.getInstance()
.get() .get()
.modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", this.props.folderUid), .modules.pages.Folder.pages.FolderInformation.props.path.replace("[folderUid]", this.props.folderUid) + '?customerUid=' + this.state.document?.depositor?.uid,
); );
} catch (e) { } catch (e) {
console.error(e); console.error(e);