Merge branch 'dev' into staging

This commit is contained in:
Vins 2024-07-23 15:05:22 +02:00
commit 3e253385d0
4 changed files with 9 additions and 6 deletions

View File

@ -51,7 +51,7 @@ class ToastElementClass extends React.Component<IPropsClass, IState> {
data-clickable={toast.redirectUrl ? true : false} data-clickable={toast.redirectUrl ? true : false}
onClick={this.handleClick}> onClick={this.handleClick}>
{toast.time !== 0 && <div className={classes["loadbar"]} style={style} />} {toast.time !== 0 && <div className={classes["loadbar"]} style={style} />}
<div className={classes["header"]} onClick={this.onClose}> <div className={classes["header"]}>
<div className={classes["text-icon_row"]}> <div className={classes["text-icon_row"]}>
{toast.icon && toast.icon} {toast.icon && toast.icon}
<div className={classes["text-container"]}> <div className={classes["text-container"]}>

View File

@ -122,7 +122,7 @@ export default function DocumentTables(props: IProps) {
label={tradDocumentStatus[document.document_status].toUpperCase()} label={tradDocumentStatus[document.document_status].toUpperCase()}
/> />
), ),
created_at: document.created_at, created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_",
actions: ( actions: (
<Link <Link
href={Module.getInstance() href={Module.getInstance()
@ -153,7 +153,7 @@ export default function DocumentTables(props: IProps) {
label={tradDocumentStatus[document.document_status].toUpperCase()} label={tradDocumentStatus[document.document_status].toUpperCase()}
/> />
), ),
created_at: document.created_at, created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_",
actions: ( actions: (
<div className={classes["actions"]}> <div className={classes["actions"]}>
<Link <Link
@ -187,7 +187,7 @@ export default function DocumentTables(props: IProps) {
label={tradDocumentStatus[document.document_status].toUpperCase()} label={tradDocumentStatus[document.document_status].toUpperCase()}
/> />
), ),
created_at: document.created_at, created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_",
actions: "", actions: "",
}; };
}) })

View File

@ -66,6 +66,9 @@ export default function FolderInformation(props: IProps) {
include: { include: {
contact: true, contact: true,
documents: { documents: {
where: {
folder_uid: folderUid,
},
include: { include: {
folder: true, folder: true,
document_type: true, document_type: true,

View File

@ -84,14 +84,14 @@ class UpdateClientClass extends BasePage<IPropsClass, IState> {
<div className={classes["content"]}> <div className={classes["content"]}>
<TextField <TextField
name="first_name" name="first_name"
placeholder="Nom" placeholder="Prénom"
onChange={this.onChangeNameInput} onChange={this.onChangeNameInput}
defaultValue={this.state.customer?.contact?.first_name} defaultValue={this.state.customer?.contact?.first_name}
validationError={this.state.validationError.find((error) => error.property === "first_name")} validationError={this.state.validationError.find((error) => error.property === "first_name")}
/> />
<TextField <TextField
name="last_name" name="last_name"
placeholder="Prénom" placeholder="Nom"
onChange={this.onChangeFirstNameInput} onChange={this.onChangeFirstNameInput}
defaultValue={this.state.customer?.contact?.last_name} defaultValue={this.state.customer?.contact?.last_name}
validationError={this.state.validationError.find((error) => error.property === "last_name")} validationError={this.state.validationError.find((error) => error.property === "last_name")}