From 9ee9132ed8dda072a61bfe8b406f80c2b17c035b Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 13:36:28 +0330 Subject: [PATCH 1/7] debug filter select option in violation --- .../roadMissions/violations/ViolationsList.jsx | 13 ++++++++++--- src/core/utils/violationsCategoryStatus.js | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/core/utils/violationsCategoryStatus.js diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index bf9566d..c78d6cc 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -6,6 +6,7 @@ import moment from "jalali-moment"; import { useMemo } from "react"; import RowActions from "./RowActions"; import Toolbar from "./Toolbar"; +import { violationsCategoryStatus } from "@/core/utils/violationsCategoryStatus"; const ViolationsList = () => { const columns = useMemo( @@ -21,14 +22,20 @@ const ViolationsList = () => { grow: false, }, { - accessorKey: "type", - header: "نوع تخلف", - id: "type", + accessorKey: "status", + header: "وضعیت", + id: "status", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", sortDescFirst: true, grow: false, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), }, { diff --git a/src/core/utils/violationsCategoryStatus.js b/src/core/utils/violationsCategoryStatus.js new file mode 100644 index 0000000..1045f85 --- /dev/null +++ b/src/core/utils/violationsCategoryStatus.js @@ -0,0 +1,4 @@ +export const violationsCategoryStatus = [ + { id: 0, name_fa: "بدون اقدام" }, + { id: 1, name_fa: "اقدام شده" }, +]; -- 2.49.1 From 8753f231467fb72197580b5033b33fbbc8ff0e0b Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 13:49:22 +0330 Subject: [PATCH 2/7] remove without proccess and add minute to operator --- src/components/dashboard/roadMissions/operator/Toolbar.jsx | 4 ++-- .../violations/Actions/EditViolation/MissionDates/index.jsx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Toolbar.jsx b/src/components/dashboard/roadMissions/operator/Toolbar.jsx index 9ddee3a..12db25d 100644 --- a/src/components/dashboard/roadMissions/operator/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/operator/Toolbar.jsx @@ -1,12 +1,12 @@ import { Stack } from "@mui/material"; import Create from "./Actions/Create"; -import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; +// import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; const Toolbar = ({ table, filterData, mutate }) => { return ( - + {/**/} ); }; diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index 225ab8f..493d4e2 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -42,7 +42,6 @@ const MissionDates = ({ control }) => { name="start_time" error={error} value={field.value} - views={["hours"]} placeholder={"زمان شروع ماموریت را وارد کنید"} label={"زمان شروع ماموریت"} setFieldValue={(name, value) => field.onChange(value || null)} -- 2.49.1 From 5c05af0828522c7fe79da43d55e5365637912a57 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 14:40:13 +0330 Subject: [PATCH 3/7] show time on edit dialog and remove time in tashih mamoriat --- .../CreateViolation/Form/CreateForm.jsx | 4 ++ .../Form/MissionDates/index.jsx | 55 +++++++++++++++++++ .../Actions/CreateViolation/Form/index.jsx | 4 ++ .../CreateWithoutProcess/Form/index.jsx | 17 +----- .../Actions/CreateWithoutProcess/index.jsx | 6 -- .../Actions/EditViolation/EditController.jsx | 15 ++--- .../EditViolation/MissionDates/index.jsx | 43 +-------------- 7 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx index 86fb936..cb7dc7a 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm.jsx @@ -5,6 +5,7 @@ import { yupResolver } from "@hookform/resolvers/yup"; import { Button, DialogActions, DialogContent, Stack } from "@mui/material"; import { Controller, useForm } from "react-hook-form"; import * as yup from "yup"; +import MissionDates from "@/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates"; const schema = yup.object().shape({ machinesId: yup.object().required("کد خودرو الزامی است."), km: yup.string(), @@ -61,6 +62,9 @@ const CreateViolationForm = ({ setOpenMachinesDialog, defaultValues, onSubmitBas )} /> + + + diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx new file mode 100644 index 0000000..ca84634 --- /dev/null +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/MissionDates/index.jsx @@ -0,0 +1,55 @@ +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import MuiTimePicker from "@/core/components/MuiTimePicker"; +import { Grid } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; + +const MissionDates = ({ control }) => { + const start_date = useWatch({ control, name: "start_date" }); + const now = new Date(); + + return ( + <> + + { + return ( + field.onChange(value || [])} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ); +}; +export default MissionDates; diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx index 2b70d5b..ad34476 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx @@ -3,6 +3,7 @@ import { DialogHeader } from "next/dist/client/components/react-dev-overlay/inte import useRequest from "@/lib/hooks/useRequest"; import { CREATE_VIOLATION } from "@/core/utils/routes"; import CreateViolationForm from "@/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/CreateForm"; +import moment from "jalali-moment"; const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => { const requestServer = useRequest({ notificationSuccess: true }); @@ -10,6 +11,8 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => const defaultValues = { machinesId: null, km: "", + start_date: null, + start_time: null, }; const submitForm = async (result) => { @@ -17,6 +20,7 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => data: { machine_code: result.machinesId.machine_code, km: result.km, + exit_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, }, }) .then((response) => { diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 96de65d..76230ad 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -59,10 +59,9 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { }} > } label="مشخصات" /> - } label="زمانبندی" /> - } label="راننده" /> - } label="همراهان" /> - } label="بررسی نهایی" /> + } label="راننده" /> + } label="همراهان" /> + } label="بررسی نهایی" /> { setTabState={setTabState} /> - - { - dispatch({ type: "changeData", data }); - }} - handlePrev={handlePrev} - setTabState={setTabState} - /> - { ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), zone: result.region, end_point: result.end_point, - start_date: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, - end_date: `${result.end_date} ${moment(result.end_time).format("HH:mm")}`, driver: result.driver.id, }, hasSidebarUpdate: true, @@ -70,10 +68,6 @@ const CreateWithoutProcess = ({ row, mutate }) => { category_id: "", road_observed_id: "", rahdaran: [], - start_date: "", - start_time: null, - end_date: "", - end_time: null, end_point: "", region: "", driver: null, diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx index 97ae1e2..ab16760 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx @@ -5,24 +5,19 @@ import { DialogHeader } from "next/dist/client/components/react-dev-overlay/inte import EditViolationForm from "./EditViolationForm"; import moment from "jalali-moment"; -const EditController = ({ rowId, mutate, setOpen }) => { +const EditController = ({ rowId, mutate, setOpen, row }) => { const requestServer = useRequest({ notificationSuccess: true }); + const [endDate] = row?.original?.enter_time?.split(" ") || [null]; const defaultData = { - start_date: null, - start_time: null, - end_date: null, - end_time: null, + end_date: endDate, + end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null, }; const handleSubmit = async (result) => { const payload = {}; - if (result.start_date && result.start_time) { - payload.enter_time = `${result.start_date} ${moment(result.start_time).format("HH:mm")}`; - } - if (result.end_date && result.end_time) { - payload.exit_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; + payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; } await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", { diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index 493d4e2..ba07a09 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -5,52 +5,11 @@ import { Grid } from "@mui/material"; import { Controller, useWatch } from "react-hook-form"; const MissionDates = ({ control }) => { - const start_date = useWatch({ control, name: "start_date" }); const end_date = useWatch({ control, name: "end_date" }); const now = new Date(); return ( <> - - { - return ( - field.onChange(value || [])} - helperText={error ? error.message : null} - /> - ); - }} - /> - - - { - return ( - field.onChange(value || null)} - helperText={error ? error.message : null} - /> - ); - }} - /> - { error={error} value={field.value} disableFuture={false} - minDate={start_date ? start_date : now} + minDate={end_date ? end_date : now} placeholder={"تاریخ پایان ماموریت را وارد کنید"} label={"تاریخ پایان ماموریت"} setFieldValue={(name, value) => field.onChange(value || [])} -- 2.49.1 From 16889752a113265350ad038b49b056e0ecf2a4c5 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 10 Jun 2026 14:48:31 +0330 Subject: [PATCH 4/7] build and format --- package.json | 110 +++---- .../reports/missionsReports/page.js | 36 +-- .../reports/violationsReports/page.js | 36 +-- .../taradodReports/ExcelPrint/index.jsx | 154 +++++----- .../taradodReports/MissionsReportLists.jsx | 276 ++++++++--------- .../Search/FromDateController.jsx | 54 ++-- .../Search/SearchReportField.jsx | 88 +++--- .../taradodReports/Search/SelectProvince.jsx | 90 +++--- .../Search/ToDateController.jsx | 60 ++-- .../reports/taradodReports/Search/index.jsx | 26 +- .../reports/taradodReports/Toolbar.jsx | 22 +- .../reports/taradodReports/index.jsx | 284 +++++++++--------- .../violationsReports/ExcelPrint/index.jsx | 154 +++++----- .../Search/FromDateController.jsx | 54 ++-- .../Search/SearchReportField.jsx | 88 +++--- .../Search/SelectProvince.jsx | 90 +++--- .../Search/ToDateController.jsx | 60 ++-- .../violationsReports/Search/index.jsx | 26 +- .../reports/violationsReports/Toolbar.jsx | 22 +- .../ViolationsReportsList.jsx | 196 ++++++------ .../reports/violationsReports/index.jsx | 282 ++++++++--------- 21 files changed, 1104 insertions(+), 1104 deletions(-) diff --git a/package.json b/package.json index 8a2e759..6074c06 100644 --- a/package.json +++ b/package.json @@ -1,55 +1,55 @@ -{ - "name": "rms", - "version": "0.1.0", - "private": true, - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start", - "lint": "next lint", - "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\"", - "build:publish": "npm i && npm run build && pm2 restart ecosystem.config.js" - }, - "dependencies": { - "@emotion/cache": "^11.11.0", - "@emotion/react": "^11.11.3", - "@emotion/styled": "^11.11.0", - "@hookform/resolvers": "^3.9.0", - "@mui/icons-material": "^5.16.7", - "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "^5.16.7", - "@mui/material-nextjs": "^5.16.6", - "@mui/x-date-pickers": "^6.19.5", - "@mui/x-tree-view": "^7.11.0", - "@turf/turf": "^7.2.0", - "axios": "^1.7.2", - "date-fns": "^3.3.1", - "date-fns-jalali": "^2.13.0-0", - "dayjs": "^1.11.10", - "file-saver": "^2.0.5", - "jalali-moment": "^3.3.11", - "lz-string": "^1.5.0", - "material-react-table": "^2.11.2", - "next": "^14.2.3", - "react": "^18", - "react-dom": "^18", - "react-hook-form": "^7.52.1", - "react-leaflet": "^4.2.1", - "react-leaflet-draw": "^0.20.4", - "react-leaflet-markercluster": "^4.2.1", - "react-qr-code": "^2.0.18", - "react-toastify": "^10.0.5", - "sass": "^1.75.0", - "sharp": "^0.33.4", - "stylis": "^4.3.1", - "stylis-plugin-rtl": "^2.1.1", - "swr": "^2.2.5", - "yup": "^1.4.0" - }, - "devDependencies": { - "eslint": "^8", - "eslint-config-next": "14.1.0", - "eslint-config-prettier": "^9.1.0", - "prettier": "^3.3.2" - } -} +{ + "name": "rms", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\"", + "build:publish": "npm i && npm run build && pm2 restart ecosystem.config.js" + }, + "dependencies": { + "@emotion/cache": "^11.11.0", + "@emotion/react": "^11.11.3", + "@emotion/styled": "^11.11.0", + "@hookform/resolvers": "^3.9.0", + "@mui/icons-material": "^5.16.7", + "@mui/lab": "^5.0.0-alpha.173", + "@mui/material": "^5.16.7", + "@mui/material-nextjs": "^5.16.6", + "@mui/x-date-pickers": "^6.19.5", + "@mui/x-tree-view": "^7.11.0", + "@turf/turf": "^7.2.0", + "axios": "^1.7.2", + "date-fns": "^3.3.1", + "date-fns-jalali": "^2.13.0-0", + "dayjs": "^1.11.10", + "file-saver": "^2.0.5", + "jalali-moment": "^3.3.11", + "lz-string": "^1.5.0", + "material-react-table": "^2.11.2", + "next": "^14.2.3", + "react": "^18", + "react-dom": "^18", + "react-hook-form": "^7.52.1", + "react-leaflet": "^4.2.1", + "react-leaflet-draw": "^0.20.4", + "react-leaflet-markercluster": "^4.2.1", + "react-qr-code": "^2.0.18", + "react-toastify": "^10.0.5", + "sass": "^1.75.0", + "sharp": "^0.33.4", + "stylis": "^4.3.1", + "stylis-plugin-rtl": "^2.1.1", + "swr": "^2.2.5", + "yup": "^1.4.0" + }, + "devDependencies": { + "eslint": "^8", + "eslint-config-next": "14.1.0", + "eslint-config-prettier": "^9.1.0", + "prettier": "^3.3.2" + } +} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js index 0fae9c1..f60b32b 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js @@ -1,18 +1,18 @@ -import WithPermission from "@/core/middlewares/withPermission"; -import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; -export const metadata = { - title: "کارتابل گزارش ترددها", -}; -const Page = () => { - return ( - - - - ); -}; - -export default Page; +import WithPermission from "@/core/middlewares/withPermission"; +import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; +export const metadata = { + title: "کارتابل گزارش ترددها", +}; +const Page = () => { + return ( + + + + ); +}; + +export default Page; diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js index 6aa2483..66bc585 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/violationsReports/page.js @@ -1,18 +1,18 @@ -import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; -import WithPermission from "@/core/middlewares/withPermission"; - -export const metadata = { - title: "کارتابل گزارش تخلفات", -}; - -export default function Page() { - return ( - - - - ); -} +import ViolationsReportsPage from "@/components/dashboard/roadMissions/reports/violationsReports"; +import WithPermission from "@/core/middlewares/withPermission"; + +export const metadata = { + title: "کارتابل گزارش تخلفات", +}; + +export default function Page() { + return ( + + + + ); +} diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx index b398579..938d1e7 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, -} from "@/core/utils/routes"; -import useRequest from "@/lib/hooks/useRequest"; -import { useTheme } from "@emotion/react"; -import DescriptionIcon from "@mui/icons-material/Description"; -import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; -import FileSaver from "file-saver"; -import moment from "jalali-moment"; -import { useMemo, useState } from "react"; - -const PrintExcel = ({ table, filterData }) => { - const theme = useTheme(); - const isMobile = useMediaQuery(theme.breakpoints.down("sm")); - const [loading, setLoading] = useState(false); - const requestServer = useRequest({ notificationSuccess: true }); - const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { - if (filter.value) { - acc.push({ id: filter.id, value: filter.value }); - } - return acc; - }, []); - - const filterParams = useMemo(() => { - const params = new URLSearchParams(); - activeFilters.length > 0 && - activeFilters.map((filter, index) => { - params.set(`${filter.id}`, filter.value); - }); - return params; - }, [activeFilters]); - - const clickHandler = () => { - setLoading(true); - const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); - const requestUrl = - CountryOrProvince.value === "-1" - ? EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; - requestServer(`${requestUrl}?${filterParams}`, "get", { - requestOptions: { responseType: "blob" }, - }) - .then((response) => { - const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; - FileSaver.saveAs(response.data, filename); - }) - .catch(() => {}) - .finally(() => { - setLoading(false); - }); - }; - - return ( - <> - {isMobile ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { useTheme } from "@emotion/react"; +import DescriptionIcon from "@mui/icons-material/Description"; +import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; +import FileSaver from "file-saver"; +import moment from "jalali-moment"; +import { useMemo, useState } from "react"; + +const PrintExcel = ({ table, filterData }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [loading, setLoading] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { + if (filter.value) { + acc.push({ id: filter.id, value: filter.value }); + } + return acc; + }, []); + + const filterParams = useMemo(() => { + const params = new URLSearchParams(); + activeFilters.length > 0 && + activeFilters.map((filter, index) => { + params.set(`${filter.id}`, filter.value); + }); + return params; + }, [activeFilters]); + + const clickHandler = () => { + setLoading(true); + const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); + const requestUrl = + CountryOrProvince.value === "-1" + ? EXPORT_MISSIONS_REPORT_TARADOD_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_TARADOD_PROVINCE_EXCEL_ACTIVITY; + requestServer(`${requestUrl}?${filterParams}`, "get", { + requestOptions: { responseType: "blob" }, + }) + .then((response) => { + const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; + FileSaver.saveAs(response.data, filename); + }) + .catch(() => {}) + .finally(() => { + setLoading(false); + }); + }; + + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx index 12de496..a80cabb 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx @@ -1,138 +1,138 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const TaradodReportLists = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل ماموریت ها", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "khareg_mahdode", - header: "تردد خارج از محدوده", - id: "khareg_mahdode", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "durations", - header: "جمع ساعات ماموریت", - id: "duration", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "جمع ساعات gps", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_h", - header: "با فرایند ساعتی", - id: "far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "far_d", - header: "با فرایند روزانه", - id: "far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_h", - header: "بدون فرایند ساعتی", - id: "un_far_h", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "un_far_d", - header: "بدون فرایند روزانه", - id: "un_far_d", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "item", - header: "فعالیت روزانه", - id: "item", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "patrol", - header: "گشت راهداری", - id: "patrol", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default TaradodReportLists; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const TaradodReportLists = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل ماموریت ها", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "khareg_mahdode", + header: "تردد خارج از محدوده", + id: "khareg_mahdode", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "durations", + header: "جمع ساعات ماموریت", + id: "duration", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "جمع ساعات gps", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_h", + header: "با فرایند ساعتی", + id: "far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "far_d", + header: "با فرایند روزانه", + id: "far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_h", + header: "بدون فرایند ساعتی", + id: "un_far_h", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "un_far_d", + header: "بدون فرایند روزانه", + id: "un_far_d", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "item", + header: "فعالیت روزانه", + id: "item", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "patrol", + header: "گشت راهداری", + id: "patrol", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default TaradodReportLists; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); + onChange(formattedDate); // Update the field value in react-hook-form + }} + helperText={error ? error.message : null} + /> + )} + /> + ); +}; +export default FromDateController; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx index fc4a776..ef3ff49 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); + onChange(formattedDate); // Update the field value in react-hook-form + }} + helperText={error ? error.message : null} + /> + )} + /> + ); +}; +export default ToDateController; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +import StyledForm from "@/core/components/StyledForm"; +import SearchReportField from "./SearchReportField"; + +const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { + return ( + <> + + + + + ); +}; +export default SearchReportList; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +import { Box } from "@mui/material"; +import PrintExcel from "./ExcelPrint"; + +const Toolbar = ({ table, filterData, mutate }) => { + return ( + + + + ); +}; +export default Toolbar; diff --git a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx index ce41101..1af4608 100644 --- a/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx @@ -1,142 +1,142 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, -} from "@/core/utils/routes"; -import { useAuth } from "@/lib/contexts/auth"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import useRequest from "@/lib/hooks/useRequest"; -import { yupResolver } from "@hookform/resolvers/yup"; -import { LinearProgress, Stack } from "@mui/material"; -import moment from "jalali-moment"; -import { useEffect, useState } from "react"; -import { useForm } from "react-hook-form"; -import * as yup from "yup"; -import TaradodReportLists from "./MissionsReportLists"; -import SearchReportList from "./Search"; - -const TaradodReportPage = () => { - const [data, setData] = useState(null); - const { data: userPermissions } = usePermissions(); - const { user } = useAuth(); - const requestServer = useRequest(); - const [provinceId, setProvinceId] = useState(user.province_id || "-1"); - const hasProvincesPermission = userPermissions?.includes("mission-report-country"); - - const defaultValues = { - from_date: moment(new Date()).format("YYYY-MM-DD"), - date_to: moment(new Date()).format("YYYY-MM-DD"), - province_id: provinceId, - }; - const defaultFilter = [ - { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]; - const [specialFilter, setSpecialFilter] = useState(defaultFilter); - - const onSearchSubmit = async (data) => { - const params = new URLSearchParams(); - params.set("from_date", `${data.from_date}`); - params.set("date_to", `${data.date_to}`); - setSpecialFilter([ - { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]); - if (data.province_id === "-1") { - try { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } - }; - - useEffect(() => { - if (!userPermissions) return; - onSearchSubmit(defaultValues); - }, [userPermissions]); - - const validationSchema = yup.object().shape({ - from_date: yup - .string() - .required("تاریخ شروع الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") - .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - date_to: yup - .string() - .required("تاریخ پایان الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") - .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - province_id: yup.string().nullable(), - }); - - const { control, handleSubmit } = useForm({ - defaultValues, - resolver: yupResolver(validationSchema), - mode: "all", - }); - - return ( - - - - {!data ? : } - - ); -}; -export default TaradodReportPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY, +} from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { LinearProgress, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useState } from "react"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import TaradodReportLists from "./MissionsReportLists"; +import SearchReportList from "./Search"; + +const TaradodReportPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const [provinceId, setProvinceId] = useState(user.province_id || "-1"); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + + const defaultValues = { + from_date: moment(new Date()).format("YYYY-MM-DD"), + date_to: moment(new Date()).format("YYYY-MM-DD"), + province_id: provinceId, + }; + const defaultFilter = [ + { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]; + const [specialFilter, setSpecialFilter] = useState(defaultFilter); + + const onSearchSubmit = async (data) => { + const params = new URLSearchParams(); + params.set("from_date", `${data.from_date}`); + params.set("date_to", `${data.date_to}`); + setSpecialFilter([ + { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]); + if (data.province_id === "-1") { + try { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_TARADOD_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } + }; + + useEffect(() => { + if (!userPermissions) return; + onSearchSubmit(defaultValues); + }, [userPermissions]); + + const validationSchema = yup.object().shape({ + from_date: yup + .string() + .required("تاریخ شروع الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") + .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + date_to: yup + .string() + .required("تاریخ پایان الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") + .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + province_id: yup.string().nullable(), + }); + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + return ( + + + + {!data ? : } + + ); +}; +export default TaradodReportPage; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx index b7487f6..3968fff 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ExcelPrint/index.jsx @@ -1,77 +1,77 @@ -"use client"; -import { - EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, - EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, -} from "@/core/utils/routes"; -import useRequest from "@/lib/hooks/useRequest"; -import { useTheme } from "@emotion/react"; -import DescriptionIcon from "@mui/icons-material/Description"; -import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; -import FileSaver from "file-saver"; -import moment from "jalali-moment"; -import { useMemo, useState } from "react"; - -const PrintExcel = ({ table, filterData }) => { - const theme = useTheme(); - const isMobile = useMediaQuery(theme.breakpoints.down("sm")); - const [loading, setLoading] = useState(false); - const requestServer = useRequest({ notificationSuccess: true }); - const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { - if (filter.value) { - acc.push({ id: filter.id, value: filter.value }); - } - return acc; - }, []); - - const filterParams = useMemo(() => { - const params = new URLSearchParams(); - activeFilters.length > 0 && - activeFilters.map((filter, index) => { - params.set(`${filter.id}`, filter.value); - }); - return params; - }, [activeFilters]); - - const clickHandler = () => { - setLoading(true); - const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); - const requestUrl = - CountryOrProvince.value === "-1" - ? EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY - : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; - requestServer(`${requestUrl}?${filterParams}`, "get", { - requestOptions: { responseType: "blob" }, - }) - .then((response) => { - const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; - FileSaver.saveAs(response.data, filename); - }) - .catch(() => {}) - .finally(() => { - setLoading(false); - }); - }; - - return ( - <> - {isMobile ? ( - - - - ) : ( - - )} - - ); -}; -export default PrintExcel; +"use client"; +import { + EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY, + EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY, +} from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { useTheme } from "@emotion/react"; +import DescriptionIcon from "@mui/icons-material/Description"; +import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material"; +import FileSaver from "file-saver"; +import moment from "jalali-moment"; +import { useMemo, useState } from "react"; + +const PrintExcel = ({ table, filterData }) => { + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + const [loading, setLoading] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => { + if (filter.value) { + acc.push({ id: filter.id, value: filter.value }); + } + return acc; + }, []); + + const filterParams = useMemo(() => { + const params = new URLSearchParams(); + activeFilters.length > 0 && + activeFilters.map((filter, index) => { + params.set(`${filter.id}`, filter.value); + }); + return params; + }, [activeFilters]); + + const clickHandler = () => { + setLoading(true); + const CountryOrProvince = activeFilters.find((item) => item.id === "province_id"); + const requestUrl = + CountryOrProvince.value === "-1" + ? EXPORT_MISSIONS_REPORT_VIOLATION_COUNTRY_EXCEL_ACTIVITY + : EXPORT_MISSIONS_REPORT_VIOLATION_PROVINCE_EXCEL_ACTIVITY; + requestServer(`${requestUrl}?${filterParams}`, "get", { + requestOptions: { responseType: "blob" }, + }) + .then((response) => { + const filename = `خروجی کارتابل گزارشات گشت راهداری تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`; + FileSaver.saveAs(response.data, filename); + }) + .catch(() => {}) + .finally(() => { + setLoading(false); + }); + }; + + return ( + <> + {isMobile ? ( + + + + ) : ( + + )} + + ); +}; +export default PrintExcel; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx index 490ee7b..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/FromDateController.jsx @@ -1,27 +1,27 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller } from "react-hook-form"; - -const FromDateController = ({ control }) => { - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default FromDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; + +const FromDateController = ({ control }) => { + return ( + ( + { + const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); + onChange(formattedDate); // Update the field value in react-hook-form + }} + helperText={error ? error.message : null} + /> + )} + /> + ); +}; +export default FromDateController; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx index bde2a4c..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SearchReportField.jsx @@ -1,44 +1,44 @@ -import SearchIcon from "@mui/icons-material/Search"; -import { Button, Grid } from "@mui/material"; -import { Controller } from "react-hook-form"; -import FromDateController from "./FromDateController"; -import SelectProvince from "./SelectProvince"; -import ToDateController from "./ToDateController"; - -const SearchReportField = ({ control, hasProvincesPermission }) => { - return ( - - - - - - - - {hasProvincesPermission && ( - - - - )} - - ( - - )} - /> - - - ); -}; - -export default SearchReportField; +import SearchIcon from "@mui/icons-material/Search"; +import { Button, Grid } from "@mui/material"; +import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; + +const SearchReportField = ({ control, hasProvincesPermission }) => { + return ( + + + + + + + + {hasProvincesPermission && ( + + + + )} + + ( + + )} + /> + + + ); +}; + +export default SearchReportField; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx index 2b24d67..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/SelectProvince.jsx @@ -1,45 +1,45 @@ -import useProvinces from "@/lib/hooks/useProvince"; -import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; -import { Controller } from "react-hook-form"; - -const SelectProvince = ({ control }) => { - const { provinces, loadingProvinces, errorProvinces } = useProvinces(); - return ( - ( - - استان - - {error && {error.message}} - - )} - /> - ); -}; -export default SelectProvince; +import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; + +const SelectProvince = ({ control }) => { + const { provinces, loadingProvinces, errorProvinces } = useProvinces(); + return ( + ( + + استان + + {error && {error.message}} + + )} + /> + ); +}; +export default SelectProvince; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx index 2dd7263..9b9ac81 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/ToDateController.jsx @@ -1,30 +1,30 @@ -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import moment from "jalali-moment"; -import { Controller, useWatch } from "react-hook-form"; - -const ToDateController = ({ control }) => { - const minDate = useWatch({ control, name: "from_date" }); - return ( - ( - { - const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); - onChange(formattedDate); // Update the field value in react-hook-form - }} - helperText={error ? error.message : null} - /> - )} - /> - ); -}; -export default ToDateController; +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; + +const ToDateController = ({ control }) => { + const minDate = useWatch({ control, name: "from_date" }); + return ( + ( + { + const formattedDate = moment(new Date(newValue)).locale("en").format("YYYY-MM-DD"); + onChange(formattedDate); // Update the field value in react-hook-form + }} + helperText={error ? error.message : null} + /> + )} + /> + ); +}; +export default ToDateController; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx index f29d302..9d504f2 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Search/index.jsx @@ -1,13 +1,13 @@ -import StyledForm from "@/core/components/StyledForm"; -import SearchReportField from "./SearchReportField"; - -const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { - return ( - <> - - - - - ); -}; -export default SearchReportList; +import StyledForm from "@/core/components/StyledForm"; +import SearchReportField from "./SearchReportField"; + +const SearchReportList = ({ handleSubmit, onSearchSubmit, control, hasProvincesPermission }) => { + return ( + <> + + + + + ); +}; +export default SearchReportList; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx index 0f726c7..afc132c 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/Toolbar.jsx @@ -1,11 +1,11 @@ -import { Box } from "@mui/material"; -import PrintExcel from "./ExcelPrint"; - -const Toolbar = ({ table, filterData, mutate }) => { - return ( - - - - ); -}; -export default Toolbar; +import { Box } from "@mui/material"; +import PrintExcel from "./ExcelPrint"; + +const Toolbar = ({ table, filterData, mutate }) => { + return ( + + + + ); +}; +export default Toolbar; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx index 60966f8..61f7282 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/ViolationsReportsList.jsx @@ -1,98 +1,98 @@ -"use client"; -import DataTableWithAuth from "@/core/components/DataTableWithAuth"; -import { Box } from "@mui/material"; -import { useEffect, useMemo } from "react"; -import Toolbar from "./Toolbar"; - -const ViolationsReportsList = ({ data, specialFilter }) => { - const columns = useMemo(() => { - return [ - { - accessorKey: "edare_name", - header: "اداره کل", - id: "edare_name", - enableColumnFilter: false, - enableSorting: false, - datatype: "text", - grow: false, - size: 50, - }, - { - accessorKey: "total", - header: "کل تخلفات", - id: "total", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "done", - header: "اقدام شده", - id: "done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "undone", - header: "اقدام نشده", - id: "un_done", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "gps", - header: "GPS", - id: "gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "herasat", - header: "ثبت حراست", - id: "herasat", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - { - accessorKey: "mil_gps", - header: "کیلومتر GPS", - id: "mil_gps", - enableColumnFilter: false, - enableSorting: false, - datatype: "numeric", - grow: false, - size: 50, - }, - ]; - }, []); - - return ( - - - - ); -}; - -export default ViolationsReportsList; +"use client"; +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useEffect, useMemo } from "react"; +import Toolbar from "./Toolbar"; + +const ViolationsReportsList = ({ data, specialFilter }) => { + const columns = useMemo(() => { + return [ + { + accessorKey: "edare_name", + header: "اداره کل", + id: "edare_name", + enableColumnFilter: false, + enableSorting: false, + datatype: "text", + grow: false, + size: 50, + }, + { + accessorKey: "total", + header: "کل تخلفات", + id: "total", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "done", + header: "اقدام شده", + id: "done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "undone", + header: "اقدام نشده", + id: "un_done", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "gps", + header: "GPS", + id: "gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "herasat", + header: "ثبت حراست", + id: "herasat", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + { + accessorKey: "mil_gps", + header: "کیلومتر GPS", + id: "mil_gps", + enableColumnFilter: false, + enableSorting: false, + datatype: "numeric", + grow: false, + size: 50, + }, + ]; + }, []); + + return ( + + + + ); +}; + +export default ViolationsReportsList; diff --git a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx index 37d765f..d7f9a5a 100644 --- a/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/violationsReports/index.jsx @@ -1,141 +1,141 @@ -"use client"; -import PageTitle from "@/core/components/PageTitle"; -import { - GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, - GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, -} from "@/core/utils/routes"; -import { useAuth } from "@/lib/contexts/auth"; -import { usePermissions } from "@/lib/hooks/usePermissions"; -import useRequest from "@/lib/hooks/useRequest"; -import { yupResolver } from "@hookform/resolvers/yup"; -import { LinearProgress, Stack } from "@mui/material"; -import moment from "jalali-moment"; -import { useEffect, useState } from "react"; -import { useForm } from "react-hook-form"; -import * as yup from "yup"; -import ViolationsReportsList from "./ViolationsReportsList"; -import SearchReportList from "./Search"; - -const ViolationsReportsPage = () => { - const [data, setData] = useState(null); - const { data: userPermissions } = usePermissions(); - const { user } = useAuth(); - const requestServer = useRequest(); - const hasProvincesPermission = userPermissions?.includes("mission-report-country"); - - const defaultValues = { - from_date: moment(new Date()).format("YYYY-MM-DD"), - date_to: moment(new Date()).format("YYYY-MM-DD"), - province_id: user.province_id || "-1", - }; - const defaultFilter = [ - { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]; - const [specialFilter, setSpecialFilter] = useState(defaultFilter); - - const onSearchSubmit = async (data) => { - const params = new URLSearchParams(); - params.set("from_date", `${data.from_date}`); - params.set("date_to", `${data.date_to}`); - setSpecialFilter([ - { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, - { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, - { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, - ]); - if (data.province_id === "-1") { - try { - // params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); - const result = response.data.data; - const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); - const nationalReport = { - edare_name: "کل کشور", - ...nationalReportForItem, - }; - - setData({ - data: [ - nationalReport, - ...result.provinces.map((province) => { - const filteredReports = result.activities.find( - (report) => report.province_id == province.id - ); - return { - ...filteredReports, - edare_name: province.name_fa, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } else { - try { - params.set("province_id", `${data.province_id}`); - const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); - const result = response.data.data; - - const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); - - const nationalReport = { - ...nationalReportForItem, - edare_name: "کل استان", - }; - setData({ - data: [ - nationalReport, - ...result.city.map((city) => { - const filteredReports = result.activities.find((report) => report.city_id == city.id); - return { - edare_name: city.name_fa, - ...filteredReports, - }; - }), - ], - filters: data, - }); - } catch (e) {} - } - }; - - useEffect(() => { - if (!userPermissions) return; - onSearchSubmit(defaultValues); - }, [userPermissions]); - - const validationSchema = yup.object().shape({ - from_date: yup - .string() - .required("تاریخ شروع الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") - .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - date_to: yup - .string() - .required("تاریخ پایان الزامی است!") - .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") - .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), - province_id: yup.string().nullable(), - }); - - const { control, handleSubmit } = useForm({ - defaultValues, - resolver: yupResolver(validationSchema), - mode: "all", - }); - - return ( - - - - {!data ? : } - - ); -}; -export default ViolationsReportsPage; +"use client"; +import PageTitle from "@/core/components/PageTitle"; +import { + GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY, + GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY, +} from "@/core/utils/routes"; +import { useAuth } from "@/lib/contexts/auth"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { LinearProgress, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { useEffect, useState } from "react"; +import { useForm } from "react-hook-form"; +import * as yup from "yup"; +import ViolationsReportsList from "./ViolationsReportsList"; +import SearchReportList from "./Search"; + +const ViolationsReportsPage = () => { + const [data, setData] = useState(null); + const { data: userPermissions } = usePermissions(); + const { user } = useAuth(); + const requestServer = useRequest(); + const hasProvincesPermission = userPermissions?.includes("mission-report-country"); + + const defaultValues = { + from_date: moment(new Date()).format("YYYY-MM-DD"), + date_to: moment(new Date()).format("YYYY-MM-DD"), + province_id: user.province_id || "-1", + }; + const defaultFilter = [ + { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${defaultValues.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${defaultValues.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]; + const [specialFilter, setSpecialFilter] = useState(defaultFilter); + + const onSearchSubmit = async (data) => { + const params = new URLSearchParams(); + params.set("from_date", `${data.from_date}`); + params.set("date_to", `${data.date_to}`); + setSpecialFilter([ + { value: `${data.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, + { value: `${data.from_date}`, datatype: "date", id: "from_date", fn: "between" }, + { value: `${data.date_to}`, datatype: "date", id: "date_to", fn: "between" }, + ]); + if (data.province_id === "-1") { + try { + // params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_COUNTRY_ACTIVITY}?${params}`); + const result = response.data.data; + const nationalReportForItem = result.activities.find((report) => report.province_id === "-1"); + const nationalReport = { + edare_name: "کل کشور", + ...nationalReportForItem, + }; + + setData({ + data: [ + nationalReport, + ...result.provinces.map((province) => { + const filteredReports = result.activities.find( + (report) => report.province_id == province.id + ); + return { + ...filteredReports, + edare_name: province.name_fa, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } else { + try { + params.set("province_id", `${data.province_id}`); + const response = await requestServer(`${GET_MISSIONS_REPORT_VIOLATION_PROVINCE_ACTIVITY}?${params}`); + const result = response.data.data; + + const nationalReportForItem = result.activities.find((report) => report.city_id === "-1"); + + const nationalReport = { + ...nationalReportForItem, + edare_name: "کل استان", + }; + setData({ + data: [ + nationalReport, + ...result.city.map((city) => { + const filteredReports = result.activities.find((report) => report.city_id == city.id); + return { + edare_name: city.name_fa, + ...filteredReports, + }; + }), + ], + filters: data, + }); + } catch (e) {} + } + }; + + useEffect(() => { + if (!userPermissions) return; + onSearchSubmit(defaultValues); + }, [userPermissions]); + + const validationSchema = yup.object().shape({ + from_date: yup + .string() + .required("تاریخ شروع الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ شروع الزامی است!") + .test("is-valid-date", "تاریخ شروع معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + date_to: yup + .string() + .required("تاریخ پایان الزامی است!") + .matches(/^\d{4}-\d{2}-\d{2}$/, "تاریخ پایان الزامی است!") + .test("is-valid-date", "تاریخ پایان معتبر نیست!", (value) => moment(value, "YYYY-MM-DD", true).isValid()), + province_id: yup.string().nullable(), + }); + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + return ( + + + + {!data ? : } + + ); +}; +export default ViolationsReportsPage; -- 2.49.1 From 05dc5505cd173da61cf8944a36194cdbf8f3fe2d Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 11:16:48 +0330 Subject: [PATCH 5/7] exit station time --- .../Actions/CreateViolation/Form/index.jsx | 2 +- .../CreateWithoutProcess/Form/index.jsx | 10 +- .../Actions/EditViolation/EditController.jsx | 6 +- .../EditViolation/MissionDates/index.jsx | 1 - .../violations/ViolationsList.jsx | 213 +++++++++++++----- 5 files changed, 160 insertions(+), 72 deletions(-) diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx index ad34476..5d94b1f 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateViolation/Form/index.jsx @@ -20,7 +20,7 @@ const ViolationForm = ({ setOpenMachinesDialog, mutate, openMachinesDialog }) => data: { machine_code: result.machinesId.machine_code, km: result.km, - exit_time: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, + exit_station: `${result.start_date} ${moment(result.start_time).format("HH:mm")}`, }, }) .then((response) => { diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 76230ad..5460b5a 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -1,7 +1,6 @@ -import { AccessTime, Engineering, InsertDriveFile, Person, Verified } from "@mui/icons-material"; +import { Engineering, InsertDriveFile, Person, Verified } from "@mui/icons-material"; import { Box, Tab, Tabs } from "@mui/material"; import { useReducer, useState } from "react"; -import GetDateTime from "./GetDateTime"; import GetItemInfo from "./GetItemInfo"; import MachineAndDriver from "./MachineAndDriver"; import Rahdaran from "./Rahdaran"; @@ -42,7 +41,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState((t) => t - 1); } }; - return ( <> { setTabState={setTabState} /> - + { @@ -83,7 +81,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -93,7 +91,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx index ab16760..6b3bfa3 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/EditController.jsx @@ -7,17 +7,17 @@ import moment from "jalali-moment"; const EditController = ({ rowId, mutate, setOpen, row }) => { const requestServer = useRequest({ notificationSuccess: true }); - const [endDate] = row?.original?.enter_time?.split(" ") || [null]; + const [endDate] = row?.original?.enter_station?.split(" ") || [null]; const defaultData = { end_date: endDate, - end_time: row?.original?.enter_time ? new Date(row.original.enter_time) : null, + end_time: row?.original?.enter_station ? new Date(row.original.enter_station) : null, }; const handleSubmit = async (result) => { const payload = {}; if (result.end_date && result.end_time) { - payload.enter_time = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; + payload.enter_station = `${result.end_date} ${moment(result.end_time).format("HH:mm")}`; } await requestServer(`${EDIT_VIOLATION}/${rowId}`, "post", { diff --git a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx index ba07a09..8b0eaa5 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/EditViolation/MissionDates/index.jsx @@ -41,7 +41,6 @@ const MissionDates = ({ control }) => { name="end_time" error={error} value={field.value} - views={["hours"]} placeholder={"زمان پایان ماموریت را وارد کنید"} label={"زمان پایان ماموریت"} setFieldValue={(name, value) => field.onChange(value || null)} diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index c78d6cc..11ccd46 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -7,75 +7,166 @@ import { useMemo } from "react"; import RowActions from "./RowActions"; import Toolbar from "./Toolbar"; import { violationsCategoryStatus } from "@/core/utils/violationsCategoryStatus"; +import useProvinces from "@/lib/hooks/useProvince"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import useCities from "@/lib/hooks/useCities"; const ViolationsList = () => { const columns = useMemo( - () => [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "status", - header: "وضعیت", - id: "status", + () => { + const dynamicColumns = { + header: "استان", + id: "province_id", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", - sortDescFirst: true, grow: false, - columnSelectOption: () => { - return violationsCategoryStatus.map((category) => ({ - value: category.id, - label: category.name_fa, - })); + size: 130, + ColumnSelectComponent: (props) => { + const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const getColumnSelectOptions = useMemo(() => { + if (loadingProvinces) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorProvinces) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل کشور" }, + ...provinces.map((province) => ({ + value: province.id, + label: province.name_fa, + })), + ]; + }, [provinces, errorProvinces, loadingProvinces]); + return ( + + ); }, - Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), - }, - { - accessorKey: "machine_code", - header: "کد خودرو", - id: "machine_code", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "machine", - header: "نام خودرو", - id: "machine", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - Cell: ({ row }) => row.original.machine?.car_name || "-", - }, - { - accessorKey: "mission_id", - header: "کد ماموریت", - id: "mission_id", - enableColumnFilter: false, - datatype: "numeric", - filterMode: "equals", - grow: false, - Cell: ({ row }) => row.original.mission_id || "-", - }, - { - accessorKey: "request_date", - header: "تاریخ تخلف", - id: "request_date", - enableColumnFilter: true, - datatype: "date", - filterMode: "between", - grow: false, - Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), - }, - ], + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + size: 120, + ColumnSelectComponent: (props) => { + const { cityList, loadingCityList, errorCityList } = useCities( + props.dependencyFieldValue.value + ); + + const getColumnSelectOptions = useMemo(() => { + if (props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingCityList) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorCityList) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل ادارات" }, + ...cityList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, + })), + ]; + }, [cityList, loadingCityList, errorCityList]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.city_name}, + }, + { + accessorKey: "machine", + header: "نام خودرو", + id: "machine", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + Cell: ({ row }) => row.original.machine?.car_name || "-", + }, + { + accessorKey: "mission_id", + header: "کد ماموریت", + id: "mission_id", + enableColumnFilter: false, + datatype: "numeric", + filterMode: "equals", + grow: false, + Cell: ({ row }) => row.original.mission_id || "-", + }, + { + accessorKey: "request_date", + header: "تاریخ تخلف", + id: "request_date", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), + }, + ]; + }, [] ); -- 2.49.1 From 1261c9dcc239921c6efac59bfcbf3f69da004cfa Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 15:09:12 +0330 Subject: [PATCH 6/7] operator violations page --- .../operator/Actions/Violations/Dialog.jsx | 28 ++ .../Form/Area/Routing/AlarmText.jsx | 28 ++ .../Form/Area/Routing/DataBox.jsx | 53 ++++ .../Form/Area/Routing/ShowRoute.jsx | 46 +++ .../Form/Area/Routing/index.jsx | 219 ++++++++++++++ .../MissionCorrection/Form/Area/index.jsx | 43 +++ .../Form/GetDateTime/MissionDates/index.jsx | 119 ++++++++ .../Form/GetDateTime/index.jsx | 59 ++++ .../Dialog/List/RowActions/SelectId/index.jsx | 20 ++ .../Dialog/List/RowActions/index.jsx | 10 + .../FastReactCode/Dialog/List/index.jsx | 274 ++++++++++++++++++ .../FastReactCode/Dialog/index.jsx | 49 ++++ .../Form/GetItemInfo/FastReactCode/index.jsx | 22 ++ .../Form/GetItemInfo/index.jsx | 150 ++++++++++ .../DriversSearch/Form/index.jsx | 61 ++++ .../DriversDialog/DriversSearch/index.jsx | 11 + .../MachineAndDriver/DriversDialog/index.jsx | 41 +++ .../MachineList/RowActions/Allocate/index.jsx | 20 ++ .../MachineList/RowActions/index.jsx | 6 + .../MachinesDialog/MachineList/index.jsx | 68 +++++ .../MachineAndDriver/MachinesDialog/index.jsx | 40 +++ .../Form/MachineAndDriver/index.jsx | 48 +++ .../Form/Rahdaran/Form/index.jsx | 66 +++++ .../Form/Rahdaran/List/index.jsx | 56 ++++ .../MissionCorrection/Form/Rahdaran/index.jsx | 36 +++ .../MissionCorrection/Form/Verify/index.jsx | 128 ++++++++ .../MissionCorrection/Form/index.jsx | 114 ++++++++ .../RowActions/MissionCorrection/index.jsx | 86 ++++++ .../Actions/Violations/RowActions/index.jsx | 9 + .../Actions/Violations/ViolationsList.jsx | 141 +++++++++ .../operator/Actions/Violations/index.jsx | 33 +++ .../RowActions/ChangeStatus/Dialog.jsx | 26 ++ .../operator/RowActions/ChangeStatus/Form.jsx | 111 +++++++ .../RowActions/ChangeStatus/index.jsx | 19 ++ .../operator/RowActions/index.jsx | 5 + .../roadMissions/operator/Toolbar.jsx | 2 + .../Form/MachinesDialog/MachineList/index.jsx | 32 ++ .../CreateWithoutProcess/Form/index.jsx | 17 +- .../violations/RowActions/index.jsx | 6 +- src/core/components/RahdarNameOrCode.jsx | 2 +- src/core/utils/routes.js | 3 + 41 files changed, 2289 insertions(+), 18 deletions(-) create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx create mode 100644 src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx create mode 100644 src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx new file mode 100644 index 0000000..bd3849a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -0,0 +1,28 @@ +import { Close } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton } from "@mui/material"; +import ViolationsList from "./ViolationsList"; + +const ViolationsDialog = ({ open, setOpen, mutate, row }) => { + return ( + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + تخلفات + {open && ( + + )} + + ); +}; +export default ViolationsDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx new file mode 100644 index 0000000..0ddf8a0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/AlarmText.jsx @@ -0,0 +1,28 @@ +import { Box, Typography } from "@mui/material"; + +const AlarmText = ({ isSource }) => { + if (isSource) return null; + return ( + + + با کلیک بر روی مارکر موقعیت را انتخاب کنید + + + ); +}; + +export default AlarmText; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx new file mode 100644 index 0000000..5768f75 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/DataBox.jsx @@ -0,0 +1,53 @@ +import { Box, Button, TextField } from "@mui/material"; + +const DataBox = ({ isSource, isDest, sourcePosition, destPosition, editingTarget, onEditSource, onEditDest }) => { + if (!isSource) return null; + + return ( + +
+ + {isSource && isDest && ( + + )} +
+ {isDest && ( +
+ + +
+ )} + + ); +}; + +export default DataBox; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx new file mode 100644 index 0000000..6827cde --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/ShowRoute.jsx @@ -0,0 +1,46 @@ +import { useEffect, useRef } from "react"; +import { Marker, Polyline, useMap } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; + +const ShowRoute = ({ area }) => { + const map = useMap(); + const defaultIconSize = [35, 35]; + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const sourceIcon = createCustomIcon(defaultIconSize, SourceIcon.src); + const destIcon = createCustomIcon(defaultIconSize, DestIcon.src); + useEffect(() => { + if (coords.length > 0) { + map.flyToBounds(coords, { padding: [50, 50], duration: 1.5 }); + } + }, [area]); + + if (!area) return null; + const coords = polyline.decode(area, 6); + + if (coords.length === 0) return null; + + const sourcePosition = coords[0]; + const destPosition = coords[coords.length - 1]; + + return ( + <> + + + + + ); +}; + +export default ShowRoute; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx new file mode 100644 index 0000000..49c4651 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/Routing/index.jsx @@ -0,0 +1,219 @@ +import { Marker, Polyline, useMapEvents } from "react-leaflet"; +import L from "leaflet"; +import polyline from "@mapbox/polyline"; +import SourceIcon from "@/assets/images/source-icon.svg"; +import PrevSourceIcon from "@/assets/images/prev-source-icon.svg"; +import PrevDestIcon from "@/assets/images/prev-destination-icon.svg"; +import DestIcon from "@/assets/images/destination-icon.svg"; +import { useEffect, useRef, useState } from "react"; +import DataBox from "./DataBox"; +import AlarmText from "./AlarmText"; + +const Routing = ({ setArea, setLocations, locations, area }) => { + const mapPrevSourceMarker = useRef(); + const mapPrevDestMarker = useRef(); + const mapRef = useRef(null); + const defaultIconSize = [35, 35]; + const [isSource, setIsSource] = useState(false); + const [sourcePosition, setSourcePosition] = useState(null); + const [isDest, setIsDest] = useState(false); + const [destPosition, setDestPosition] = useState(null); + const [routeCoords, setRouteCoords] = useState([]); + const [alternateCoords, setAlternateCoords] = useState([]); + const [editingTarget, setEditingTarget] = useState(null); + const [selectedRoute, setSelectedRoute] = useState(null); + + const createCustomIcon = (size, iconUrl) => { + return L.icon({ + iconUrl: iconUrl, + iconSize: size, + iconAnchor: [size[0] / 2, size[1]], + popupAnchor: [0, -size[1]], + }); + }; + + const defaultIcon = createCustomIcon( + defaultIconSize, + isSource && editingTarget !== "source" ? SourceIcon.src : PrevSourceIcon.src + ); + + const prevDestIcon = createCustomIcon( + defaultIconSize, + isDest && editingTarget !== "dest" ? DestIcon.src : PrevDestIcon.src + ); + + const isMovingSource = !isSource || editingTarget === "source"; + const isMovingDest = isSource && (!isDest || editingTarget === "dest"); + + const map = useMapEvents({ + move(e) { + if (isMovingSource) mapPrevSourceMarker.current.setLatLng(e.target.getCenter()); + if (isMovingDest && mapPrevDestMarker.current) mapPrevDestMarker.current.setLatLng(e.target.getCenter()); + }, + movestart() { + if (isMovingSource) mapPrevSourceMarker.current.setIcon(createCustomIcon([45, 45], PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon([45, 45], PrevDestIcon.src)); + }, + moveend() { + if (isMovingSource) + mapPrevSourceMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevSourceIcon.src)); + if (isMovingDest && mapPrevDestMarker.current) + mapPrevDestMarker.current.setIcon(createCustomIcon(defaultIconSize, PrevDestIcon.src)); + }, + }); + + useEffect(() => { + mapRef.current = map; + }, [map]); + + useEffect(() => { + if (locations.length < 2) return; + const restoredSource = { lat: locations[0].lat, lng: locations[0].lon }; + const restoredDest = { lat: locations[1].lat, lng: locations[1].lon }; + setSourcePosition(restoredSource); + setDestPosition(restoredDest); + setIsSource(true); + setIsDest(true); + if (area) { + const decoded = polyline.decode(area, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + setTimeout(() => { + mapRef.current?.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + }, 100); + } else { + fetchRoute(restoredSource, restoredDest); + } + }, []); + + const fetchRoute = async (source, dest) => { + const locs = [ + { lat: source.lat, lon: source.lng }, + { lat: dest.lat, lon: dest.lng }, + ]; + try { + const response = await fetch("https://jouya.141.ir/api/router/drive", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ locations: locs }), + }); + const data = await response.json(); + const shape = data.trip.legs[0].shape; + setLocations(locs); + setArea(shape); + const decoded = polyline.decode(shape, 6); + setRouteCoords(decoded); + setSelectedRoute({ index: "main", coords: decoded }); + + if (data.alternates?.length > 0) { + const decodedAlternates = data.alternates.map((alt) => polyline.decode(alt.trip.legs[0].shape, 6)); + setAlternateCoords(decodedAlternates); + } else { + setAlternateCoords([]); + } + map.flyToBounds(decoded, { padding: [50, 50], duration: 1.5 }); + } catch (error) { + console.error("Routing error:", error); + } + }; + + const handleMarkerClick = async () => { + if (!isSource || editingTarget === "source") { + const clickedPosition = mapPrevSourceMarker.current.getLatLng(); + setSourcePosition(clickedPosition); + setIsSource(true); + setEditingTarget(null); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + + if (editingTarget === "source" && destPosition) { + await fetchRoute(clickedPosition, destPosition); + } + } + }; + + const handleDestMarkerClick = async () => { + if (!isDest || editingTarget === "dest") { + const clickedPosition = mapPrevDestMarker.current.getLatLng(); + setDestPosition(clickedPosition); + setIsDest(true); + setEditingTarget(null); + + await fetchRoute(sourcePosition, clickedPosition); + } + }; + + const handleEditSource = () => { + setEditingTarget("source"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleEditDest = () => { + setEditingTarget("dest"); + setRouteCoords([]); + setAlternateCoords([]); + setSelectedRoute(null); + }; + + const handleSelectRoute = (index, coords) => { + setSelectedRoute({ index, coords }); + const encoded = polyline.encode(coords, 6); + setArea(encoded); + map.flyToBounds(coords, { padding: [50, 50], duration: 0.3 }); + }; + + return ( + <> + + + + {isSource && ( + + )} + {alternateCoords.map((coords, index) => ( + handleSelectRoute(index, coords) }} + /> + ))} + {routeCoords.length > 0 && ( + handleSelectRoute("main", routeCoords) }} + /> + )} + + ); +}; + +export default Routing; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx new file mode 100644 index 0000000..200c1e0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Area/index.jsx @@ -0,0 +1,43 @@ +import MapLoading from "@/core/components/MapLayer/Loading"; +import { Box, Button, DialogActions, DialogContent, Stack } from "@mui/material"; +import dynamic from "next/dynamic"; +import { useCallback, useState } from "react"; +import Routing from "./Routing"; +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const Area = ({ allData, setAllData, handlePrev, setTabState }) => { + const [area, setArea] = useState(allData.area); + const [locations, setLocations] = useState(allData.locations); + + const handleNext = useCallback(() => { + setAllData({ area: area }); + setAllData({ locations: locations }); + setTabState((s) => s + 1); + }, [area]); + + return ( + <> + + + + + + + + + + + + + + + ); +}; +export default Area; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx new file mode 100644 index 0000000..56752de --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/MissionDates/index.jsx @@ -0,0 +1,119 @@ +import MuiDatePicker from "@/core/components/MuiDatePicker"; +import MuiTimePicker from "@/core/components/MuiTimePicker"; +import { makeDateTime } from "@/core/utils/makeDateTime"; +import { Grid } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; + +const MissionDates = ({ control }) => { + const start_date = useWatch({ control, name: "start_date" }); + const end_date = useWatch({ control, name: "end_date" }); + const start_time = useWatch({ control, name: "start_time" }); + const end_time = useWatch({ control, name: "end_time" }); + + const startDateTime = makeDateTime(start_date, start_time); + const endDateTime = makeDateTime(end_date, end_time); + const now = new Date(); + + return ( + <> + + ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + )} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + )} + /> + + + { + return ( + field.onChange(value || null)} + helperText={error ? error.message : null} + /> + ); + }} + /> + + + ); +}; + +export default MissionDates; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx new file mode 100644 index 0000000..1b096e9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetDateTime/index.jsx @@ -0,0 +1,59 @@ +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { missionTypes } from "@/core/utils/missionTypes"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; +import moment from "jalali-moment"; +import { Controller, useForm } from "react-hook-form"; +import { object, string } from "yup"; +import MissionDates from "./MissionDates"; + +const validationSchema = object({ + start_date: string().required("تاریخ شروع ماموریت را مشخص کنید!"), + start_time: string().required("زمان شروع ماموریت را مشخص کنید!"), + end_date: string().required("تاریخ پایان ماموریت را مشخص کنید!"), + end_time: string().required("زمان شروع ماموریت را مشخص کنید!"), +}); + +const GetDateTime = ({ allData, setAllData, handlePrev, setTabState }) => { + const defaultValues = { + start_date: allData.start_date, + start_time: allData.start_time ? moment(allData.start_time).toDate() : null, + end_date: allData.end_date, + end_time: allData.end_time ? moment(allData.end_time).toDate() : null, + }; + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + + + + + + + + + + + + + + + + ); +}; +export default GetDateTime; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx new file mode 100644 index 0000000..e3e14c0 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/SelectId/index.jsx @@ -0,0 +1,20 @@ +import { Done } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; + +const SelectId = ({ row, onChange, setOpenFastReactDialog }) => { + const handleClick = () => { + onChange(row.original.id); + setOpenFastReactDialog(false); + }; + + return ( + <> + + + + + + + ); +}; +export default SelectId; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx new file mode 100644 index 0000000..646104b --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/RowActions/index.jsx @@ -0,0 +1,10 @@ +import SelectId from "./SelectId"; + +const RowActions = ({ row, onChange, setOpenFastReactDialog }) => { + return ( + <> + + + ); +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx new file mode 100644 index 0000000..8940335 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/List/index.jsx @@ -0,0 +1,274 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { GET_FAST_REACT_COMPLAINTS } from "@/core/utils/routes"; +import { Box, Stack, Typography } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { usePermissions } from "@/lib/hooks/usePermissions"; +import { useAuth } from "@/lib/contexts/auth"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import DescriptionForm from "@/components/dashboard/fastReact/complaintList/RowActions/DescriptionDialog"; +import LocationForm from "@/components/dashboard/fastReact/complaintList/RowActions/LocationDialog"; +import moment from "jalali-moment"; +import useProvinces from "@/lib/hooks/useProvince"; +import useEdaratLists from "@/lib/hooks/useEdaratLists"; + +const FastReactList = ({ onChange, setOpenFastReactDialog }) => { + const { data: userPermissions } = usePermissions(); + const hasCountryPermission = userPermissions?.includes("show-fast-react"); + const { user } = useAuth(); + const columns = useMemo(() => { + const dynamicColumns = { + header: "استان", + id: "road_observeds__province_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + grow: false, + size: 130, + ColumnSelectComponent: (props) => { + const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const getColumnSelectOptions = useMemo(() => { + if (loadingProvinces) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorProvinces) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل کشور" }, + ...provinces.map((province) => ({ + value: province.id, + label: province.name_fa, + })), + ]; + }, [provinces, errorProvinces, loadingProvinces]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.province_fa}, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "road_observeds__id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ...(hasCountryPermission ? [dynamicColumns] : []), + { + header: "اداره", + id: "road_observeds__edarate_shahri_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: hasCountryPermission ? "road_observeds__province_id" : null, + grow: false, + size: 120, + ColumnSelectComponent: (props) => { + const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + const [prevDependency, setPrevDependency] = useState( + hasCountryPermission ? props.dependencyFieldValue.value : user.province_id + ); + + const getColumnSelectOptions = useMemo(() => { + if (hasCountryPermission && props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingEdaratList) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorEdaratList) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل ادارات" }, + ...edaratList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, + })), + ]; + }, [edaratList, loadingEdaratList, errorEdaratList]); + useEffect(() => { + if (hasCountryPermission) return; + if (prevDependency === props.dependencyFieldValue?.value) return; + props.handleChange({ ...props.filterParameters, value: "" }); + setPrevDependency(props.dependencyFieldValue?.value); + }, [props.dependencyFieldValue?.value, hasCountryPermission]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.edarate_shahri_name_fa}, + }, + { + header: "اطلاعات ثبت‌ شده در سامانه سوانح", + id: "fkInfo", + enableColumnFilter: false, + enableSorting: false, + grow: false, + size: 50, + columns: [ + { + accessorKey: "fk_RegisteredEventMessage", + header: "کد سوانح", + id: "fk_RegisteredEventMessage", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "Title", + header: "موضوع گزارش", + id: "Title", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "FeatureTypeTitle", + header: "نوع گزارش", + id: "FeatureTypeTitle", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "Description", + header: "توضیح گزارش", + id: "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: "location", + enableColumnFilter: false, + enableSorting: false, + datatype: "array", + grow: false, + size: 100, + muiTableBodyCellProps: { + sx: { + borderLeft: "1px solid #e1e1e1", + py: 0, + "&:first-of-type": { + borderLeft: "unset", + }, + }, + }, + Cell: ({ row }) => { + return ( + + + + ); + }, + }, + { + accessorKey: "MobileForSendEventSms", + header: "شماره تماس گیرنده", + id: "MobileForSendEventSms", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + sortDescFirst: false, + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorFn: (row) => moment(row.StartTime_DateTime).locale("fa").format("HH:mm | yyyy/MM/DD"), + header: "تاریخ ثبت", + id: "StartTime_DateTime", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + size: 100, + }, + ], + }, + ]; + }, []); + + return ( + <> + + ( + + )} + /> + + + ); +}; +export default FastReactList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx new file mode 100644 index 0000000..d7af56d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/Dialog/index.jsx @@ -0,0 +1,49 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Chip, Dialog, Divider, IconButton } from "@mui/material"; +import FastReactList from "./List"; +import { useState, forwardRef } from "react"; + +const FastReactDialog = forwardRef(({ onChange, value }, ref) => { + const [openFastReactDialog, setOpenFastReactDialog] = useState(false); + + return ( + <> + + {value === "" ? ( + + ) : ( + } + onDelete={() => setOpenFastReactDialog(true)} + /> + )} + + + setOpenFastReactDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openFastReactDialog && ( + + )} + + + ); +}); + +FastReactDialog.displayName = "FastReactDialog"; + +export default FastReactDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx new file mode 100644 index 0000000..1f507c9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/FastReactCode/index.jsx @@ -0,0 +1,22 @@ +import { Divider, Stack } from "@mui/material"; +import { Controller, useWatch } from "react-hook-form"; +import FastReactDialog from "./Dialog"; + +const FastReactCode = ({ control }) => { + const category_id = useWatch({ control, name: "category_id" }); + + if (category_id != 3) return null; + + return ( + ( + + + + )} + /> + ); +}; +export default FastReactCode; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx new file mode 100644 index 0000000..666b1f9 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/GetItemInfo/index.jsx @@ -0,0 +1,150 @@ +import PersianTextField from "@/core/components/PersianTextField"; +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { missionCategoryTypes } from "@/core/utils/missionCategoryTypes"; +import { missionRegions } from "@/core/utils/missionRegions"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { ExitToApp } from "@mui/icons-material"; +import { Box, Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object, string } from "yup"; +import FastReactCode from "./FastReactCode"; + +const validationSchema = object({ + explanation: string().required("موضوع را مشخص کنید!"), + end_point: string().required("مقصد را مشخص کنید!"), + region: string().required("محور ماموریت را مشخص کنید!"), + category_id: string().required("نوع ماموریت را مشخص کنید!"), + road_observed_id: string().when("category_id", { + is: "3", + then: (schema) => schema.required("کد یکتا شکایت را مشخص کنید!"), + otherwise: (schema) => schema.notRequired(), + }), +}); + +const GetItemInfo = ({ allData, setAllData, handlePrev, setTabState }) => { + const defaultValues = { + explanation: allData.explanation, + end_point: allData.end_point, + region: allData.region, + category_id: allData.category_id, + road_observed_id: allData.road_observed_id, + }; + + const { control, handleSubmit } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + + + + + + + ( + + )} + /> + + + ( + + )} + /> + + + ( + + )} + /> + + + { + return ( + + ); + }} + /> + + + + + + + + + + + ); +}; +export default GetItemInfo; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx new file mode 100644 index 0000000..9dbe4ed --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/Form/index.jsx @@ -0,0 +1,61 @@ +import RahdarNameOrCode from "@/core/components/RahdarNameOrCode"; +import StyledForm from "@/core/components/StyledForm"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Done } from "@mui/icons-material"; +import { Button, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object } from "yup"; + +const schema = object().shape({ + rahdar: object().required("همراه الزامی است."), +}); +const DriverForm = ({ setDriver, setOpenDriversDialog }) => { + const defaultValues = { + rahdar: null, + }; + + const { + control, + handleSubmit, + formState: { isSubmitting, isValid }, + } = useForm({ defaultValues, resolver: yupResolver(schema), mode: "all" }); + + const submit = (data) => { + setDriver(data.rahdar); + setOpenDriversDialog(false); + }; + + return ( + + + + { + return ( + field.onChange(value)} + error={error} + multiple={false} + /> + ); + }} + name={"rahdar"} + /> + + + + + ); +}; +export default DriverForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx new file mode 100644 index 0000000..2abc9ea --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/DriversSearch/index.jsx @@ -0,0 +1,11 @@ +import { DialogContent } from "@mui/material"; +import DriverForm from "./Form"; + +const DriversSearch = ({ setDriver, setOpenDriversDialog }) => { + return ( + + + + ); +}; +export default DriversSearch; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx new file mode 100644 index 0000000..a2ef166 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/DriversDialog/index.jsx @@ -0,0 +1,41 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Dialog, DialogTitle, IconButton } from "@mui/material"; +import { useState } from "react"; +import DriversSearch from "./DriversSearch"; + +const DriversDialog = ({ setDriver, mode = "" }) => { + const [openDriversDialog, setOpenDriversDialog] = useState(false); + return ( + <> + {mode == "edit" ? ( + setOpenDriversDialog(true)} size="small"> + + + ) : ( + + )} + + setOpenDriversDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + انتخاب راننده + {openDriversDialog && ( + + )} + + + ); +}; +export default DriversDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx new file mode 100644 index 0000000..9718815 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/Allocate/index.jsx @@ -0,0 +1,20 @@ +import { Done } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; + +const Allocate = ({ row, setMachine, setOpenMachinesDialog }) => { + const handleClick = () => { + setMachine(row.original); + setOpenMachinesDialog(false); + }; + + return ( + <> + + + + + + + ); +}; +export default Allocate; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx new file mode 100644 index 0000000..ba0a20d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/RowActions/index.jsx @@ -0,0 +1,6 @@ +import Allocate from "./Allocate"; + +const RowActions = ({ row, setMachine, setOpenMachinesDialog }) => { + return ; +}; +export default RowActions; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx new file mode 100644 index 0000000..fae083c --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/MachineList/index.jsx @@ -0,0 +1,68 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; + +const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { + const columns = useMemo( + () => [ + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_name", + header: "نام خودرو", + id: "car_name", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "car_type", + header: "نوع خودرو", + id: "car_type", + enableColumnFilter: false, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ], + [] + ); + + return ( + <> + + ( + + )} + /> + + + ); +}; +export default MachinesList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx new file mode 100644 index 0000000..33e13f7 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/MachinesDialog/index.jsx @@ -0,0 +1,40 @@ +import { Close, Edit } from "@mui/icons-material"; +import { Button, Dialog, IconButton } from "@mui/material"; +import { useState } from "react"; +import MachinesList from "./MachineList"; + +const MachinesDialog = ({ setMachine, mode }) => { + const [openMachinesDialog, setOpenMachinesDialog] = useState(false); + return ( + <> + {mode == "edit" ? ( + setOpenMachinesDialog(true)} size="small"> + + + ) : ( + + )} + + setOpenMachinesDialog(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {openMachinesDialog && ( + + )} + + + ); +}; +export default MachinesDialog; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx new file mode 100644 index 0000000..912eb63 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/MachineAndDriver/index.jsx @@ -0,0 +1,48 @@ +import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typography } from "@mui/material"; +import { useState } from "react"; +import DriversDialog from "./DriversDialog"; + +const MachineAndDriver = ({ setTabState, allData, setAllData, handlePrev }) => { + const [driver, setDriver] = useState(allData.driver); + + const handleNext = (data) => { + setAllData(data); + setTabState((s) => s + 1); + }; + + return ( + <> + + + + + {driver ? ( + <> + راننده + + + + + + ) : ( + + )} + + + + + + + + + + ); +}; +export default MachineAndDriver; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx new file mode 100644 index 0000000..390974d --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/Form/index.jsx @@ -0,0 +1,66 @@ +import RahdarNameOrCode from "@/core/components/RahdarNameOrCode"; +import StyledForm from "@/core/components/StyledForm"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Add } from "@mui/icons-material"; +import { Button, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object } from "yup"; + +const schema = object().shape({ + rahdar: object().required("همراه الزامی است."), +}); +const RahdaranForm = ({ setRahdaran }) => { + const defaultValues = { + rahdar: null, + }; + + const { + control, + handleSubmit, + reset, + formState: { isSubmitting, isValid }, + } = useForm({ defaultValues, resolver: yupResolver(schema), mode: "all" }); + + const submit = (data) => { + setRahdaran((prev) => { + const alreadyExists = prev.some((r) => r.id === data.rahdar.id); + if (alreadyExists) return prev; + return [...prev, data.rahdar]; + }); + reset(); + }; + + return ( + + + + { + return ( + field.onChange(value)} + error={error} + multiple={false} + /> + ); + }} + name={"rahdar"} + /> + + + + + ); +}; +export default RahdaranForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx new file mode 100644 index 0000000..be31897 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/List/index.jsx @@ -0,0 +1,56 @@ +import { AccountCircle, Delete } from "@mui/icons-material"; +import { Card, Collapse, IconButton, Stack, Typography } from "@mui/material"; +import { TransitionGroup } from "react-transition-group"; + +const RahdaranList = ({ rahdaran, setRahdaran }) => { + const handleRemove = (index) => { + setRahdaran((prev) => prev.filter((_, i) => i !== index)); + }; + + return ( + + + {rahdaran.map((rahdar, index) => ( + + + + + + + نام و نام خانوادگی: + {rahdar.name} + + + کدملی: + {rahdar.code} + + + + handleRemove(index)}> + + + + + ))} + {rahdaran.length == 0 && ( + + همراهی ثبت نشده است + + )} + + + ); +}; +export default RahdaranList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx new file mode 100644 index 0000000..b530af4 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Rahdaran/index.jsx @@ -0,0 +1,36 @@ +import { Box, Button, Chip, DialogActions, DialogContent, Divider } from "@mui/material"; +import { useCallback, useState } from "react"; +import RahdaranForm from "./Form"; +import RahdaranList from "./List"; + +const Rahdaran = ({ allData, setAllData, setTabState, handlePrev }) => { + const [rahdaran, setRahdaran] = useState(allData.rahdaran); + + const handleNext = useCallback(() => { + setAllData({ rahdaran: rahdaran }); + setTabState((s) => s + 1); + }, [rahdaran]); + + return ( + <> + + + + + + + + + + + + + + + ); +}; +export default Rahdaran; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx new file mode 100644 index 0000000..68f99e7 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/Verify/index.jsx @@ -0,0 +1,128 @@ +import MapLoading from "@/core/components/MapLayer/Loading"; +import { missionCategoryTypes } from "@/core/utils/missionCategoryTypes"; +import { missionRegions } from "@/core/utils/missionRegions"; +import { Box, Button, Chip, DialogActions, DialogContent, Divider, Stack, Typography } from "@mui/material"; +import moment from "jalali-moment"; +import dynamic from "next/dynamic"; +import { useCallback } from "react"; +import ShowRoute from "../Area/Routing/ShowRoute"; +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const Verify = ({ allData, handlePrev, submitForm, submitting }) => { + const handleNext = useCallback(() => { + submitForm(allData); + }, [allData]); + + return ( + <> + + + + + + + + + + + + + + + + + + + موضوع ماموریت + + + + + محدوده + + r.id == allData.region).name_fa} /> + + + نوع ماموریت + + t.id == allData.category_id).name_fa} + /> + + {allData.category_id == 3 && ( + + کد شکایت + + + + )} + + مقصد + + + + + تاریخ شروع ماموریت + + + + + تاریخ پایان ماموریت + + + + + + + + + + + راننده + + + + + + + + + {allData.rahdaran.length != 0 ? ( + allData.rahdaran.map((rahdar) => ( + + {rahdar.name} + + + + )) + ) : ( + + همراهی ثبت نشده است + + )} + + + + + + + + + + ); +}; +export default Verify; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx new file mode 100644 index 0000000..2d5973e --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/Form/index.jsx @@ -0,0 +1,114 @@ +import { AccessTime, Engineering, InsertDriveFile, Person, Verified, Map } from "@mui/icons-material"; +import { Box, Tab, Tabs } from "@mui/material"; +import { useReducer, useState } from "react"; +import GetDateTime from "./GetDateTime"; +import GetItemInfo from "./GetItemInfo"; +import MachineAndDriver from "./MachineAndDriver"; +import Rahdaran from "./Rahdaran"; +import Verify from "./Verify"; +import Area from "./Area"; + +function TabPanel(props) { + const { children, value, index } = props; + return ( + + ); +} + +const reducer = (state, action) => { + switch (action.type) { + case "changeData": + return { ...state, ...action.data }; + default: + return state; + } +}; + +const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { + const [allData, dispatch] = useReducer(reducer, defaultValues); + const [tabState, setTabState] = useState(0); + const handleClose = () => { + setOpen(false); + }; + const handleChangeTab = (event, newValue) => { + setTabState(newValue); + }; + + const handlePrev = () => { + if (tabState === 0) { + handleClose(); + } else { + setTabState((t) => t - 1); + } + }; + + return ( + <> + + } label="مشخصات" /> + } label="راننده" /> + } label="مختصات" /> + } label="همراهان" /> + } label="بررسی نهایی" /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + { + dispatch({ type: "changeData", data }); + }} + handlePrev={handlePrev} + setTabState={setTabState} + /> + + + + + + ); +}; +export default CreateForm; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx new file mode 100644 index 0000000..9010671 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/MissionCorrection/index.jsx @@ -0,0 +1,86 @@ +import { MISSOINS_CORRECTION_VIOLATION } from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { AddCircleOutline, Close } from "@mui/icons-material"; +import { Dialog, IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import CreateForm from "./Form"; + +const MissionCorrection = ({ row, mutate }) => { + const [submitting, setSubmitting] = useState(false); + const requestServer = useRequest({ notificationSuccess: true }); + const [open, setOpen] = useState(false); + + const handleOpen = () => { + setOpen(true); + }; + + const submitForm = async (result) => { + setSubmitting(true); + + await requestServer(`${MISSOINS_CORRECTION_VIOLATION}/${row.original.id}`, "post", { + data: { + explanation: result.explanation, + category_id: result.category_id, + ...(result.rahdaran.length != 0 ? { rahdaran: result.rahdaran.map((r) => r.id) } : {}), + zone: result.region, + end_point: result.end_point, + driver: result.driver.id, + encoded_route: result.area, + }, + hasSidebarUpdate: true, + }) + .then((response) => { + mutate(); + setOpen(false); + }) + .catch((error) => {}) + .finally(() => { + setSubmitting(false); + }); + }; + + return ( + <> + + + + + + + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + {open && ( + + )} + + + ); +}; +export default MissionCorrection; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx new file mode 100644 index 0000000..d65dc1f --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx @@ -0,0 +1,9 @@ +import MissionCorrection from "./MissionCorrection"; + +export default function RowActions({row, mutate}) { + return ( + <> + + + ); +} \ No newline at end of file diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx new file mode 100644 index 0000000..40edd7a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/ViolationsList.jsx @@ -0,0 +1,141 @@ +import DataTableWithAuth from "@/core/components/DataTableWithAuth"; +import { Box } from "@mui/material"; +import { useMemo } from "react"; +import RowActions from "./RowActions"; +import { GET_OPERATOR_VIOLATIONS_LIST } from "@/core/utils/routes"; +import useCities from "@/lib/hooks/useCities"; +import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency"; +import useProvinces from "@/lib/hooks/useProvince"; + +const ViolationsList = ({ setOpen }) => { + const columns = useMemo(() => { + const dynamicColumns = { + header: "استان", + id: "province_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + grow: false, + size: 130, + ColumnSelectComponent: (props) => { + const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const getColumnSelectOptions = useMemo(() => { + if (loadingProvinces) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorProvinces) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل کشور" }, + ...provinces.map((province) => ({ + value: province.id, + label: province.name_fa, + })), + ]; + }, [provinces, errorProvinces, loadingProvinces]); + return ( + + ); + }, + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + size: 100, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + size: 120, + ColumnSelectComponent: (props) => { + const { cityList, loadingCityList, errorCityList } = useCities(props.dependencyFieldValue.value); + + const getColumnSelectOptions = useMemo(() => { + if (props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingCityList) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorCityList) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل ادارات" }, + ...cityList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, + })), + ]; + }, [cityList, loadingCityList, errorCityList]); + return ( + + ); + }, + Cell: ({ row }) => <>{row.original.city_name}, + }, + ]; + }, []); + + return ( + <> + + } + /> + + + ); +}; +export default ViolationsList; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx new file mode 100644 index 0000000..3d5f48a --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/index.jsx @@ -0,0 +1,33 @@ +import { Button, IconButton, Tooltip, useMediaQuery } from "@mui/material"; +import { useState } from "react"; +import ViolationsDialog from "./Dialog"; +import theme from "@/core/utils/theme"; +import RemoveRoadIcon from "@mui/icons-material/RemoveRoad"; + +const OperatorViolations = ({ row, mutate }) => { + const [open, setOpen] = useState(false); + const isMobile = useMediaQuery(theme.breakpoints.down("sm")); + return ( + <> + + {isMobile ? ( + setOpen(true)}> + + + ) : ( + + )} + + + + ); +}; +export default OperatorViolations; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx new file mode 100644 index 0000000..44a22d5 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Dialog.jsx @@ -0,0 +1,26 @@ +import { Close } from "@mui/icons-material"; +import { Dialog, DialogTitle, IconButton } from "@mui/material"; +import ChangeStatusForm from "./Form"; + +const ChangeStatusDialog = ({ open, setOpen, mutate, row }) => { + return ( + + setOpen(false)} + sx={(theme) => ({ + position: "absolute", + right: 8, + top: 8, + zIndex: 50, + color: theme.palette.grey[500], + })} + > + + + تغییر وضعیت + {open && } + + ); +}; +export default ChangeStatusDialog; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx new file mode 100644 index 0000000..3b91ba1 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/Form.jsx @@ -0,0 +1,111 @@ +import SelectBox from "@/core/components/SelectBox"; +import StyledForm from "@/core/components/StyledForm"; +import { CHANGE_STATUS_OPERATOR, CHANGE_STATUS_RECEIPT } from "@/core/utils/routes"; +import useRequest from "@/lib/hooks/useRequest"; +import { yupResolver } from "@hookform/resolvers/yup"; +import { Beenhere, ExitToApp } from "@mui/icons-material"; +import { Button, DialogActions, DialogContent, Grid, Stack } from "@mui/material"; +import { Controller, useForm } from "react-hook-form"; +import { object, string } from "yup"; + +const validationSchema = object({ + status: string().required("وضعیت را مشخص کنید!"), +}); + +const ChangeStatusForm = ({ setOpen, mutate, row }) => { + const requestServer = useRequest({ notificationSuccess: true }); + const defaultValues = { + status: row.original?.status || "", + }; + + const handleClose = () => { + setOpen(false); + }; + + const { + control, + handleSubmit, + formState: { isSubmitting }, + } = useForm({ + defaultValues, + resolver: yupResolver(validationSchema), + mode: "all", + }); + const onSubmitBase = async (data) => { + const formData = new FormData(); + formData.append("state_id", data.status); + await requestServer(`${CHANGE_STATUS_OPERATOR}/${row.original.id}`, "post", { + data: formData, + }) + .then((response) => { + mutate(); + setOpen(false); + }) + .catch((error) => {}); + }; + + return ( + + + + + + ( + + )} + /> + + + + + + + + + + ); +}; +export default ChangeStatusForm; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx new file mode 100644 index 0000000..bc5c9b4 --- /dev/null +++ b/src/components/dashboard/roadMissions/operator/RowActions/ChangeStatus/index.jsx @@ -0,0 +1,19 @@ +import { Reply } from "@mui/icons-material"; +import { IconButton, Tooltip } from "@mui/material"; +import { useState } from "react"; +import ChangeStatusDialog from "./Dialog"; + +const ChangeStatus = ({ row, mutate }) => { + const [open, setOpen] = useState(false); + return ( + <> + + setOpen(true)}> + + + + + + ); +}; +export default ChangeStatus; diff --git a/src/components/dashboard/roadMissions/operator/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/RowActions/index.jsx index ab6267f..ccd694d 100644 --- a/src/components/dashboard/roadMissions/operator/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/operator/RowActions/index.jsx @@ -3,9 +3,13 @@ import Edit from "./Edit"; import Delete from "./Delete"; import { useAuth } from "@/lib/contexts/auth"; import Add from "./Add"; +import ChangeStatus from "@/components/dashboard/roadMissions/operator/RowActions/ChangeStatus"; +import { usePermissions } from "@/lib/hooks/usePermissions"; const RowActions = ({ row, mutate }) => { const { user } = useAuth(); + const { data: userPermissions } = usePermissions(); + const hasChangeStatusPermission = userPermissions.some((item) => ["mission-change-state"].includes(item)); return ( @@ -20,6 +24,7 @@ const RowActions = ({ row, mutate }) => { )} + {hasChangeStatusPermission && } ); }; diff --git a/src/components/dashboard/roadMissions/operator/Toolbar.jsx b/src/components/dashboard/roadMissions/operator/Toolbar.jsx index 12db25d..071b9c0 100644 --- a/src/components/dashboard/roadMissions/operator/Toolbar.jsx +++ b/src/components/dashboard/roadMissions/operator/Toolbar.jsx @@ -1,11 +1,13 @@ import { Stack } from "@mui/material"; import Create from "./Actions/Create"; +import OperatorViolations from "./Actions/Violations"; // import CreateWithoutProcess from "./Actions/CreateWithoutProcess"; const Toolbar = ({ table, filterData, mutate }) => { return ( + {/**/} ); diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx index 9d9068d..641d464 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx @@ -5,6 +5,16 @@ import RowActions from "./RowActions"; import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; import { useAuth } from "@/lib/contexts/auth"; +const statusTypes = [ + {id : 1, name_fa : "آماده"}, + {id : 2, name_fa : "رزرو"}, + {id : 3, name_fa : "در ماموریت"}, + {id : 4, name_fa : "خارج از رده"}, + {id : 5, name_fa : "در تعمیر"}, + {id : 6, name_fa : "فروخته شده"}, + {id : 7, name_fa : "نیاز به تعمیر"}, +] + const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { const { user: { city_id, province_id }, @@ -33,6 +43,28 @@ const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { grow: false, size: 100, }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + sortDescFirst: true, + grow: false, + size: 100, + columnSelectOption: () => { + return statusTypes.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => { + const statusValue = row.original.status; + const statusItem = statusTypes.find(item => item.id === statusValue); + return statusItem ? statusItem.name_fa : statusValue; + }, + }, ], [] ); diff --git a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx index 0f9c7b2..2d5973e 100644 --- a/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx +++ b/src/components/dashboard/roadMissions/violations/Actions/CreateWithoutProcess/Form/index.jsx @@ -60,7 +60,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { }} > } label="مشخصات" /> - } label="زمانبندی" /> } label="راننده" /> } label="مختصات" /> } label="همراهان" /> @@ -77,16 +76,6 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { /> - { - dispatch({ type: "changeData", data }); - }} - handlePrev={handlePrev} - setTabState={setTabState} - /> - - { @@ -96,7 +85,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -106,7 +95,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + { @@ -116,7 +105,7 @@ const CreateForm = ({ defaultValues, submitForm, setOpen, submitting }) => { setTabState={setTabState} /> - + diff --git a/src/components/dashboard/roadMissions/violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/violations/RowActions/index.jsx index aafa0f6..7d45f68 100644 --- a/src/components/dashboard/roadMissions/violations/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/violations/RowActions/index.jsx @@ -1,12 +1,12 @@ -import CreateWithoutProcess from "../Actions/CreateWithoutProcess"; +// import CreateWithoutProcess from "../Actions/CreateWithoutProcess"; import EditViolation from "../Actions/EditViolation"; const RowActions = ({ row, mutate }) => { - const canEdit = row.original.status === 0 && row.original.type === 1; + // const canEdit = row.original.status === 0 && row.original.type === 1; return ( <> {!row.original.mileage && } - {canEdit && } + {/*{canEdit && }*/} ); }; diff --git a/src/core/components/RahdarNameOrCode.jsx b/src/core/components/RahdarNameOrCode.jsx index b3799c7..ad0d5a3 100644 --- a/src/core/components/RahdarNameOrCode.jsx +++ b/src/core/components/RahdarNameOrCode.jsx @@ -53,7 +53,7 @@ const RahdarNameOrCode = ({ title = "راهدار", rahdarsName, setRahdarsName, setInputValue(newInputValue || ""); // به‌روزرسانی مقدار تایپ‌شده }} options={options} // گزینه‌های موجود - getOptionLabel={(option) => (typeof option === "string" ? option : `${option.code} - ${option.name}`)} + getOptionLabel={(option) => (typeof option === "string" ? option : `${option.name}`)} isOptionEqualToValue={(option, value) => { if (!value) return false; if (value === "") return option.code === ""; diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js index c970699..9ee709a 100644 --- a/src/core/utils/routes.js +++ b/src/core/utils/routes.js @@ -130,6 +130,7 @@ export const GET_INSURANCE_PAGE = api + "/v2/receipt/send-to-insurance"; export const GET_POLICERAH = api + "/api/v3/receipts/generate_police_document"; export const GET_POLICERAH_PAGE = api + "/v2/receipt/document-release"; export const CHANGE_STATUS_RECEIPT = api + "/api/v3/receipts/change_status"; +export const CHANGE_STATUS_OPERATOR = api + "/api/v3/missions/request_portal/change_state"; // recept report export const GET_COUNTRY_RECEIPT_REPORT = api + "/api/v3/receipt_reports/country_report"; @@ -235,6 +236,7 @@ export const GET_ROAD_MISSIONS_CONTROL_LIST = api + "/api/v3/missions/control_un export const REQUEST_MISSION = api + "/api/v3/missions/request_portal"; export const REQUEST_MISSION_WITHOUT_PROCESS = api + "/api/v3/missions/request_portal/no_process"; export const REQUEST_MISSION_VIOLATIONS_PROCESS = api + "/api/v3/missions/violation_management/no_process"; +export const MISSOINS_CORRECTION_VIOLATION = api + "/api/v3/missions/request_portal/clarify_unauthorized_exit"; export const REQUEST_MISSION_CONTINUE_MISSION = api + "/api/v3/missions/request_portal/continue"; export const UPDATE_REQUEST_MISSION = api + "/api/v3/missions/request_portal"; export const DELETE_REQUEST_MISSION = api + "/api/v3/missions/request_portal"; @@ -252,6 +254,7 @@ export const EDIT_VIOLATION = api + "/api/v3/missions/violation_management"; export const EXPORT_COUNTRY_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/country_excel_activity"; export const EXPORT_PROVINCE_ROAD_MISSIONS_REPORTS = api + "/api/v3/missions/report/province_excel_activity"; +export const GET_OPERATOR_VIOLATIONS_LIST = api + "/api/v3/missions/request_portal/violations"; export const GET_MACHINES_TABLE_LIST = api + "/api/v3/cmms_machines"; // rahdaran -- 2.49.1 From acc013ad8159f2503d211a2980e88bfb6698cf8e Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sat, 13 Jun 2026 15:12:04 +0330 Subject: [PATCH 7/7] build and format --- .../operator/Actions/Violations/Dialog.jsx | 4 +- .../Actions/Violations/RowActions/index.jsx | 4 +- .../Form/MachinesDialog/MachineList/index.jsx | 18 +- .../violations/ViolationsList.jsx | 269 +++++++++--------- 4 files changed, 144 insertions(+), 151 deletions(-) diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx index bd3849a..200b891 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/Dialog.jsx @@ -19,9 +19,7 @@ const ViolationsDialog = ({ open, setOpen, mutate, row }) => { تخلفات - {open && ( - - )} + {open && } ); }; diff --git a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx index d65dc1f..24e9532 100644 --- a/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx +++ b/src/components/dashboard/roadMissions/operator/Actions/Violations/RowActions/index.jsx @@ -1,9 +1,9 @@ import MissionCorrection from "./MissionCorrection"; -export default function RowActions({row, mutate}) { +export default function RowActions({ row, mutate }) { return ( <> ); -} \ No newline at end of file +} diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx index 641d464..4173929 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/index.jsx @@ -6,14 +6,14 @@ import { GET_MACHINES_TABLE_LIST } from "@/core/utils/routes"; import { useAuth } from "@/lib/contexts/auth"; const statusTypes = [ - {id : 1, name_fa : "آماده"}, - {id : 2, name_fa : "رزرو"}, - {id : 3, name_fa : "در ماموریت"}, - {id : 4, name_fa : "خارج از رده"}, - {id : 5, name_fa : "در تعمیر"}, - {id : 6, name_fa : "فروخته شده"}, - {id : 7, name_fa : "نیاز به تعمیر"}, -] + { id: 1, name_fa: "آماده" }, + { id: 2, name_fa: "رزرو" }, + { id: 3, name_fa: "در ماموریت" }, + { id: 4, name_fa: "خارج از رده" }, + { id: 5, name_fa: "در تعمیر" }, + { id: 6, name_fa: "فروخته شده" }, + { id: 7, name_fa: "نیاز به تعمیر" }, +]; const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { const { @@ -61,7 +61,7 @@ const MachinesList = ({ machineType, setMachine, setOpenMachinesDialog }) => { }, Cell: ({ row }) => { const statusValue = row.original.status; - const statusItem = statusTypes.find(item => item.id === statusValue); + const statusItem = statusTypes.find((item) => item.id === statusValue); return statusItem ? statusItem.name_fa : statusValue; }, }, diff --git a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx index 11ccd46..0f4f5fe 100644 --- a/src/components/dashboard/roadMissions/violations/ViolationsList.jsx +++ b/src/components/dashboard/roadMissions/violations/ViolationsList.jsx @@ -12,163 +12,158 @@ import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsT import useCities from "@/lib/hooks/useCities"; const ViolationsList = () => { - const columns = useMemo( - () => { - const dynamicColumns = { - header: "استان", - id: "province_id", + const columns = useMemo(() => { + const dynamicColumns = { + header: "استان", + id: "province_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + grow: false, + size: 130, + ColumnSelectComponent: (props) => { + const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const getColumnSelectOptions = useMemo(() => { + if (loadingProvinces) { + return [{ value: "loading", label: "در حال بارگذاری..." }]; + } + if (errorProvinces) { + return [{ value: "error", label: "خطا در بارگذاری" }]; + } + return [ + { value: "", label: "کل کشور" }, + ...provinces.map((province) => ({ + value: province.id, + label: province.name_fa, + })), + ]; + }, [provinces, errorProvinces, loadingProvinces]); + return ( + + ); + }, + Cell: ({ renderedCellValue, row }) => { + return <>{row.original.province_name}; + }, + }; + return [ + { + accessorKey: "id", + header: "کد یکتا", + id: "id", + enableColumnFilter: true, + datatype: "text", + filterMode: "equals", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + { + accessorKey: "status", + header: "وضعیت", + id: "status", enableColumnFilter: true, datatype: "numeric", filterMode: "equals", + sortDescFirst: true, grow: false, - size: 130, + columnSelectOption: () => { + return violationsCategoryStatus.map((category) => ({ + value: category.id, + label: category.name_fa, + })); + }, + Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), + }, + { + accessorKey: "machine_code", + header: "کد خودرو", + id: "machine_code", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + }, + ...[dynamicColumns], + { + header: "شهر", + id: "city_id", + enableColumnFilter: true, + datatype: "numeric", + filterMode: "equals", + dependencyId: "province_id", + grow: false, + size: 120, ColumnSelectComponent: (props) => { - const { provinces, errorProvinces, loadingProvinces } = useProvinces(); + const { cityList, loadingCityList, errorCityList } = useCities(props.dependencyFieldValue.value); + const getColumnSelectOptions = useMemo(() => { - if (loadingProvinces) { + if (props.dependencyFieldValue.value === "") { + return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; + } + if (loadingCityList) { return [{ value: "loading", label: "در حال بارگذاری..." }]; } - if (errorProvinces) { + if (errorCityList) { return [{ value: "error", label: "خطا در بارگذاری" }]; } return [ - { value: "", label: "کل کشور" }, - ...provinces.map((province) => ({ - value: province.id, - label: province.name_fa, + { value: "", label: "کل ادارات" }, + ...cityList.map((edare) => ({ + value: edare.id, + label: edare.name_fa, })), ]; - }, [provinces, errorProvinces, loadingProvinces]); + }, [cityList, loadingCityList, errorCityList]); return ( ); }, - Cell: ({ renderedCellValue, row }) => { - return <>{row.original.province_name}; - }, - }; - return [ - { - accessorKey: "id", - header: "کد یکتا", - id: "id", - enableColumnFilter: true, - datatype: "text", - filterMode: "equals", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - { - accessorKey: "status", - header: "وضعیت", - id: "status", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - sortDescFirst: true, - grow: false, - columnSelectOption: () => { - return violationsCategoryStatus.map((category) => ({ - value: category.id, - label: category.name_fa, - })); - }, - Cell: ({ row }) => (row.original.type === 1 ? "خروج بدون مجوز" : "عدم تحرک"), - }, - { - accessorKey: "machine_code", - header: "کد خودرو", - id: "machine_code", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - }, - ...[dynamicColumns], - { - header: "شهر", - id: "city_id", - enableColumnFilter: true, - datatype: "numeric", - filterMode: "equals", - dependencyId: "province_id", - grow: false, - size: 120, - ColumnSelectComponent: (props) => { - const { cityList, loadingCityList, errorCityList } = useCities( - props.dependencyFieldValue.value - ); - - const getColumnSelectOptions = useMemo(() => { - if (props.dependencyFieldValue.value === "") { - return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }]; - } - if (loadingCityList) { - return [{ value: "loading", label: "در حال بارگذاری..." }]; - } - if (errorCityList) { - return [{ value: "error", label: "خطا در بارگذاری" }]; - } - return [ - { value: "", label: "کل ادارات" }, - ...cityList.map((edare) => ({ - value: edare.id, - label: edare.name_fa, - })), - ]; - }, [cityList, loadingCityList, errorCityList]); - return ( - - ); - }, - Cell: ({ row }) => <>{row.original.city_name}, - }, - { - accessorKey: "machine", - header: "نام خودرو", - id: "machine", - datatype: "text", - columnFilterModeOptions: ["equals", "contains"], - grow: false, - Cell: ({ row }) => row.original.machine?.car_name || "-", - }, - { - accessorKey: "mission_id", - header: "کد ماموریت", - id: "mission_id", - enableColumnFilter: false, - datatype: "numeric", - filterMode: "equals", - grow: false, - Cell: ({ row }) => row.original.mission_id || "-", - }, - { - accessorKey: "request_date", - header: "تاریخ تخلف", - id: "request_date", - enableColumnFilter: true, - datatype: "date", - filterMode: "between", - grow: false, - Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), - }, - ]; - }, - [] - ); + Cell: ({ row }) => <>{row.original.city_name}, + }, + { + accessorKey: "machine", + header: "نام خودرو", + id: "machine", + datatype: "text", + columnFilterModeOptions: ["equals", "contains"], + grow: false, + Cell: ({ row }) => row.original.machine?.car_name || "-", + }, + { + accessorKey: "mission_id", + header: "کد ماموریت", + id: "mission_id", + enableColumnFilter: false, + datatype: "numeric", + filterMode: "equals", + grow: false, + Cell: ({ row }) => row.original.mission_id || "-", + }, + { + accessorKey: "request_date", + header: "تاریخ تخلف", + id: "request_date", + enableColumnFilter: true, + datatype: "date", + filterMode: "between", + grow: false, + Cell: ({ row }) => moment(row.original.request_date).locale("fa").format("YYYY/MM/DD"), + }, + ]; + }, []); return ( <> -- 2.49.1