diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx index 8cb7c67..36946ee 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -4,7 +4,7 @@ import ViolationsList from "./ViolationsList"; const ViolationsDialog = ({ open, setOpen, mutate }) => { return ( - + setOpen(false)} diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx index 82a993d..e21681e 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx @@ -116,6 +116,54 @@ const ViolationsList = ({ setOpen, mutate }) => { }, Cell: ({ row }) => <>{row.original.city_name}, }, + { + accessorKey: "enter_time", + header: "تاریخ و ساعت ورود", + id: "enter_time", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 140, + Cell: ({ cell }) => { + const value = formatDateTime(cell.getValue()); + + if (!value) return "-"; + + return ( + <> + {value.date} + - + {value.time} + + ); + }, + }, + { + accessorKey: "exit_time", + header: "تاریخ و ساعت خروج", + id: "exit_time", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 140, + Cell: ({ cell }) => { + const value = formatDateTime(cell.getValue()); + + if (!value) return "-"; + + return ( +
+ {value.date} + - + {value.time} +
+ ); + }, + }, ]; }, []); @@ -139,3 +187,22 @@ const ViolationsList = ({ setOpen, mutate }) => { ); }; export default ViolationsList; + +const formatDateTime = (value) => { + if (!value) return null; + + const date = new Date(value.replace(" ", "T")); + + return { + date: new Intl.DateTimeFormat("fa-IR", { + year: "numeric", + month: "2-digit", + day: "2-digit", + }).format(date), + + time: new Intl.DateTimeFormat("fa-IR", { + hour: "2-digit", + minute: "2-digit", + }).format(date), + }; +};