diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/control/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/control/page.js index e22ce33..708e125 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/control/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/control/page.js @@ -7,7 +7,14 @@ export const metadata = { const Page = () => { return ( <> - + {/* */} diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/operator/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/operator/page.js index 417937a..4328d12 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/operator/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/operator/page.js @@ -12,6 +12,7 @@ const Page = () => { "manage-request-portal-country", "manage-request-portal-province", "manage-request-portal-city", + "manage-request-portal-station", ]} > diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/transportation/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/transportation/page.js index ff62cff..5644851 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/transportation/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/transportation/page.js @@ -7,7 +7,14 @@ export const metadata = { const Page = () => { return ( <> - + {/* */} diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx index 1702622..7affee2 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx @@ -12,6 +12,9 @@ import ShowBound from "../../../Actions/showBound"; import DriversDialog from "./DriversDialog"; import MachinesDialog from "./MachinesDialog"; import Reject from "./Reject"; +import SelectBox from "@/core/components/SelectBox"; +import { Controller, useForm } from "react-hook-form"; + const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { const latLngs = useMemo(() => { return row.area.coordinates.map(([lng, lat]) => [lat, lng]); @@ -25,6 +28,12 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { const [machine, setMachine] = useState(); const [driver, setDriver] = useState(); const [isSubmitting, setIsSubmitting] = useState(false); + const { control, watch } = useForm({ + defaultValues: { + machine_type: row.requested_machines?.[0] ? [row.requested_machines[0]] : [], + }, + }); + const handleSubmit = async (_machine, _driver) => { setIsSubmitting(true); @@ -45,6 +54,7 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { }); }; + const selectedMachineType = watch("machine_type")?.[0]; return ( <> @@ -53,12 +63,22 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { - - نوع خودرو درخواستی - - - mt.id == row.requested_machines?.[0])?.name_fa} + ( + { + field.onChange([newValue]); + }} + /> + )} /> @@ -76,16 +96,13 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => { /> ) : ( - + )} {machine && ( diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index 663de96..08f09f0 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -119,6 +119,7 @@ export const pageMenu = [ "manage-request-portal-country", "manage-request-portal-province", "manage-request-portal-city", + "manage-request-portal-station", ], }, { @@ -128,7 +129,12 @@ export const pageMenu = [ icon: , route: "/dashboard/road-missions/transportation", badges: [{ key: "mission.transportation" }], - permissions: ["manage-transportation-unit"], + permissions: [ + "manage-transportation-unit-city", + "manage-transportation-unit-province", + "manage-transportation-unit-country", + "manage-transportation-unit-station", + ], }, { id: "roadMissionsManagemnetControl", @@ -137,7 +143,12 @@ export const pageMenu = [ icon: , route: "/dashboard/road-missions/control", badges: [{ key: "mission.control" }], - permissions: ["manage-control-unit"], + permissions: [ + "manage-control-unit-province", + "manage-control-unit-city", + "manage-control-unit-country", + "manage-control-unit-station", + ], }, { id: "roadMissionsViolations", diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index f4546fc..f78fffe 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -118,6 +118,7 @@ export const pageMenuDev = [ "manage-request-portal-country", "manage-request-portal-province", "manage-request-portal-city", + "manage-request-portal-station", ], }, { @@ -127,7 +128,12 @@ export const pageMenuDev = [ icon: , route: "/dashboard/road-missions/transportation", badges: [{ key: "mission.transportation" }], - permissions: ["manage-transportation-unit"], + permissions: [ + "manage-transportation-unit-province", + "manage-transportation-unit-city", + "manage-transportation-unit-country", + "manage-transportation-unit-station", + ], }, { id: "roadMissionsManagemnetControl", @@ -136,7 +142,12 @@ export const pageMenuDev = [ icon: , route: "/dashboard/road-missions/control", badges: [{ key: "mission.control" }], - permissions: ["manage-control-unit"], + permissions: [ + "manage-control-unit-province", + "manage-control-unit-city", + "manage-control-unit-country", + "manage-control-unit-station", + ], }, { id: "roadMissionsViolations",