From 3dfe25af1248f634fec698ec8d46ab60392543a1 Mon Sep 17 00:00:00 2001 From: Max S Date: Tue, 23 Jul 2024 14:29:14 +0200 Subject: [PATCH 1/4] fix date documents table --- .../FolderInformation/ClientView/DocumentTables/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx index d8dd6ca1..8d85e9f2 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx @@ -122,7 +122,7 @@ export default function DocumentTables(props: IProps) { label={tradDocumentStatus[document.document_status].toUpperCase()} /> ), - created_at: document.created_at, + created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_", actions: ( ), - created_at: document.created_at, + created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_", actions: (
), - created_at: document.created_at, + created_at: document.created_at ? new Date(document.created_at).toLocaleDateString() : "_", actions: "", }; }) From a7779f82b07eebefc3e39b17a6cb03a57163216a Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 23 Jul 2024 14:34:22 +0200 Subject: [PATCH 2/4] Fixed customer documents by folder uid --- .../Components/Layouts/Folder/FolderInformation/index.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 2f1b37a0..d7528a68 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -66,6 +66,9 @@ export default function FolderInformation(props: IProps) { include: { contact: true, documents: { + where: { + folder_uid: folderUid, + }, include: { folder: true, document_type: true, From 7299e6ebf8bd5996abc73fcbd7dccf038ebc9b09 Mon Sep 17 00:00:00 2001 From: Max S Date: Tue, 23 Jul 2024 14:38:24 +0200 Subject: [PATCH 3/4] switch first_name-last_name --- src/front/Components/Layouts/Folder/UpdateClient/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx index f40edc66..75d08e65 100644 --- a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx @@ -84,14 +84,14 @@ class UpdateClientClass extends BasePage {
error.property === "first_name")} /> error.property === "last_name")} From 4b6ed13eeb16ff904c86ab4b3ec8c325e08ae241 Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 23 Jul 2024 15:05:08 +0200 Subject: [PATCH 4/4] Notification redirection --- .../DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx b/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx index d10cc2e2..896f0894 100644 --- a/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx +++ b/src/front/Components/DesignSystem/Toasts/ToastsContainer/ToastElement/index.tsx @@ -51,7 +51,7 @@ class ToastElementClass extends React.Component { data-clickable={toast.redirectUrl ? true : false} onClick={this.handleClick}> {toast.time !== 0 &&
} -
+
{toast.icon && toast.icon}