From 680eeecb3f16eb8bea7b6f76259ce5498af6b876 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sat, 13 Sep 2025 14:53:52 +0330 Subject: [PATCH 1/4] add mission to road items and patrols --- .../MissionsDialog/MissionsList/index.jsx | 18 ++-- .../roadItems/operator/OperatorList.jsx | 19 +++- .../DialogInfoItem/ContentInfoItem.jsx | 5 + .../roadItems/supervisor/SupervisorList.jsx | 23 +++-- .../MachineList/RowActions/Allocate/index.jsx | 10 +- .../roadPatrols/operator/OperatorList.jsx | 62 ++----------- .../roadPatrols/supervisor/SupervisorList.jsx | 93 +++++-------------- src/core/utils/pageMenu.js | 61 ++++++------ 8 files changed, 111 insertions(+), 180 deletions(-) diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/MissionsList/index.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/MissionsList/index.jsx index a66e705..9bd2061 100644 --- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/MissionsList/index.jsx +++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/MissionsList/index.jsx @@ -48,12 +48,9 @@ const MissionList = ({ setMission, setOpenDialog }) => { Cell: ({ row }) => row.original.zone_fa, }, { - accessorFn: (row) => - row.type == 1 - ? moment(row.start_date).locale("fa").format("HH:mm | yyyy/MM/DD") - : moment(row.start_date).locale("fa").format("yyyy/MM/DD"), - header: "تاریخ شروع", - id: "start_date", + accessorFn: (row) => moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD"), + header: "تاریخ خروج", + id: "start_time", enableColumnFilter: true, datatype: "date", filterMode: "between", @@ -61,12 +58,9 @@ const MissionList = ({ setMission, setOpenDialog }) => { size: 100, }, { - accessorFn: (row) => - row.type == 1 - ? moment(row.end_date).locale("fa").format("HH:mm | yyyy/MM/DD") - : moment(row.end_date).locale("fa").format("yyyy/MM/DD"), - header: "تاریخ پایان", - id: "end_date", + accessorFn: (row) => moment(row.finish_time).locale("fa").format("HH:mm | yyyy/MM/DD"), + header: "تاریخ ورود", + id: "finish_time", enableColumnFilter: true, datatype: "date", filterMode: "between", diff --git a/src/components/dashboard/roadItems/operator/OperatorList.jsx b/src/components/dashboard/roadItems/operator/OperatorList.jsx index 7f862e4..ff5fe03 100644 --- a/src/components/dashboard/roadItems/operator/OperatorList.jsx +++ b/src/components/dashboard/roadItems/operator/OperatorList.jsx @@ -12,8 +12,6 @@ import RowActions from "./RowActions"; import DescriptionForm from "./RowActions/DescriptionForm"; import ImageDialog from "./RowActions/ImageForm"; import LocationForm from "./RowActions/LocationForm"; -import MachinesCodeDialog from "./RowActions/MachinesCodeForm"; -import RahdaranDialog from "./RowActions/RahdaranForm"; import Toolbar from "./Toolbar"; const OperatorList = () => { @@ -36,6 +34,17 @@ const OperatorList = () => { size: 100, Cell: ({ row }) => , }, + { + accessorKey: "mission_id", + header: "کد یکتا ماموریت", + id: "mission_id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, { header: "اطلاعات فعالیت", id: "info", @@ -129,8 +138,8 @@ const OperatorList = () => { props.dependencyFieldValue.value === "" ? "empty" : loadingSubItemsList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -309,7 +318,7 @@ const OperatorList = () => { table_name={"roadItemsOperatorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/components/dashboard/roadItems/reports/Map/PointsOnMap/DialogInfoItem/ContentInfoItem.jsx b/src/components/dashboard/roadItems/reports/Map/PointsOnMap/DialogInfoItem/ContentInfoItem.jsx index bbe49d2..36b6362 100644 --- a/src/components/dashboard/roadItems/reports/Map/PointsOnMap/DialogInfoItem/ContentInfoItem.jsx +++ b/src/components/dashboard/roadItems/reports/Map/PointsOnMap/DialogInfoItem/ContentInfoItem.jsx @@ -10,6 +10,11 @@ const ContentInfoItem = ({ data }) => { {data.id !== "" && data.id} + + + + {data.mission_id && data.mission_id} + diff --git a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx index 75005b7..d2e169d 100644 --- a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx @@ -78,6 +78,17 @@ const SupervisorList = () => { size: 100, Cell: ({ row }) => , }, + { + accessorKey: "mission_id", + header: "کد یکتا ماموریت", + id: "mission_id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, ...(hasCountryPermission ? [dynamicColumns] : []), { header: "اداره", @@ -127,8 +138,8 @@ const SupervisorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -227,8 +238,8 @@ const SupervisorList = () => { props.dependencyFieldValue.value === "" ? "empty" : loadingSubItemsList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -325,7 +336,7 @@ const SupervisorList = () => { filterMode: "between", grow: false, size: 100, - }, + } ], }, { @@ -373,7 +384,7 @@ const SupervisorList = () => { table_name={"roadItemsSupervisorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx index 9718815..fd0e3c6 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx @@ -1,5 +1,5 @@ import { Done } from "@mui/icons-material"; -import { IconButton, Tooltip } from "@mui/material"; +import { Button, IconButton, Tooltip } from "@mui/material"; const Allocate = ({ row, setMachine, setOpenMachinesDialog }) => { const handleClick = () => { @@ -9,11 +9,9 @@ const Allocate = ({ row, setMachine, setOpenMachinesDialog }) => { return ( <> - - - - - + ); }; diff --git a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx index 71357d6..937f874 100644 --- a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx +++ b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx @@ -1,14 +1,12 @@ "use client"; -import { useMemo } from "react"; -import { Box, Stack, Typography } from "@mui/material"; import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import Toolbar from "./Toolbar"; import { GET_ROAD_PATROL_OPERATOR_LIST } from "@/core/utils/routes"; +import { Box, Stack } from "@mui/material"; import moment from "jalali-moment"; +import { useMemo } from "react"; import RowActions from "./RowActions"; import ReportForm from "./RowActions/ReportForm"; -import RahdaranDialog from "./RowActions/RahdaranForm"; -import MachinePerformanceForm from "./RowActions/MachinePerformanceForm"; +import Toolbar from "./Toolbar"; const OperatorList = () => { const columns = useMemo( @@ -25,59 +23,15 @@ const OperatorList = () => { size: 100, }, { - header: "عملکرد خودرو", // Car ID + accessorKey: "mission_id", + header: "کد یکتا ماموریت", + id: "mission_id", enableColumnFilter: true, - id: "cmmsMachines__machine_code", datatype: "text", - filterMode: "contains", - columnFilterModeOptions: ["equals", "contains"], - enableSorting: false, - grow: false, - size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ renderedCellValue, row }) => { - return ( - - - - ); - }, - }, - { - accessorKey: "rahdaran", - header: "راهداران", - id: "rahdaran__code", - enableColumnFilter: true, - enableSorting: false, - datatype: "text", - filterMode: "contains", + filterMode: "equals", columnFilterModeOptions: ["equals", "contains"], grow: false, size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ renderedCellValue, row }) => { - return ( - - - - ); - }, }, { accessorFn: (row) => moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD"), @@ -148,7 +102,7 @@ const OperatorList = () => { table_name={"roadPatrolOperatorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx index 1a5224e..47b3c01 100644 --- a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx @@ -1,20 +1,18 @@ "use client"; -import { useEffect, useMemo, useState } from "react"; -import { Box, Stack, Typography } from "@mui/material"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import Toolbar from "./Toolbar"; -import { GET_ROAD_PATROL_SUPERVISOR_LIST } from "@/core/utils/routes"; -import moment from "jalali-moment"; -import RowActions from "./RowActions"; -import useProvinces from "@/lib/hooks/useProvince"; import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_ROAD_PATROL_SUPERVISOR_LIST } from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; import useEdaratLists from "@/lib/hooks/useEdaratLists"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useProvinces from "@/lib/hooks/useProvince"; +import { Box, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useMemo, useState } from "react"; +import RowActions from "./RowActions"; import OfficerDescriptionForm from "./RowActions/OfficerDescription"; import ReportForm from "./RowActions/ReportForm"; -import RahdaranDialog from "./RowActions/RahdaranForm"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import { useAuth } from "@/lib/contexts/auth"; -import MachinePerformanceForm from "./RowActions/MachinePerformanceForm"; +import Toolbar from "./Toolbar"; const SupervisorList = () => { const { data: userPermissions } = usePermissions(); @@ -69,6 +67,17 @@ const SupervisorList = () => { grow: false, size: 100, }, + { + accessorKey: "mission_id", + header: "کد یکتا ماموریت", + id: "mission_id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, ...(hasCountryPermission ? [dynamicColumns] : []), { accessorKey: "edare_id", @@ -119,8 +128,8 @@ const SupervisorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -128,60 +137,6 @@ const SupervisorList = () => { }, Cell: ({ renderedCellValue, row }) => <>{row.original.edare_name}, }, - { - header: "عملکرد خودرو", - enableColumnFilter: true, - id: "cmmsMachines__machine_code", - datatype: "text", - filterMode: "contains", - columnFilterModeOptions: ["equals", "contains"], - enableSorting: false, - grow: false, - size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ row }) => ( - - - - ), - }, - { - accessorKey: "rahdaran", - header: "راهداران", - id: "rahdaran__code", - enableColumnFilter: true, - enableSorting: false, - datatype: "text", - filterMode: "contains", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ renderedCellValue }) => - renderedCellValue ? ( - - - - ) : ( - - - ), - }, { accessorFn: (row) => moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD"), header: "تاریخ شروع", @@ -271,7 +226,7 @@ const SupervisorList = () => { table_name={"roadPatrolSupervisorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index c3928fe..b9cf8ba 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -150,7 +150,7 @@ export const pageMenu = [ id: "roadItemManagmentSupervisorCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/supervisor/cartable", + route: "/dashboard/road-items/supervisor", permissions: [ "show-road-item-supervise-cartable", "show-road-item-supervise-cartable-province", @@ -166,18 +166,11 @@ export const pageMenu = [ hasSubitems: true, badges: [{ key: "roadItem.operation_cnt" }], Subitems: [ - { - id: "roadItemManagmentOparationCreate", - label: "ثبت فعالیت", - type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/operator/create", - permissions: ["create-road-item"], - }, { id: "roadItemManagmentOparationCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/operator/cartable", + route: "/dashboard/road-items/operator", permissions: ["create-road-item"], }, ], @@ -186,7 +179,7 @@ export const pageMenu = [ id: "roadItemManagmentMap", label: "پراکندگی بر روی نقشه", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/map?type=road_items", + route: "/dashboard/road-items/reports/map", icon: , permissions: [ "show-road-item-supervise-cartable", @@ -197,13 +190,32 @@ export const pageMenu = [ { id: "roadItemManagmentReport", label: "گزارش ها", - type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_items/report", - icon: , - permissions: [ - "show-road-item-supervise-cartable", - "show-road-item-supervise-cartable-province", - "create-road-item", + type: "menu", + icon: , + hasSubitems: true, + Subitems: [ + { + id: "roadItemManagmentReportProvince", + label: "تعداد فعالیت ها به تفکیک آیتم", + type: "page", + route: "/dashboard/road-items/reports/items-report", + permissions: [ + "show-road-item-supervise-cartable", + "show-road-item-supervise-cartable-province", + "create-road-item", + ], + }, + { + id: "roadItemManagmentReportItems", + label: "تعداد و حجم فعالیت ها به تفکیک موارد اقدام شده", + type: "page", + route: "/dashboard/road-items/reports/sub-items-report", + permissions: [ + "show-road-item-supervise-cartable", + "show-road-item-supervise-cartable-province", + "create-road-item", + ], + }, ], }, ], @@ -226,7 +238,7 @@ export const pageMenu = [ id: "roadPatrolManagmentSupervisorCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_patrols/supervisor/cartable", + route: "/dashboard/road-patrols/supervisor", permissions: [ "show-road-patrol-supervise-cartable", "show-road-patrol-supervise-cartable-province", @@ -241,18 +253,11 @@ export const pageMenu = [ icon: , hasSubitems: true, Subitems: [ - { - id: "roadPatrolManagmentOparationCreate", - label: "ثبت اقدام", - type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_patrols/operator/create", - permissions: ["add-road-patrol"], - }, { id: "roadPatrolManagmentOparationCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_patrols/operator/cartable", + route: "/dashboard/road-patrols/operator", permissions: ["add-road-patrol"], }, ], @@ -273,8 +278,8 @@ export const pageMenu = [ id: "roadPatrolManagmentReport", label: "گزارش ها", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_patrols/report", - icon: , + route: "/dashboard/road-patrols/reports", + icon: , permissions: [ "add-road-patrol", "show-road-patrol-supervise-cartable", From f2b3d380bf9dda9db9b3f0c7dc3cb0bd0f750168 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sat, 20 Sep 2025 11:19:24 +0330 Subject: [PATCH 2/4] add update time --- .../dashboard/damageItems/DamagesList.jsx | 16 +++++++++++++++- .../operator/Actions/create/Forms/DamageItem.jsx | 3 ++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/damageItems/DamagesList.jsx b/src/components/dashboard/damageItems/DamagesList.jsx index 32229aa..7272087 100644 --- a/src/components/dashboard/damageItems/DamagesList.jsx +++ b/src/components/dashboard/damageItems/DamagesList.jsx @@ -1,10 +1,11 @@ "use client"; import DataTableWithAuth from "@/core/components/DataTableWithAuth"; import { GET_RECEIPT_DAMAGE_ITEMS_LIST } from "@/core/utils/routes"; -import { Box } from "@mui/material"; +import { Box, Typography } from "@mui/material"; import { useMemo } from "react"; import Toolbar from "./Toolbar"; import RowActions from "./RowActions"; +import moment from "jalali-moment"; const DamagesList = () => { const columns = useMemo( @@ -49,6 +50,19 @@ const DamagesList = () => { size: 100, Cell: ({ renderedCellValue }) => (renderedCellValue / 1).toLocaleString(), }, + { + accessorKey: "update_time", + header: "تاریخ بروزرسانی", + id: "update_time", + enableColumnFilter: false, + datatype: "date", + filterMode: "equals", + Cell: ({ renderedCellValue }) => ( + + {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"} + + ), + }, { accessorKey: "status", header: "وضعیت", diff --git a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx index 521a6d4..c1ea792 100644 --- a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx +++ b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx @@ -19,6 +19,7 @@ import { number, object } from "yup"; import useDamageItemList from "@/lib/hooks/useDamageItemList"; import DamagePrice from "./DamagePrice"; import { yupResolver } from "@hookform/resolvers/yup"; +import moment from "jalali-moment"; const schema = object({ id: number().required("لطفا نوع خسارت را وارد کنید!!!"), @@ -86,7 +87,7 @@ const DamageItem = ({ baseOnChange, baseDamageItems }) => { option.title} + getOptionLabel={(option) => `${option.title} - بروزرسانی: ${option.update_time ? moment(option.update_time).locale("fa").format("YYYY/MM/DD") : ""}` } isOptionEqualToValue={(option, value) => option.id === value.id} loading={loadingDamageItemList} renderInput={(params) => ( From 8f9e5248742b8e65e339604dcbddf05788caec3e Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sat, 20 Sep 2025 11:21:46 +0330 Subject: [PATCH 3/4] change style --- .../fastReact/operator/OperatorList.jsx | 106 +++++++++--------- .../fastReact/supervisor/SupervisorList.jsx | 106 +++++++++--------- 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/components/dashboard/fastReact/operator/OperatorList.jsx b/src/components/dashboard/fastReact/operator/OperatorList.jsx index 3154f6d..b68525a 100644 --- a/src/components/dashboard/fastReact/operator/OperatorList.jsx +++ b/src/components/dashboard/fastReact/operator/OperatorList.jsx @@ -35,6 +35,59 @@ const OperatorList = () => { size: 100, Cell: ({ row }) => , }, + { + accessorKey: "status", + header: "وضعیت نظارت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + size: 100, + columnSelectOption: () => { + return statusOptions.map((status) => ({ + value: status.value, + label: status.label, + })); + }, + Cell: ({ row }) => <>{row.original.status_fa}, + }, + { + accessorKey: "supervisor_description", + header: "توضیح ناظر", + id: "supervisor_description", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + muiTableBodyCellProps: { + sx: { + borderLeft: "1px solid #e1e1e1", + py: 0, + "&:first-of-type": { + borderLeft: "unset", + }, + }, + }, + Cell: ({ renderedCellValue }) => { + if (renderedCellValue) { + return ( + + + + ); + } + return -; + }, + }, { header: "اطلاعات ثبت‌ شده در سامانه سوانح", id: "fkInfo", @@ -288,59 +341,6 @@ const OperatorList = () => { }, ], }, - { - accessorKey: "status", - header: "وضعیت نظارت", - id: "status", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - sortDescFirst: true, - grow: false, - size: 100, - columnSelectOption: () => { - return statusOptions.map((status) => ({ - value: status.value, - label: status.label, - })); - }, - Cell: ({ row }) => <>{row.original.status_fa}, - }, - { - accessorKey: "supervisor_description", - header: "توضیح ناظر", - id: "supervisor_description", - enableColumnFilter: false, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ renderedCellValue }) => { - if (renderedCellValue) { - return ( - - - - ); - } - return -; - }, - }, ], [] ); diff --git a/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx b/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx index 0df0b24..71e0f8b 100644 --- a/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx @@ -136,6 +136,59 @@ const SupervisorList = () => { }, Cell: ({ renderedCellValue, row }) => <>{row.original.name_fa}, }, + { + accessorKey: "status", + header: "وضعیت نظارت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + size: 100, + columnSelectOption: () => { + return statusOptions.map((status) => ({ + value: status.value, + label: status.label, + })); + }, + Cell: ({ row }) => <>{row.original.status_fa}, + }, + { + accessorKey: "supervisor_description", + header: "توضیح ناظر", + id: "supervisor_description", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + muiTableBodyCellProps: { + sx: { + borderLeft: "1px solid #e1e1e1", + py: 0, + "&:first-of-type": { + borderLeft: "unset", + }, + }, + }, + Cell: ({ renderedCellValue }) => { + if (renderedCellValue) { + return ( + + + + ); + } + return -; + }, + }, { header: "اطلاعات ثبت‌ شده در سامانه سوانح", id: "fkInfo", @@ -389,59 +442,6 @@ const SupervisorList = () => { }, ], }, - { - accessorKey: "status", - header: "وضعیت نظارت", - id: "status", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - sortDescFirst: true, - grow: false, - size: 100, - columnSelectOption: () => { - return statusOptions.map((status) => ({ - value: status.value, - label: status.label, - })); - }, - Cell: ({ row }) => <>{row.original.status_fa}, - }, - { - accessorKey: "supervisor_description", - header: "توضیح ناظر", - id: "supervisor_description", - enableColumnFilter: false, - datatype: "text", - filterMode: "equals", - sortDescFirst: false, - columnFilterModeOptions: ["equals", "contains"], - grow: false, - size: 100, - muiTableBodyCellProps: { - sx: { - borderLeft: "1px solid #e1e1e1", - py: 0, - "&:first-of-type": { - borderLeft: "unset", - }, - }, - }, - Cell: ({ renderedCellValue }) => { - if (renderedCellValue) { - return ( - - - - ); - } - return -; - }, - }, ]; }, []); From 32a34c0229ace5a97ce2dc65a916a154898f4278 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sat, 20 Sep 2025 11:30:21 +0330 Subject: [PATCH 4/4] change version to 1.7.8 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 7db04c4..eb18580 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ HOST="rms.witel.ir" -NEXT_PUBLIC_VERSION="1.7.5" +NEXT_PUBLIC_VERSION="1.7.8" NEXT_PUBLIC_API_URL="https://rms.witel.ir" NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map" \ No newline at end of file