diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx index 1fe7e02..7b85654 100644 --- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx @@ -1,6 +1,6 @@ "use client"; -import React from "react"; +import React, {useState} from "react"; import dynamic from "next/dynamic"; import MapLoading from "@/core/components/MapLayer/Loading"; import { @@ -10,60 +10,146 @@ import { CardContent, CardHeader, Chip, + Collapse, Divider, IconButton, Stack, Typography } from "@mui/material"; +import {styled} from '@mui/material/styles'; import HandymanIcon from '@mui/icons-material/Handyman'; import DeleteIcon from "@mui/icons-material/Delete"; -import EditIcon from "@mui/icons-material/Edit"; import moment from "jalali-moment"; -import CalendarMonthIcon from '@mui/icons-material/CalendarMonth'; import WatchLaterIcon from '@mui/icons-material/WatchLater'; +import CalendarMonthIcon from "@mui/icons-material/CalendarMonth"; +import DirectionsCarIcon from '@mui/icons-material/DirectionsCar'; +import PersonIcon from '@mui/icons-material/Person'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import DesignServicesIcon from '@mui/icons-material/DesignServices'; +import EditActionDuringPatrol from "./EditActionDuringPatrol"; const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { loading: () => , ssr: false, }); -const ActionInfo = ({action, deleteAction}) => { - console.log("action", action) +const ActionInfo = ({action, index, deleteAction}) => { + const [expanded, setExpanded] = useState(false); + + const handleExpandClick = () => { + setExpanded(!expanded); + }; + + const ExpandMore = styled((props) => { + const {expand, ...other} = props; + return ; + })(({theme}) => ({ + marginLeft: 'auto', + transition: theme.transitions.create('transform', { + duration: theme.transitions.duration.shortest, + }), + variants: [ + { + props: ({expand}) => !expand, + style: { + transform: 'rotate(0deg)', + }, + }, + { + props: ({expand}) => !!expand, + style: { + transform: 'rotate(180deg)', + }, + }, + ], + })); + + return ( } - title={"متن تست"} - subheader={"ساب آیتم تست"} + title={{action.data.item_name}} + subheader={action.data.sub_item_name} /> - - - }/> - - - {moment(action.start_date).locale("fa").format("YYYY/MM/DD")} + + + + + تاریخ: + + + {moment(action.data.activity_date).locale("fa").format("YYYY/MM/DD")} - - }/> - - - {action.action_date} + + + + ساعت: + + + {action.data.activity_time} + + + + + + میزان فعالیت انجام شده: + + + {action.data.amount} + {/*({action.data.unit_fa})*/} - - - - - - + + + + + + + + + + + + + + }/> + + + {action.data.cmms_machines.map((cmms_machine, index) => ( + + {index + 1}: {cmms_machine.car_name} + + ))} + + + + + }/> + + + {action.data.rahdaran_id.map((rahdar, index) => ( + + {index + 1}: {rahdar.name} + + ))} + + + + ); }; diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx index 2d539c5..1281b03 100644 --- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx @@ -5,6 +5,7 @@ import AddCircleIcon from '@mui/icons-material/AddCircle'; import React, {useState} from "react"; import ModalActionsDuringPatrol from "./ModalActionsDuringPatrol"; import ActionInfo from "./ActionInfo"; +import KeyboardDoubleArrowLeftIcon from "@mui/icons-material/KeyboardDoubleArrowLeft"; const ActionsDuringPatrol = ({tabState, setTabState}) => { const [ActionsList, setActionsList] = useState([]); @@ -39,6 +40,7 @@ const ActionsDuringPatrol = ({tabState, setTabState}) => { deleteAction(index)} /> @@ -51,6 +53,14 @@ const ActionsDuringPatrol = ({tabState, setTabState}) => { } + + + + + ); }; diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/EditActionDuringPatrol.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/EditActionDuringPatrol.jsx new file mode 100644 index 0000000..3098d06 --- /dev/null +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/EditActionDuringPatrol.jsx @@ -0,0 +1,52 @@ +"use client"; + +import React, {useState} from "react"; +import dynamic from "next/dynamic"; +import MapLoading from "@/core/components/MapLayer/Loading"; +import {Dialog, DialogTitle, IconButton} from "@mui/material"; +import EditIcon from "@mui/icons-material/Edit"; +import EditFormContent from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent"; + +const MapLayer = dynamic(() => import("@/core/components/MapLayer"), { + loading: () => , + ssr: false, +}); + +const EditActionDuringPatrol = ({action}) => { + + console.log("action", action) + + const [open, setOpen] = useState(false); + + const handleOpen = () => { + setOpen(true); + }; + + const HandleSubmit = async (data, result) => { + setActionsList((prev) => [...prev, data]); + setOpen(false); + } + + return ( + <> + + + + + ویرایش اطلاعات + + + + ); +}; + +export default EditActionDuringPatrol; \ No newline at end of file diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetailInfo.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetailInfo.jsx index 6ad3417..f7b8f00 100644 --- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetailInfo.jsx +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetailInfo.jsx @@ -10,6 +10,7 @@ import WatchLaterIcon from '@mui/icons-material/WatchLater'; import QueryBuilderIcon from '@mui/icons-material/QueryBuilder'; import AddRoadIcon from '@mui/icons-material/AddRoad'; import ShareLocationIcon from '@mui/icons-material/ShareLocation'; +import ElectricCarIcon from '@mui/icons-material/ElectricCar'; import KeyboardDoubleArrowLeftIcon from "@mui/icons-material/KeyboardDoubleArrowLeft"; import QrCode2Icon from '@mui/icons-material/QrCode2'; import moment from "jalali-moment"; @@ -36,65 +37,65 @@ const PatrolDetailInfo = ({patrolData, tabState, setTabState}) => { }}> - }/> + }/> - + {Math.floor(patrolData.accOnDuration / 60)} دقیقه }/> - + {patrolData.roadPatrolMachinesId.car_name} }/> - + {patrolData.roadPatrolMachinesId.machine_code} }/> - + {patrolData.roadPatrolMachinesId.plak_number} }/> - + {moment(patrolData.start_time).locale("fa").format("HH:mm | YYYY/MM/DD")} }/> - + {moment(patrolData.end_time).locale("fa").format("HH:mm | YYYY/MM/DD")} }/> - + {(patrolData.mileage / 1000).toFixed(1)} کیلومتر }/> - + {Math.round(patrolData.fuelConsumption * 10) / 10} لیتر }/> - + {patrolData.stopPoints.length} مورد diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx index 90d3c67..fdafddf 100644 --- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx @@ -55,7 +55,7 @@ const PatrolForms = ({mutate}) => { const requestServer = useRequest({notificationSuccess: true}); const theme = useTheme(); const isMobile = useMediaQuery(theme.breakpoints.down("md")); - const [tabState, setTabState] = useState(0); + const [tabState, setTabState] = useState(2); const [activeUpTo, setActiveUpTo] = useState(0); const handleChangeTab = (event, newValue) => { diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx index 5586a97..e1b8d43 100644 --- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx +++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx @@ -44,10 +44,11 @@ const SuperVisorsDetail = ({control, watch, setValue, tabState, setTabState}) => { + console.log("field.value", field.value) return ( field.onChange(value || [])} + rahdarsCode={field.value} + setRahdarsCode={(value) => field.onChange(value)} error={error} multiple={false} />