From e6e2aa3b55d2f7d7a01b50d4ccbaff7eff1b4cf6 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Wed, 3 Sep 2025 11:04:05 +0330 Subject: [PATCH] add update --- .../roadMissions/control/ControlList.jsx | 10 ++++++++++ .../roadMissions/operator/OperatorList.jsx | 20 +++++++++++++++++++ .../roadPatrols/operator/Toolbar.jsx | 2 +- src/core/utils/pageMenuDev.js | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/roadMissions/control/ControlList.jsx b/src/components/dashboard/roadMissions/control/ControlList.jsx index 18e757a..bb631ab 100644 --- a/src/components/dashboard/roadMissions/control/ControlList.jsx +++ b/src/components/dashboard/roadMissions/control/ControlList.jsx @@ -102,6 +102,16 @@ const ControlList = () => { ); }, }, + { + accessorFn: (row) => row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null, + header: "تاریخ خروج", + id: "start_time", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + size: 100, + }, ], [] ); diff --git a/src/components/dashboard/roadMissions/operator/OperatorList.jsx b/src/components/dashboard/roadMissions/operator/OperatorList.jsx index df9528e..8837ea7 100644 --- a/src/components/dashboard/roadMissions/operator/OperatorList.jsx +++ b/src/components/dashboard/roadMissions/operator/OperatorList.jsx @@ -227,6 +227,26 @@ const OperatorList = () => { ); }, }, + { + accessorFn: (row) => row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null, + header: "تاریخ خروج", + id: "start_time", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + size: 100, + }, + { + accessorFn: (row) => row.finish_time ? moment(row.finish_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null, + header: "تاریخ ورود", + id: "finish_time", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + size: 100, + }, { accessorFn: (row) => moment(row.request_date).locale("fa").format("HH:mm | yyyy/MM/DD"), header: "تاریخ ثبت", diff --git a/src/components/dashboard/roadPatrols/operator/Toolbar.jsx b/src/components/dashboard/roadPatrols/operator/Toolbar.jsx index a799c26..e7b5d74 100644 --- a/src/components/dashboard/roadPatrols/operator/Toolbar.jsx +++ b/src/components/dashboard/roadPatrols/operator/Toolbar.jsx @@ -6,7 +6,7 @@ const Toolbar = ({ table, filterData, mutate }) => { return ( - + {/* */} ); }; diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index 118dacb..b4ea525 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -580,7 +580,7 @@ export const pageMenuDev = [ type: "page", route: "/dashboard/rahdaran", icon: , - permissions: ["all"], + permissions: ["show-rahdaran"], }, { id: "adminManagement",