RMS/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict and get last changes from develop branch

Browse Source
This commit is contained in:
Mohammad Jalali
2025-01-04 10:31:39 +03:30
parent 069895b403 fa4c3e1459
commit e127e8758e
34 changed files with 745 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/(withAuth)/dashboard/azmayesh/page.js
View File

@@ -1,10 +1,12 @@
import AzmayeshPage from "@/components/dashboard/azmayesh";
import WithPermission from "@/core/middlewares/withPermission";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission permission_name={["azmayesh-management"]}>
<AzmayeshPage />
<ActivityCodeLog activity_code={1157} />
</WithPermission>
);
};

2
src/app/(withAuth)/dashboard/azmayesh_type/page.js
View File

@@ -1,10 +1,12 @@
import AzmayeshTypePage from "@/components/dashboard/azmayeshType";
import WithPermission from "@/core/middlewares/withPermission";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission permission_name={["azmayesh-type-management"]}>
<AzmayeshTypePage />
<ActivityCodeLog activity_code={1161} />
</WithPermission>
);
};

2
src/app/(withAuth)/dashboard/road-items/operator/page.js
View File

@@ -1,9 +1,11 @@
import WithPermission from "@/core/middlewares/withPermission";
import OperatorPage from "@/components/dashboard/roadItems/operator";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission permission_name={["create-road-item"]}>
<OperatorPage />
<ActivityCodeLog activity_code={1152} />
</WithPermission>
);
};

2
src/app/(withAuth)/dashboard/road-items/supervisor/page.js
View File

@@ -1,11 +1,13 @@
import WithPermission from "@/core/middlewares/withPermission";
import SupervisorPage from "@/components/dashboard/roadItems/supervisor";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission
permission_name={["show-road-item-supervise-cartable", "show-road-item-supervise-cartable-province"]}
>
<SupervisorPage />
<ActivityCodeLog activity_code={1148} />
</WithPermission>
);
};

4
src/app/(withAuth)/dashboard/road-patrols/operator/page.js
View File

@@ -1,10 +1,12 @@
import WithPermission from "@/core/middlewares/withPermission";
import OperatorPage from "@/components/dashboard/roadPatrols/operator";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission permission_name={["add-road-patrol"]}>
<OperatorPage/>
<OperatorPage />
<ActivityCodeLog activity_code={1145} />
</WithPermission>
);
};

2
src/app/(withAuth)/dashboard/road-patrols/supervisor/page.js
View File

@@ -1,9 +1,11 @@
import WithPermission from "@/core/middlewares/withPermission";
import SupervisorPage from "@/components/dashboard/roadPatrols/supervisor";
import ActivityCodeLog from "@/core/components/ActivityCodeLog";
const Page = () => {
return (
<WithPermission permission_name={["show-road-patrol-supervise-cartable"]}>
<SupervisorPage />
<ActivityCodeLog activity_code={1143} />
</WithPermission>
);
};

103
src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
View File

@@ -1,9 +1,10 @@
import React, {useState} from "react";
import {useForm} from "react-hook-form";
import {yupResolver} from "@hookform/resolvers/yup";
import {array, mixed, object, string} from "yup";
import {useTheme} from "@emotion/react";
import {Box, Button, DialogActions, DialogContent, Tab, Tabs, useMediaQuery} from "@mui/material";
import React, { useState } from "react";
import { useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup";
import { array, mixed, object, string } from "yup";
import { useTheme } from "@emotion/react";
import useRequest from "@/lib/hooks/useRequest";
import { Box, Button, DialogActions, DialogContent, Tab, Tabs, useMediaQuery } from "@mui/material";
import StyledForm from "@/core/components/StyledForm";
import InsertDriveFileIcon from "@mui/icons-material/InsertDriveFile";
import FileCopyIcon from "@mui/icons-material/FileCopy";
@@ -14,9 +15,10 @@ import BeenhereIcon from "@mui/icons-material/Beenhere";
import GetItemsForm from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemsForm";
import GetSubItemsForm from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetSubItemsForm";
import GetItemInfo from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo";
import { CREATE_ROAD_ITEMS } from "@/core/utils/routes";
function TabPanel(props) {
const {children, value, index} = props;
const { children, value, index } = props;
return (
<div role="tabpanel" hidden={value !== index}>
{value === index && <Box>{children}</Box>}
@@ -25,11 +27,11 @@ function TabPanel(props) {
}
const defaultValues = {
itemId: null,
itemSubId: null,
item_id: null,
sub_item_id: null,
amount: "",
action_date: "",
start_date: "",
activity_time: "",
activity_date: "",
before_image: null,
after_image: null,
cmms_machines: null,
@@ -38,17 +40,17 @@ const defaultValues = {
end_point: "",
};
const validationSchema = object({
itemId: string().required("نوع آیتم را مشخص کنید!"),
itemSubId: string().required("موضوع مشاهده شده را مشخص کنید!"),
item_id: string().required("نوع آیتم را مشخص کنید!"),
sub_item_id: string().required("موضوع مشاهده شده را مشخص کنید!"),
amount: string().required("وارد کردن مقدار الزامیست!"),
cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"), // بررسی حداقل یک آیتم,
action_date: string().required("لطفا زمان فعالیت را انتخاب کنید!"),
start_date: string().required("لطفاً تاریخ شروع فعالیت را انتخاب کنید!"),
activity_time: string().required("لطفا زمان فعالیت را انتخاب کنید!"),
activity_date: string().required("لطفاً تاریخ شروع فعالیت را انتخاب کنید!"),
before_image: mixed()
.nullable()
.test("before-image-required", "لطفا عکس قبل از اقدام را بارگذاری کنید!", function (value) {
const {subItemsList} = this.options.context;
const { subItemsList } = this.options.context;
const needsImage = subItemsList?.needs_image === 1;
if (needsImage) {
return !!value;
@@ -58,7 +60,7 @@ const validationSchema = object({
after_image: mixed()
.nullable()
.test("after-image-required", "لطفا عکس بعد از اقدام را بارگذاری کنید!", function (value) {
const {subItemsList} = this.options.context;
const { subItemsList } = this.options.context;
const needsImage = subItemsList?.needs_image === 1;
if (needsImage) {
return !!value;
@@ -71,7 +73,7 @@ const validationSchema = object({
})
.required("لطفاً نقطه شروع را مشخص کنید!"),
end_point: mixed().test("end-point-required", "لطفاً نقطه پایان را مشخص کنید!", function (value) {
const {subItemsList} = this.options.context;
const { subItemsList } = this.options.context;
const needsEndPoint = subItemsList?.needs_end_point === 1;
if (needsEndPoint) {
return !!value; // چک می‌کند که مقدار موجود است
@@ -80,12 +82,13 @@ const validationSchema = object({
}),
});
const CreateFormContent = ({setOpen, onSubmit}) => {
const CreateFormContent = ({ setOpen, onSubmit }) => {
const [tabState, setTabState] = useState(0);
const [itemsList, setItemsList] = useState();
const [subItemsList, setSubItemsList] = useState([]);
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
const handleClose = () => {
setOpen(false);
};
@@ -98,8 +101,8 @@ const CreateFormContent = ({setOpen, onSubmit}) => {
if (tabState === 2) {
const fieldsToReset = [
"amount",
"action_date",
"start_date",
"activity_time",
"activity_date",
"before_image",
"after_image",
"cmms_machines",
@@ -123,16 +126,52 @@ const CreateFormContent = ({setOpen, onSubmit}) => {
handleSubmit,
setValue,
resetField,
formState: {errors, isSubmitting},
formState: { errors, isSubmitting },
} = useForm({
defaultValues,
resolver: yupResolver(validationSchema),
mode: "onBlur",
context: {subItemsList},
context: { subItemsList },
});
const onSubmitBase = (data) => {
let result = { ...data };
result.before_image === null && delete result.before_image;
result.after_image === null && delete result.after_image;
if (result.end_point === "") {
delete result.end_point;
} else {
result.end_point = `${result.end_point.lat},${result.end_point.lng}`;
}
if (result.start_point === "") {
delete result.start_point;
} else {
result.start_point = `${result.start_point.lat},${result.start_point.lng}`;
}
result.rahdaran_id.forEach((rahdar, index) => {
result[`rahdaran_id[${index}]`] = rahdar.id;
});
delete result.rahdaran_id;
result.cmms_machines.forEach((cmms_machine, index) => {
result[`machines_id[${index}]`] = cmms_machine.id;
});
delete result.cmms_machines;
onSubmit({
result,
data: {
...data,
item_name: itemsList.name,
sub_item_name: subItemsList.name,
},
});
};
return (
<StyledForm onSubmit={handleSubmit(onSubmit)}>
<StyledForm onSubmit={handleSubmit(onSubmitBase)}>
<Tabs
allowScrollButtonsMobile
value={tabState}
@@ -145,12 +184,12 @@ const CreateFormContent = ({setOpen, onSubmit}) => {
backgroundColor: "#efefef",
}}
>
<Tab icon={<InsertDriveFileIcon/>} label="انتخاب آیتم"/>
<Tab disabled={tabState === 0} icon={<FileCopyIcon/>} label="انتخاب موضوع مشاهده شده"/>
<Tab disabled={tabState === 0 || tabState === 1} icon={<InfoIcon/>} label="اطلاعات فعالیت"/>
<Tab icon={<InsertDriveFileIcon />} label="انتخاب آیتم" />
<Tab disabled={tabState === 0} icon={<FileCopyIcon />} label="انتخاب موضوع مشاهده شده" />
<Tab disabled={tabState === 0 || tabState === 1} icon={<InfoIcon />} label="اطلاعات فعالیت" />
</Tabs>
<DialogContent dividers sx={{overflowY: "auto", maxHeight: "70vh"}}>
<Box sx={{flex: 1}}>
<DialogContent dividers sx={{ overflowY: "auto", maxHeight: "70vh" }}>
<Box sx={{ flex: 1 }}>
<TabPanel value={tabState} index={0}>
<GetItemsForm
setItemsList={setItemsList}
@@ -183,13 +222,13 @@ const CreateFormContent = ({setOpen, onSubmit}) => {
</TabPanel>
</Box>
</DialogContent>
<DialogActions sx={{alignItems: "center", justifyContent: "center"}}>
<DialogActions sx={{ alignItems: "center", justifyContent: "center" }}>
<Button
onClick={handlePrev}
variant="outlined"
color="error"
size="large"
startIcon={tabState === 0 ? <ExitToAppIcon/> : <KeyboardDoubleArrowRightIcon/>}
startIcon={tabState === 0 ? <ExitToAppIcon /> : <KeyboardDoubleArrowRightIcon />}
>
{tabState === 0 ? "بستن" : "مرحله قبل"}
</Button>
@@ -199,7 +238,7 @@ const CreateFormContent = ({setOpen, onSubmit}) => {
size="large"
disabled={isSubmitting}
type={"submit"}
endIcon={<BeenhereIcon/>}
endIcon={<BeenhereIcon />}
>
{isSubmitting ? "در حال ثبت فعالیت" : "ثبت فعالیت"}
</Button>

16
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
View File

@@ -82,22 +82,22 @@ const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, err
<Grid container spacing={2}>
<Grid item xs={12} md={6}>
<MuiDatePicker
name="start_date"
error={errors.start_date ? errors.start_date.message : null}
value={watch("start_date")}
name="activity_date"
error={errors.activity_date ? errors.activity_date.message : null}
value={watch("activity_date")}
placeholder={"تاریخ شروع فعالیت"}
setFieldValue={setValue}
helperText={errors.start_date ? errors.start_date.message : null}
helperText={errors.activity_date ? errors.activity_date.message : null}
/>
</Grid>
<Grid item xs={12} md={6}>
<MuiTimePicker
value={watch("action_date")}
name="action_date"
error={errors.action_date ? errors.action_date.message : null}
value={watch("activity_time")}
name="activity_time"
error={errors.activity_time ? errors.activity_time.message : null}
placeholder={"زمان فعالیت"}
setFieldValue={setValue}
helperText={errors.action_date ? errors.action_date.message : null}
helperText={errors.activity_time ? errors.activity_time.message : null}
/>
</Grid>
</Grid>

4
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemsForm.jsx
View File

@@ -28,8 +28,8 @@ const GetItemsForm = ({ setValue, setItemsList, tabState, setTabState }) => {
},
}}
onClick={() => {
setValue("itemId", item.id);
setItemsList(item.name);
setValue("item_id", item.id);
setItemsList(item);
setTabState(tabState + 1);
}}
>

4
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetSubItemsForm.jsx
View File

@@ -3,7 +3,7 @@ import { Card, CardActionArea, Grid, LinearProgress, Typography } from "@mui/mat
import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
const GetSubItemsForm = ({ setValue, watch, setSubItemsList, tabState, setTabState }) => {
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(watch("itemId"));
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(watch("item_id"));
return (
<>
@@ -27,7 +27,7 @@ const GetSubItemsForm = ({ setValue, watch, setSubItemsList, tabState, setTabSta
},
}}
onClick={() => {
setValue("itemSubId", item.sub_item);
setValue("sub_item_id", item.sub_item);
setSubItemsList(item);
setTabState(tabState + 1);
}}

2
src/components/dashboard/roadItems/operator/Actions/Create/Forms/PreviousStatesInfo.jsx
View File

@@ -18,7 +18,7 @@ const PreviousStatesInfo = ({ itemsList, subItemsList }) => {
</Box>
<Divider sx={{ flex: 1, mx: 2 }} />
<Typography variant="body2" sx={{ fontWeight: 600, color: "grey.800" }}>
{itemsList || "هیچ آیتمی انتخاب نشده است"}
{itemsList.name || "هیچ آیتمی انتخاب نشده است"}
</Typography>
</Grid>
<Grid item xs={12} sm={12} sx={{ display: "flex", alignItems: "center" }}>

32
src/components/dashboard/roadItems/operator/Actions/Create/Forms/index.jsx
View File

@@ -1,27 +1,16 @@
"use client";
import {Dialog} from "@mui/material";
import { Dialog } from "@mui/material";
import CreateFormContent from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent";
import {CREATE_ROAD_ITEMS} from "@/core/utils/routes";
import { CREATE_ROAD_ITEMS } from "@/core/utils/routes";
import useRequest from "@/lib/hooks/useRequest";
const OperatorCreateForm = ({open, setOpen, mutate, rowId}) => {
const requestServer = useRequest({notificationSuccess: true});
const HandleSubmit = async (data) => {
let endPoint;
let startPoint = `${data.start_point.lat},${data.start_point.lng}`;
data.end_point !== "" && (endPoint = `${data.end_point.lat},${data.end_point.lng}`);
const OperatorCreateForm = ({ open, setOpen, mutate, rowId }) => {
const requestServer = useRequest({ notificationSuccess: true });
const HandleSubmit = async ({ result }) => {
const formData = new FormData();
data.rahdaran_id.map((rahdar, index) => formData.append(`rahdaran_id[${index}]`, rahdar.id));
formData.append("item_id", data.itemId);
formData.append("sub_item_id", data.itemSubId);
formData.append("amount", data.amount);
formData.append("activity_time", data.action_date);
formData.append("activity_date", data.start_date);
data.cmms_machines.map((machine, index) => formData.append(`machines_id[${index}]`, machine.id));
data.before_image !== null && formData.append("before_image", data.before_image);
data.after_image !== null && formData.append("after_image", data.after_image);
data.start_point !== "" && formData.append("start_point", startPoint);
data.end_point !== "" && formData.append("end_point", endPoint);
for (const [key, value] of Object.entries(result)) {
formData.append(key, value);
}
await requestServer(CREATE_ROAD_ITEMS, "post", {
data: formData,
})
@@ -29,12 +18,11 @@ const OperatorCreateForm = ({open, setOpen, mutate, rowId}) => {
mutate();
setOpen(false);
})
.catch((error) => {
});
.catch((error) => {});
};
return (
<Dialog open={open} fullWidth maxWidth="sm">
<CreateFormContent setOpen={setOpen} onSubmit={HandleSubmit}/>
<CreateFormContent setOpen={setOpen} mutate={mutate} onSubmit={HandleSubmit} />
</Dialog>
);
};

17
src/components/dashboard/roadItems/operator/Actions/ObservedGashtCreate/GashtCreate.jsx Normal file
View File

@@ -0,0 +1,17 @@
import { Button, Dialog, DialogActions, DialogTitle } from "@mui/material";
import GashtCreateContent from "./GashtCreateContent";
const GashtCreate = ({ open, setOpen, mutate, rowId }) => {
return (
<Dialog open={open} fullWidth maxWidth="md">
<DialogTitle>جستجوی مورد مشاهده شده در گشت راهداری و ترابری</DialogTitle>
<GashtCreateContent mutate={mutate} setOpen={setOpen} />
<DialogActions>
<Button onClick={() => setOpen(false)} variant="outlined" color="primary" autoFocus>
بستن
</Button>
</DialogActions>
</Dialog>
);
};
export default GashtCreate;

116
src/components/dashboard/roadItems/operator/Actions/ObservedGashtCreate/GashtCreateContent.jsx Normal file
View File

@@ -0,0 +1,116 @@
import { Box, Button, DialogActions, DialogContent, Grid, Stack, Tab, Tabs } from "@mui/material";
import { useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup";
import * as yup from "yup";
import MuiDatePicker from "@/core/components/MuiDatePicker";
import InsertDriveFileIcon from "@mui/icons-material/InsertDriveFile";
import FileCopyIcon from "@mui/icons-material/FileCopy";
import InfoIcon from "@mui/icons-material/Info";
import GetItemsForm from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemsForm";
import GetSubItemsForm from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetSubItemsForm";
import GetItemInfo from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo";
import ExitToAppIcon from "@mui/icons-material/ExitToApp";
import KeyboardDoubleArrowRightIcon from "@mui/icons-material/KeyboardDoubleArrowRight";
import BeenhereIcon from "@mui/icons-material/Beenhere";
import StyledForm from "@/core/components/StyledForm";
import React from "react";
import { TabPanel } from "@mui/lab";
const GashtCreateContent = ({ mutate, setOpen }) => {
const defaultValues = {
start_date: null,
end_date: null,
item_id: null,
road_patrol_id: null,
};
const validationSchema = yup
.object()
.shape({
start_date: yup.string().nullable(),
end_date: yup.string().nullable(),
item_id: yup.string().nullable(),
road_patrol_id: yup.string().nullable(),
})
.test("at-least-one", "وارد کردن مقدار ضروریست!!!", (values) => {
return (!!values.start_date && !!values.end_date) || !!values.item_id || !!values.road_patrol_id;
});
const {
control,
getValues,
watch,
register,
handleSubmit,
setValue,
formState: { errors, isSubmitting },
} = useForm({
defaultValues,
resolver: yupResolver(validationSchema),
mode: "onBlur",
});
return (
<StyledForm onSubmit={handleSubmit(onSubmit)}>
<Tabs
allowScrollButtonsMobile
value={tabState}
onChange={handleChangeTab}
variant={`${isMobile ? "scrollable" : "fullWidth"}`}
sx={{
display: "flex",
justifyContent: "space-around",
width: "100%",
backgroundColor: "#efefef",
}}
>
<Tab icon={<InsertDriveFileIcon />} label="انتخاب آیتم" />
<Tab disabled={tabState === 0} icon={<FileCopyIcon />} label="انتخاب موضوع مشاهده شده" />
</Tabs>
<DialogContent dividers sx={{ overflowY: "auto", maxHeight: "70vh" }}>
<Box sx={{ flex: 1 }}>
<TabPanel value={tabState} index={0}>
<GetItemsForm
setItemsList={setItemsList}
setValue={setValue}
watch={watch}
tabState={tabState}
setTabState={setTabState}
/>
</TabPanel>
<TabPanel value={tabState} index={1}>
<GetSubItemsForm
setSubItemsList={setSubItemsList}
setValue={setValue}
watch={watch}
tabState={tabState}
setTabState={setTabState}
/>
</TabPanel>
</Box>
</DialogContent>
<DialogActions sx={{ alignItems: "center", justifyContent: "center" }}>
<Button
onClick={handlePrev}
variant="outlined"
color="error"
size="large"
startIcon={tabState === 0 ? <ExitToAppIcon /> : <KeyboardDoubleArrowRightIcon />}
>
{tabState === 0 ? "بستن" : "مرحله قبل"}
</Button>
{tabState === 2 && (
<Button
variant="contained"
size="large"
disabled={isSubmitting}
type={"submit"}
endIcon={<BeenhereIcon />}
>
{isSubmitting ? "در حال ثبت فعالیت" : "ثبت فعالیت"}
</Button>
)}
</DialogActions>
</StyledForm>
);
};
export default GashtCreateContent;

38
src/components/dashboard/roadItems/operator/Actions/ObservedGashtCreate/index.jsx Normal file
View File

@@ -0,0 +1,38 @@
"use client";
import { Button, IconButton, useMediaQuery } from "@mui/material";
import { useTheme } from "@emotion/react";
import { useState } from "react";
import AddRoadIcon from "@mui/icons-material/AddRoad";
import GashtCreate from "./GashtCreate";
const ObservedGashtCreate = ({ mutate }) => {
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
const [open, setOpen] = useState(false);
const handleOpen = () => {
setOpen(true);
};
return (
<>
{isMobile ? (
<IconButton aria-label="ثبت فعالیت" color="primary" onClick={handleOpen}>
<AddRoadIcon sx={{ fontSize: "25px" }} />
</IconButton>
) : (
<Button
size={"small"}
variant="contained"
color="primary"
startIcon={<AddRoadIcon />}
onClick={handleOpen}
>
ثبت فعالیت برای موارد مشاهده شده در گشت راهداری
</Button>
)}
{open && <GashtCreate open={open} setOpen={setOpen} mutate={mutate} />}
</>
);
};
export default ObservedGashtCreate;

55
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
View File

@@ -1,29 +1,40 @@
import { LinearProgress, Typography } from "@mui/material";
import { Dialog, DialogTitle } from "@mui/material";
import EditFormContent from "./EditFormContent";
import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
import { UPDATE_ROAD_ITEMS } from "@/core/utils/routes";
import useRequest from "@/lib/hooks/useRequest";
const EditController = ({ rowId, mutate, setOpenEditDialog, row }) => {
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(row.original?.item);
const subItem = subItemsList.find((SubItem) => SubItem.sub_item === row.original?.sub_item);
const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row }) => {
const requestServer = useRequest({ notificationSuccess: true });
const HandleSubmit = async ({ result }) => {
const formData = new FormData();
for (const [key, value] of Object.entries(result)) {
formData.append(key, value);
}
await requestServer(`${UPDATE_ROAD_ITEMS}/${rowId}`, "post", {
data: formData,
})
.then((response) => {
mutate();
setOpenEditDialog(false);
})
.catch((error) => {});
};
return (
<>
{errorSubItemsList ? (
<Typography color={"error"} textAlign={"center"}>
خطا در دریافت اطلاعات!!!
</Typography>
) : loadingSubItemsList ? (
<LinearProgress />
) : (
<EditFormContent
subItem={subItem}
rowId={rowId}
row={row}
mutate={mutate}
setOpenEditDialog={setOpenEditDialog}
/>
)}
</>
<Dialog
maxWidth="sm"
fullWidth
open={openEditDialog}
PaperProps={{
sx: {
boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px",
},
}}
>
<DialogTitle>ویرایش اطلاعات</DialogTitle>
<EditFormContent setOpenEditDialog={setOpenEditDialog} onSubmit={HandleSubmit} defaultData={row.original} />
</Dialog>
);
};
export default EditController;

255
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
View File

@@ -1,215 +1,72 @@
import { Button, DialogActions, DialogContent, Stack, TextField } from "@mui/material";
import useRequest from "@/lib/hooks/useRequest";
import { Controller, useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup";
import { array, mixed, object, string } from "yup";
import StyledForm from "@/core/components/StyledForm";
import { LinearProgress, Typography } from "@mui/material";
import React from "react";
import ImageUpload from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/ImageUpload";
import MapInfoTwoMarker from "@/core/components/MapInfoTwoMarker";
import MapInfoOneMarker from "@/core/components/MapInfoOneMarker";
import { UPDATE_ROAD_ITEMS } from "@/core/utils/routes";
import CarCode from "@/core/components/CarCode";
import RahdarCode from "@/core/components/RahdarCode";
import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
import NumberField from "@/core/components/NumberField";
import EditFormCreate from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate";
const validationSchema = object({
amount: string().required("وارد کردن مقدار الزامیست!"),
cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"),
before_image: mixed()
.nullable()
.test("before-image-required", "لطفا عکس قبل از اقدام را بارگذاری کنید!", function (value) {
const { subItem } = this.options.context;
const needsImage = subItem?.needs_image === 1;
if (needsImage) {
return !!value;
}
return true;
}),
after_image: mixed()
.nullable()
.test("after-image-required", "لطفا عکس بعد از اقدام را بارگذاری کنید!", function (value) {
const { subItem } = this.options.context;
const needsImage = subItem?.needs_image === 1;
if (needsImage) {
return !!value;
}
return true;
}),
start_point: mixed()
.test("start-point-required", "لطفاً نقطه شروع را مشخص کنید!", function (value) {
return !!value; // چک می‌کند که مقدار موجود است
})
.required("لطفاً نقطه شروع را مشخص کنید!"),
end_point: mixed().test("end-point-required", "لطفاً نقطه پایان را مشخص کنید!", function (value) {
const { subItem } = this.options.context;
const needsEndPoint = subItem?.needs_end_point === 1;
if (needsEndPoint) {
return !!value; // چک می‌کند که مقدار موجود است
}
return true;
}),
});
const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => {
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item);
const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item);
const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) => {
const defaultValues = {
before_image: row.original?.files[0]?.full_path_for_fast_react || null,
after_image: row.original?.files[1]?.full_path_for_fast_react || null,
amount: row.original.sub_item_data || null,
start_point: { lat: row.original.start_lat || "", lng: row.original.start_lng || "" },
end_point: { lat: row.original.end_lat || "", lng: row.original.end_lng || "" },
cmms_machines: row.original.cmms_machines || null,
rahdaran_id: row.original.rahdaran || null,
before_image: defaultData?.files[0]?.full_path_for_fast_react || null,
after_image: defaultData?.files[1]?.full_path_for_fast_react || null,
amount: defaultData?.sub_item_data || null,
start_point: { lat: defaultData?.start_lat || "", lng: defaultData?.start_lng || "" },
end_point: { lat: defaultData?.end_lat || "", lng: defaultData?.end_lng || "" },
cmms_machines: defaultData?.cmms_machines || null,
rahdaran_id: defaultData?.rahdaran || null,
};
const requestServer = useRequest();
const {
control,
getValues,
watch,
register,
handleSubmit,
setValue,
formState: { errors, isSubmitting },
} = useForm({
defaultValues,
resolver: yupResolver(validationSchema),
mode: "onBlur",
context: { subItem },
});
const onSubmitBase = (data) => {
let result = { ...data };
(result.before_image === null || result.before_image === defaultValues.before_image) &&
delete result.before_image;
(result.after_image === null || result.after_image === defaultValues.after_image) && delete result.after_image;
if (subItem.needs_end_point !== 1) {
delete result.end_point;
} else {
result.end_point = `${result.end_point.lat},${result.end_point.lng}`;
}
const onSubmit = async (data) => {
let endPoint;
let startPoint = `${data.start_point.lat},${data.start_point.lng}`;
subItem.needs_end_point === 1 && (endPoint = `${data.end_point.lat},${data.end_point.lng}`);
const formData = new FormData();
subItem.needs_image === 1 &&
data.before_image !== defaultValues.before_image &&
formData.append("before_image", data.before_image);
subItem.needs_image === 1 &&
data.after_image !== defaultValues.after_image &&
formData.append("after_image", data.after_image);
formData.append("amount", data.amount);
data.cmms_machines.map((machine, index) => formData.append(`machines_id[${index}]`, machine.id));
data.rahdaran_id.map((rahdar, index) => formData.append(`rahdaran_id[${index}]`, rahdar.id));
formData.append("start_point", startPoint);
subItem.needs_end_point === 1 && formData.append("end_point", endPoint);
result.start_point = `${result.start_point.lat},${result.start_point.lng}`;
await requestServer(`${UPDATE_ROAD_ITEMS}/${rowId}`, "post", {
notificationSuccess: true,
data: formData,
})
.then((res) => {
mutate();
setOpenEditDialog(false);
})
.catch((err) => {});
result.rahdaran_id.forEach((rahdar, index) => {
result[`rahdaran_id[${index}]`] = rahdar.id;
});
delete result.rahdaran_id;
result.cmms_machines.forEach((cmms_machine, index) => {
result[`machines_id[${index}]`] = cmms_machine.id;
});
delete result.cmms_machines;
onSubmit({
result,
data: {
...data,
item_name: subItem.item_str,
sub_item_name: subItemsList.name,
},
});
};
return (
<>
<StyledForm onSubmit={handleSubmit(onSubmit)}>
<DialogContent sx={{ overflowY: "auto", maxHeight: "70vh" }}>
<Stack spacing={2}>
<Stack>
{subItem.needs_image === 1 ? (
<ImageUpload
afterImage={row.original?.files[0]?.full_path_for_fast_react}
beforeImage={row.original?.files[1]?.full_path_for_fast_react}
getValues={getValues}
setValue={setValue}
control={control}
errors={errors}
/>
) : null}
</Stack>
<Stack>
<NumberField
{...register("amount")}
label={`مقدار (${subItem.unit})`}
error={!!errors.amount}
value={watch("amount")}
type="text"
size={"small"}
unit={subItem.unit}
inputProps={{
inputMode: "number",
min: 0,
pattern: "[0-9]*",
}}
onChange={(event) => {
if (!isNaN(event.target.value)) {
setValue("amount", event.target.value);
} else {
setValue("amount", watch("amount"));
}
}}
helperText={errors.amount ? errors.amount.message : null}
variant="outlined"
fullWidth
/>
</Stack>
<Stack>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<CarCode
carCode={field.value || []}
setCarCode={(value) => field.onChange(value || [])}
inputValueDefault={row.original.cmms_machines}
multiple={true}
error={error} // اگر خطا وجود داشته باشد
/>
);
}}
name={"cmms_machines"}
/>
</Stack>
<Stack>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<RahdarCode
rahdarsCode={field.value || []}
setRahdarsCode={(value) => field.onChange(value || [])}
error={error}
/>
);
}}
name={"rahdaran_id"}
/>
</Stack>
<Stack>
{subItem.needs_end_point === 1 ? (
<MapInfoTwoMarker
StartPoint={getValues("start_point")}
EndPoint={getValues("end_point")}
setValue={setValue}
errors={errors}
/>
) : (
<MapInfoOneMarker
StartPoint={getValues("start_point")}
setValue={setValue}
errors={errors}
/>
)}
</Stack>
</Stack>
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenEditDialog(false)} variant="outlined" color="primary" autoFocus>
بستن
</Button>
<Button disabled={isSubmitting} type={"submit"} variant="contained" color="primary">
{isSubmitting ? "در حال ویرایش" : "ویرایش"}
</Button>
</DialogActions>
</StyledForm>
{errorSubItemsList ? (
<Typography color={"error"} textAlign={"center"}>
خطا در دریافت اطلاعات!!!
</Typography>
) : loadingSubItemsList ? (
<LinearProgress />
) : (
<EditFormCreate
onSubmitBase={onSubmitBase}
subItem={subItem}
defaultData={defaultData}
defaultValues={defaultValues}
setOpenEditDialog={setOpenEditDialog}
/>
)}
</>
);
};

171
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx Normal file
View File

@@ -0,0 +1,171 @@
import { Button, DialogActions, DialogContent, Stack } from "@mui/material";
import ImageUpload from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/ImageUpload";
import NumberField from "@/core/components/NumberField";
import { Controller, useForm } from "react-hook-form";
import CarCode from "@/core/components/CarCode";
import RahdarCode from "@/core/components/RahdarCode";
import MapInfoTwoMarker from "@/core/components/MapInfoTwoMarker";
import MapInfoOneMarker from "@/core/components/MapInfoOneMarker";
import StyledForm from "@/core/components/StyledForm";
import React from "react";
import { yupResolver } from "@hookform/resolvers/yup";
import { array, mixed, object, string } from "yup";
const validationSchema = object({
amount: string().required("وارد کردن مقدار الزامیست!"),
cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"),
before_image: mixed()
.nullable()
.test("before-image-required", "لطفا عکس قبل از اقدام را بارگذاری کنید!", function (value) {
const { subItem } = this.options.context;
const needsImage = subItem?.needs_image === 1;
if (needsImage) {
return !!value;
}
return true;
}),
after_image: mixed()
.nullable()
.test("after-image-required", "لطفا عکس بعد از اقدام را بارگذاری کنید!", function (value) {
const { subItem } = this.options.context;
const needsImage = subItem?.needs_image === 1;
if (needsImage) {
return !!value;
}
return true;
}),
start_point: mixed()
.test("start-point-required", "لطفاً نقطه شروع را مشخص کنید!", function (value) {
return !!value; // چک می‌کند که مقدار موجود است
})
.required("لطفاً نقطه شروع را مشخص کنید!"),
end_point: mixed().test("end-point-required", "لطفاً نقطه پایان را مشخص کنید!", function (value) {
const { subItem } = this.options.context;
const needsEndPoint = subItem?.needs_end_point === 1;
if (needsEndPoint) {
return !!value;
}
return true;
}),
});
const EditFormCreate = ({ defaultData, subItem, onSubmitBase, defaultValues, setOpenEditDialog }) => {
const {
control,
getValues,
watch,
register,
handleSubmit,
setValue,
formState: { errors, isSubmitting },
} = useForm({
defaultValues,
resolver: yupResolver(validationSchema),
mode: "onBlur",
context: { subItem },
});
return (
<StyledForm onSubmit={handleSubmit(onSubmitBase)}>
<DialogContent sx={{ overflowY: "auto", maxHeight: "70vh" }}>
<Stack spacing={2}>
<Stack>
{subItem.needs_image === 1 ? (
<ImageUpload
afterImage={defaultData?.files[0]?.full_path_for_fast_react}
beforeImage={defaultData?.files[1]?.full_path_for_fast_react}
getValues={getValues}
setValue={setValue}
control={control}
errors={errors}
/>
) : null}
</Stack>
<Stack>
<NumberField
{...register("amount")}
label={`مقدار (${subItem.unit})`}
error={!!errors.amount}
value={watch("amount")}
type="text"
size={"small"}
unit={subItem.unit}
inputProps={{
inputMode: "number",
min: 0,
pattern: "[0-9]*",
}}
onChange={(event) => {
if (!isNaN(event.target.value)) {
setValue("amount", event.target.value);
} else {
setValue("amount", watch("amount"));
}
}}
helperText={errors.amount ? errors.amount.message : null}
variant="outlined"
fullWidth
/>
</Stack>
<Stack>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<CarCode
carCode={field.value || []}
setCarCode={(value) => field.onChange(value || [])}
inputValueDefault={defaultData?.cmms_machines}
multiple={true}
error={error} // اگر خطا وجود داشته باشد
/>
);
}}
name={"cmms_machines"}
/>
</Stack>
<Stack>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<RahdarCode
rahdarsCode={field.value || []}
setRahdarsCode={(value) => field.onChange(value || [])}
error={error}
/>
);
}}
name={"rahdaran_id"}
/>
</Stack>
<Stack>
{subItem.needs_end_point === 1 ? (
<MapInfoTwoMarker
StartPoint={getValues("start_point")}
EndPoint={getValues("end_point")}
setValue={setValue}
errors={errors}
/>
) : (
<MapInfoOneMarker
StartPoint={getValues("start_point")}
setValue={setValue}
errors={errors}
/>
)}
</Stack>
</Stack>
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenEditDialog(false)} variant="outlined" color="primary" autoFocus>
بستن
</Button>
<Button disabled={isSubmitting} type={"submit"} variant="contained" color="primary">
{isSubmitting ? "در حال ویرایش" : "ویرایش"}
</Button>
</DialogActions>
</StyledForm>
);
};
export default EditFormCreate;

20
src/components/dashboard/roadItems/operator/RowActions/EditForm/index.jsx
View File

@@ -19,19 +19,13 @@ const EditForm = ({ row, mutate, rowId }) => {
<BorderColorIcon />
</IconButton>
</Tooltip>
<Dialog
maxWidth="sm"
fullWidth
open={openEditDialog}
PaperProps={{
sx: {
boxShadow: "rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px",
},
}}
>
<DialogTitle>ویرایش اطلاعات</DialogTitle>
<EditController setOpenEditDialog={setOpenEditDialog} rowId={rowId} row={row} mutate={mutate} />
</Dialog>
<EditController
openEditDialog={openEditDialog}
setOpenEditDialog={setOpenEditDialog}
rowId={rowId}
row={row}
mutate={mutate}
/>
</>
);
};

2
src/components/dashboard/roadItems/operator/Toolbar.jsx
View File

@@ -1,12 +1,14 @@
import PrintExcel from "./ExcelPrint";
import OperatorCreate from "./Actions/Create";
import { Stack } from "@mui/material";
import ObservedGashtCreate from "./Actions/ObservedGashtCreate";
const Toolbar = ({ table, filterData, mutate }) => {
return (
<Stack direction={"row"} spacing={2}>
<PrintExcel table={table} filterData={filterData} />
<OperatorCreate mutate={mutate} />
{/*<ObservedGashtCreate mutate={mutate} />*/}
</Stack>
);
};

27
src/components/dashboard/roadPatrols/operator/OperatorList.jsx
View File

@@ -1,11 +1,12 @@
"use client";
import { useMemo } from "react";
import { Box, Typography } from "@mui/material";
import { Box, Stack, Typography } from "@mui/material";
import DataTableWithAuth from "@/core/components/DataTableWithAuth";
import Toolbar from "./Toolbar";
import { GET_ROAD_PATROL_OPERATOR_LIST } from "@/core/utils/routes";
import moment from "jalali-moment";
import RowActions from "./RowActions";
import ReportForm from "./RowActions/ReportForm";
const OperatorList = () => {
const columns = useMemo(
@@ -81,6 +82,29 @@ const OperatorList = () => {
grow: false,
size: 100,
},
{
header: "گزارش مامور",
enableColumnFilter: false,
datatype: "text",
grow: false,
size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
py: 0,
"&:first-of-type": {
borderLeft: "unset",
},
},
},
Cell: ({ renderedCellValue, row }) => {
return (
<Stack alignItems={"center"} justifyContent={"center"}>
<ReportForm rowId={row.getValue("id")} />
</Stack>
);
},
},
],
[]
);
@@ -89,7 +113,6 @@ const OperatorList = () => {
<>
<Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
<DataTableWithAuth
table_title={"عملیات"}
need_filter={true}
columns={columns}
sorting={[{ id: "id", desc: true }]}

3
src/components/dashboard/roadPatrols/operator/RowActions/ReportForm/index.jsx
View File

@@ -2,8 +2,7 @@ import { Tooltip, IconButton } from "@mui/material";
import PrintIcon from "@mui/icons-material/Print";
const ReportForm = ({ rowId }) => {
const reportUrl = "https://rms.rmto.ir/v2/road_patrols/operator/report/96872"; // TODO replace id here
const reportUrl = `https://rms.rmto.ir/v2/road_patrols/operator/report/${rowId}`;
return (
<Tooltip title="گزارش" arrow placement="right">
<IconButton

7
src/components/dashboard/roadPatrols/operator/RowActions/index.jsx
View File

@@ -1,11 +1,6 @@
import { Box } from "@mui/material";
import ReportForm from "./ReportForm";
const RowActions = ({ row }) => {
return (
<Box sx={{ display: "flex", gap: 1 }}>
<ReportForm rowId={row.getValue("id")} />
</Box>
);
return <Box sx={{ display: "flex", gap: 1 }}></Box>;
};
export default RowActions;

60
src/components/dashboard/roadPatrols/supervisor/RowActions/DeleteForm/DeleteContent.jsx
View File

@@ -1,9 +1,45 @@
import { Button, DialogActions, DialogContent, Stack, Typography, List, ListItem } from "@mui/material";
import useRequest from "@/lib/hooks/useRequest";
import React from "react";
import React, { useState } from "react";
import { DELETE_ROAD_PATROL_SUPERVISOR } from "@/core/utils/routes";
const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => {
const requestServer = useRequest();
const requestServer = useRequest({ notificationSuccess: true });
const [submittingPartial, setSubmittingPartial] = useState(false);
const [submittingGeneral, setSubmittingGeneral] = useState(false);
const handleGeneralDelete = () => {
setSubmittingGeneral(true);
requestServer(`${DELETE_ROAD_PATROL_SUPERVISOR}/${rowId}`, "post", {
data: {
type: 2,
},
})
.then(() => {
mutate();
setOpenDeleteDialog(false);
setSubmittingGeneral(false);
})
.catch(() => {
setSubmittingGeneral(false);
});
};
const handlePartialDelete = () => {
setSubmittingPartial(true);
requestServer(`${DELETE_ROAD_PATROL_SUPERVISOR}/${rowId}`, "post", {
data: {
type: 1,
},
})
.then(() => {
mutate();
setOpenDeleteDialog(false);
setSubmittingPartial(false);
})
.catch(() => {
setSubmittingPartial(false);
});
};
return (
<>
@@ -42,23 +78,11 @@ const DeleteContent = ({ rowId, mutate, setOpenDeleteDialog }) => {
<Button onClick={() => setOpenDeleteDialog(false)} variant="outlined" color="primary">
بستن
</Button>
<Button
onClick={() => {
/* handle partial delete */
}}
variant="outlined"
color="warning"
>
حذف جزئی
<Button onClick={handlePartialDelete} variant="outlined" color="warning" disabled={submittingPartial}>
{submittingPartial ? "درحال ارسال اطلاعات..." : "حذف جزئی"}
</Button>
<Button
onClick={() => {
/* handle complete delete */
}}
variant="contained"
color="error"
>
حذف کلی
<Button onClick={handleGeneralDelete} variant="contained" color="error" disabled={submittingGeneral}>
{submittingGeneral ? "درحال ارسال اطلاعات..." : "حذف کلی"}
</Button>
</DialogActions>
</>

32
src/components/dashboard/roadPatrols/supervisor/RowActions/OfficerDescription/index.jsx
View File

@@ -1,26 +1,10 @@
import { Dialog, DialogContent, DialogTitle, IconButton, Tooltip, Typography, Card, CardContent } from "@mui/material";
import { useState } from "react";
import useRequest from "@/lib/hooks/useRequest";
import RemoveRedEyeIcon from "@mui/icons-material/RemoveRedEye";
import CloseIcon from "@mui/icons-material/Close";
const OfficerDescriptionForm = ({ row }) => {
const OfficerDescriptionForm = ({ description }) => {
const [openOfficerDescriptionDialog, setOpenOfficerDescriptionDialog] = useState(false);
const requestServer = useRequest();
const handleSubmit = () => {
// requestServer(`${RESERVE_PASSENGER_BOSS}/${rowId}`, "post", { description })
// .then((response) => {
// setOpenOfficerDescriptionDialog(false);
// mutate();
// })
// .catch((error) => {
// console.error(error);
// })
// .finally(() => {
// setIsSubmitting(false);
// });
};
return (
<>
@@ -55,18 +39,7 @@ const OfficerDescriptionForm = ({ row }) => {
<DialogContent>
<Card sx={{ padding: 2, boxShadow: 3, borderRadius: 2 }}>
<CardContent>
<Typography
gutterBottom
variant="body1"
component="div"
sx={{ fontWeight: "bold", mb: 2, color: "primary.main" }}
>
توضیحات :
</Typography>
<Typography variant="body2">
{row.original.description || "هیچ توضیحی موجود نیست"}{" "}
{/* should replace row.original.description with the back end*/}
</Typography>
<Typography variant="body2">{description || "هیچ توضیحی موجود نیست"} </Typography>
</CardContent>
</Card>
</DialogContent>
@@ -74,5 +47,4 @@ const OfficerDescriptionForm = ({ row }) => {
</>
);
};
export default OfficerDescriptionForm;

3
src/components/dashboard/roadPatrols/supervisor/RowActions/ReportForm/index.jsx
View File

@@ -2,8 +2,7 @@ import { Tooltip, IconButton } from "@mui/material";
import PrintIcon from "@mui/icons-material/Print";
const ReportForm = ({ rowId }) => {
const reportUrl = "https://rms.rmto.ir/v2/road_patrols/operator/report/96872"; // TODO replace id here
const reportUrl = `https://rms.rmto.ir/v2/road_patrols/operator/report/${rowId}`;
return (
<Tooltip title="گزارش" arrow placement="right">
<IconButton

4
src/components/dashboard/roadPatrols/supervisor/RowActions/index.jsx
View File

@@ -1,13 +1,9 @@
import { Box } from "@mui/material";
import ReportForm from "./ReportForm";
import DeleteForm from "./DeleteForm";
import OfficerDescriptionForm from "./OfficerDescription";
const RowActions = ({ row, mutate }) => {
return (
<Box sx={{ display: "flex", gap: 1 }}>
<ReportForm rowId={row.getValue("id")} />
<OfficerDescriptionForm row={row} />
<DeleteForm rowId={row.getValue("id")} mutate={mutate} />
</Box>
);

54
src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
View File

@@ -1,15 +1,16 @@
"use client";
import { useMemo } from "react";
import { Box, Typography } from "@mui/material";
import { Box, Stack } from "@mui/material";
import DataTableWithAuth from "@/core/components/DataTableWithAuth";
import Toolbar from "./Toolbar";
import { GET_ROAD_PATROL_SUPERVISOR_LIST } from "@/core/utils/routes";
import moment from "jalali-moment";
import RowActions from "./RowActions";
import useProvinces from "@/lib/hooks/useProvince";
import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency";
import useEdaratLists from "@/lib/hooks/useEdaratLists";
import OfficerDescriptionForm from "./RowActions/OfficerDescription";
import ReportForm from "./RowActions/ReportForm";
const OperatorList = () => {
const columns = useMemo(
@@ -151,6 +152,54 @@ const OperatorList = () => {
grow: false,
size: 100,
},
{
accessorKey: "description",
header: "توضیحات مامور",
id: "description",
enableColumnFilter: false,
datatype: "text",
grow: false,
size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
py: 0,
"&:first-of-type": {
borderLeft: "unset",
},
},
},
Cell: ({ renderedCellValue }) => {
return (
<Stack alignItems={"center"} justifyContent={"center"}>
<OfficerDescriptionForm description={renderedCellValue} />
</Stack>
);
},
},
{
header: "گزارش مامور",
enableColumnFilter: false,
datatype: "text",
grow: false,
size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
py: 0,
"&:first-of-type": {
borderLeft: "unset",
},
},
},
Cell: ({ renderedCellValue, row }) => {
return (
<Stack alignItems={"center"} justifyContent={"center"}>
<ReportForm rowId={row.getValue("id")} />
</Stack>
);
},
},
],
[]
);
@@ -159,7 +208,6 @@ const OperatorList = () => {
<>
<Box sx={{ p: 1, border: 1, borderColor: "divider", borderRadius: 1 }}>
<DataTableWithAuth
table_title={"ارزیابی"}
need_filter={true}
columns={columns}
sorting={[{ id: "id", desc: true }]}

30
src/core/components/ActivityCodeLog.jsx Normal file
View File

@@ -0,0 +1,30 @@
"use client";
import useRequest from "@/lib/hooks/useRequest";
import { useEffect } from "react";
import { ACTIVITY_LOG } from "@/core/utils/routes";
const ActivityCodeLog = ({ activity_code }) => {
const requestServer = useRequest({ notificationShow: false });
useEffect(() => {
if (!activity_code) return;
const fetchSubItems = async () => {
try {
await requestServer(ACTIVITY_LOG, "post", {
data: {
activityCode: activity_code,
},
});
} catch (error) {
console.error(error); // Always helpful to log the error for debugging.
}
};
fetchSubItems();
}, [activity_code, requestServer]);
return null; // Ensure the component still renders something.
};
export default ActivityCodeLog;

6
src/core/components/CarCode.jsx
View File

@@ -21,7 +21,10 @@ const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error, multiple
requestOptions: { signal: controller.signal },
})
.then((response) => {
setOptions(response.data.data || []);
const combinedArray = [...carCode, ...response.data.data];
const uniqueArray = Array.from(new Map(combinedArray.map((item) => [item.id, item])).values());
setOptions(uniqueArray || []);
})
.catch(() => {
setOptions([]);
@@ -38,7 +41,6 @@ const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error, multiple
fetchCarCodes(inputValue, controller);
return () => controller.abort();
}, [inputValue]);
return (
<Autocomplete
multiple={multiple}

28
src/core/components/MapInfoOneMarker.jsx
View File

@@ -12,24 +12,19 @@ const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
ssr: false,
});
const createCustomIcon = (size, iconUrl, labelText) => {
const createCustomIcon = (size, iconUrl, labelText, color) => {
if (labelText) {
return L.divIcon({
className: "custom-marker", // Apply your custom CSS class
html: `
<div style="position: relative; display: inline-block; text-align: center;">
<img
src="${iconUrl}"
style="width: ${size[0]}px; height: ${size[1]}px;"
alt="icon"
/>
<div style="position: absolute; top: 100%; left: 50%; transform: translate(-50%, 0); color: black; font-size: 12px;">
${labelText}
<div style="position: relative; text-align: center; width: 50px;">
<div style="background-color: ${color}; color: white; border-radius: 20px; padding: 5px;">
<span style="font-family: 'IRANSansFaNum', sans-serif;">${labelText}</span>
</div>
</div>
`,
iconSize: size,
iconAnchor: [size[0] / 2, size[1]],
popupAnchor: [0, -size[1]],
<div style="width: 5px; height: 20px; background: ${color}; margin: auto;border-bottom-left-radius: 50%; border-bottom-right-radius: 50%;"></div>
</div>`,
iconSize: [100, 50], // Adjust icon size to fit your content
iconAnchor: [50, 25], // Adjust to position the marker correctly
});
}
@@ -45,6 +40,7 @@ const MAX_ZOOM_FOR_MARKER = 13;
const MapInteraction = ({ setValue, startLat, startLng }) => {
const [isMarkerLocked, setIsMarkerLocked] = useState(!!(startLat && startLng)); // وضعیت قفل مارکر
const [enableSend, setEnableSend] = useState(false);
const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f"); // رنگ آیکن شروع
const [markerPosition, setMarkerPosition] = useState(
startLat && startLng ? { lat: startLat, lng: startLng } : null
);
@@ -79,6 +75,7 @@ const MapInteraction = ({ setValue, startLat, startLng }) => {
setValue("start_point", { lat: center.lat.toString(), lng: center.lng.toString() });
setMarkerPosition({ lat: center.lat, lng: center.lng }); // به‌روزرسانی موقعیت مارکر
setIsMarkerLocked(true);
setStartIconColor("#1CAC66");
}
};
@@ -86,6 +83,7 @@ const MapInteraction = ({ setValue, startLat, startLng }) => {
setValue("start_point", null); // حذف مقدار قبلی
setIsMarkerLocked(false); // باز کردن قفل مارکر
setMarkerPosition(null); // تنظیم مارکر به مرکز نقشه
setStartIconColor("#003d4f");
};
return (
@@ -93,7 +91,7 @@ const MapInteraction = ({ setValue, startLat, startLng }) => {
<Marker
position={markerPosition || map.getCenter()} // استفاده از موقعیت
ref={markerRef}
icon={createCustomIcon([35, 35], HereIcon.src, "اینجا")}
icon={createCustomIcon([35, 35], HereIcon.src, "اینجا", startIconColor)}
eventHandlers={{
click: handleMarkerClick,
}}

35
src/core/components/MapInfoTwoMarker.jsx
View File

@@ -12,27 +12,21 @@ const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
loading: () => <MapLoading />,
ssr: false,
});
const createCustomIcon = (size, iconUrl, labelText) => {
const createCustomIcon = (size, iconUrl, labelText, color) => {
if (labelText) {
return L.divIcon({
className: "custom-marker", // Apply your custom CSS class
html: `
<div style="position: relative; display: inline-block; text-align: center;">
<img
src="${iconUrl}"
style="width: ${size[0]}px; height: ${size[1]}px;"
alt="icon"
/>
<div style="position: absolute; top: 100%; left: 50%; transform: translate(-50%, 0); color: black; font-size: 12px;">
${labelText}
<div style="position: relative; text-align: center; width: 50px;">
<div style="background-color: ${color}; color: white; border-radius: 20px; padding: 5px;">
<span style="font-family: 'IRANSansFaNum', sans-serif;">${labelText}</span>
</div>
</div>
`,
iconSize: size,
iconAnchor: [size[0] / 2, size[1]],
popupAnchor: [0, -size[1]],
<div style="width: 5px; height: 20px; background: ${color}; margin: auto;border-bottom-left-radius: 50%; border-bottom-right-radius: 50%;"></div>
</div>`,
iconSize: [100, 50], // Adjust icon size to fit your content
iconAnchor: [50, 25], // Adjust to position the marker correctly
});
}
return L.icon({
iconUrl: iconUrl,
iconSize: size,
@@ -48,6 +42,8 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
const [startPosition, setStartPosition] = useState(startLat && startLng ? { lat: startLat, lng: startLng } : null);
const [endPosition, setEndPosition] = useState(endLat && endLng ? { lat: endLat, lng: endLng } : null);
const [enableSend, setEnableSend] = useState(false);
const [startIconColor, setStartIconColor] = useState(startLat ? "#1CAC66" : "#003d4f"); // رنگ آیکن شروع
const [endIconColor, setEndIconColor] = useState(endLat ? "#D13131" : "#003d4f"); // رنگ آیکن پایان
const startRef = useRef();
const endRef = useRef();
@@ -86,6 +82,7 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
setIsStartLocked(false);
setStartPosition(null);
setValue("start_point", null);
setStartIconColor("#003d4f");
};
const handleUnlockEnd = () => {
@@ -95,6 +92,8 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
setStartPosition(null);
setValue("end_point", "");
setValue("start_point", null);
setStartIconColor("#003d4f");
setEndIconColor("#003d4f");
};
return (
@@ -102,7 +101,7 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
<Marker
position={startPosition || map.getCenter()}
ref={startRef}
icon={createCustomIcon([35, 35], StartIcon.src, "نقطه شروع")}
icon={createCustomIcon([35, 35], StartIcon.src, "شروع", startIconColor)}
eventHandlers={{
click: () => {
if (!enableSend) return;
@@ -111,6 +110,7 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
setValue("start_point", { lat: center.lat.toString(), lng: center.lng.toString() });
setStartPosition({ lat: center.lat, lng: center.lng });
setIsStartLocked(true);
setStartIconColor("#1CAC66");
}
},
}}
@@ -172,7 +172,7 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
<Marker
position={endPosition || map.getCenter()}
ref={endRef}
icon={createCustomIcon([35, 35], EndIcon.src, "نقطه پایان")}
icon={createCustomIcon([35, 35], EndIcon.src, "پایان", endIconColor)}
eventHandlers={{
click: () => {
if (!enableSend) return;
@@ -181,6 +181,7 @@ const MapInteraction = ({ setValue, startLat, startLng, endLat, endLng }) => {
setValue("end_point", { lat: center.lat.toString(), lng: center.lng.toString() });
setEndPosition({ lat: center.lat, lng: center.lng });
setIsEndLocked(true);
setEndIconColor("#D13131");
}
},
}}

4
src/core/components/RahdarCode.jsx
View File

@@ -22,7 +22,9 @@ const RahdarCode = ({ rahdarsCode, setRahdarsCode, error, multiple = true }) =>
requestOptions: { signal: controller.signal },
})
.then((response) => {
setOptions(response.data.data || []);
const combinedArray = [...rahdarsCode, ...response.data.data];
const uniqueArray = Array.from(new Map(combinedArray.map((item) => [item.id, item])).values());
setOptions(uniqueArray || []);
})
.catch(() => {
setOptions([]);

9
src/core/utils/routes.js
View File

@@ -30,8 +30,10 @@ export const UPDATE_AZMAYESH_TYPE = api + "/api/v3/azmayesh_types/update";
//road patrol
export const GET_ROAD_PATROL_OPERATOR_LIST = api + "/api/v3/road_patrols/operator_index";
export const EXPORT_ROAD_PATROL_OPERATOR_LIST = "https://rms.rmto.ir/v2/road_patrols/operator/cartable/report";
export const EXPORT_ROAD_PATROL_OPERATOR_LIST = "https://rms.witel.ir/v2/road_patrols/operator/cartable/report";
export const GET_ROAD_PATROL_SUPERVISOR_LIST = api + "/api/v3/road_patrols/supervisor_index";
export const EXPORT_ROAD_PATROL_SUPERVISOR_LIST = "https://rms.witel.ir/v2/road_patrols/supervisor/cartable/report";
export const DELETE_ROAD_PATROL_SUPERVISOR = api + "/api/v3/road_patrols/delete";
export const EXPORT_ROAD_PATROL_SUPERVISOR_LIST = "https://rms.rmto.ir/v2/road_patrols/supervisor/cartable/report";
export const GET_OTP_TOKEN = "fake/api";
export const VERIFY_OTP = "fake/api";
@@ -51,4 +53,7 @@ export const REJECT_BY_SUPERVISOR = api + "/api/v3/road_items/verify_by_supervis
export const DELETE_BY_SUPERVISOR = api + "/api/v3/road_items/delete";
export const RESTORE_BY_SUPERVISOR = api + "/api/v3/road_items/restore";
export const GET_CAR_LIST_SEARCH = api + "/api/v3/cmms_machines/search";
export const GET_RAHDARANS_LIST_SEARCH = api + "/api/v3/rahdaran/search";
export const GET_RAHDARANS_LIST_SEARCH = api + "/api/v3/rahdaran/search";
// activity code log
export const ACTIVITY_LOG = api + "/api/v3/profile/add_activity";