{value === index &&
{children}}
@@ -34,7 +32,7 @@ const defaultValues = {
start_date: "",
before_image: null,
after_image: null,
- cmms_machine_id: null,
+ cmms_machines: null,
rahdaran_id: null,
start_point: "",
end_point: "",
@@ -43,14 +41,14 @@ const validationSchema = object({
itemId: string().required("نوع آیتم را مشخص کنید!"),
itemSubId: string().required("موضوع مشاهده شده را مشخص کنید!"),
amount: string().required("وارد کردن مقدار الزامیست!"),
- cmms_machine_id: object().required("وارد کردن کد خودرو الزامیست!"),
+ cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"), // بررسی حداقل یک آیتم,
action_date: string().required("لطفا زمان فعالیت را انتخاب کنید!"),
start_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;
@@ -60,7 +58,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;
@@ -73,7 +71,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; // چک میکند که مقدار موجود است
@@ -82,12 +80,11 @@ const validationSchema = object({
}),
});
-const CreateFormContent = ({ setOpen, mutate, rowId }) => {
+const CreateFormContent = ({setOpen, onSubmit}) => {
const [tabState, setTabState] = useState(0);
const [itemsList, setItemsList] = useState();
const [subItemsList, setSubItemsList] = useState([]);
const theme = useTheme();
- const requestServer = useRequest({ notificationSuccess: true });
const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
const handleClose = () => {
setOpen(false);
@@ -98,6 +95,20 @@ const CreateFormContent = ({ setOpen, mutate, rowId }) => {
};
const handlePrev = () => {
+ if (tabState === 2) {
+ const fieldsToReset = [
+ "amount",
+ "action_date",
+ "start_date",
+ "before_image",
+ "after_image",
+ "cmms_machines",
+ "rahdaran_id",
+ "start_point",
+ "end_point",
+ ];
+ fieldsToReset.forEach((field) => resetField(field));
+ }
if (tabState === 0) {
handleClose();
} else {
@@ -111,40 +122,15 @@ const CreateFormContent = ({ setOpen, mutate, rowId }) => {
register,
handleSubmit,
setValue,
- formState: { errors, isSubmitting },
+ resetField,
+ formState: {errors, isSubmitting},
} = useForm({
defaultValues,
resolver: yupResolver(validationSchema),
mode: "onBlur",
- context: { subItemsList },
+ context: {subItemsList},
});
- const onSubmit = async (data) => {
- console.log(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 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);
- formData.append("cmms_machine_id", data.cmms_machine_id.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);
- requestServer(CREATE_ROAD_ITEMS, "post", {
- data: formData,
- })
- .then((response) => {
- mutate();
- setOpen(false);
- })
- .catch((error) => {});
- };
return (
{
backgroundColor: "#efefef",
}}
>
- } label="انتخاب آیتم" />
- } label="انتخاب موضوع مشاهده شده" />
- } label="اطلاعات فعالیت" />
+ } label="انتخاب آیتم"/>
+ } label="انتخاب موضوع مشاهده شده"/>
+ } label="اطلاعات فعالیت"/>
-
-
+
+
{
-
+
: }
+ startIcon={tabState === 0 ? : }
>
{tabState === 0 ? "بستن" : "مرحله قبل"}
@@ -213,7 +199,7 @@ const CreateFormContent = ({ setOpen, mutate, rowId }) => {
size="large"
disabled={isSubmitting}
type={"submit"}
- endIcon={}
+ endIcon={}
>
{isSubmitting ? "در حال ثبت فعالیت" : "ثبت فعالیت"}
diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
index 54885c1..b763773 100644
--- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
+++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
@@ -8,6 +8,7 @@ import { Controller } from "react-hook-form";
import CarCode from "@/core/components/CarCode";
import RahdarCode from "@/core/components/RahdarCode";
import PreviousStatesInfo from "./PreviousStatesInfo";
+import NumberField from "@/core/components/NumberField";
const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, errors, watch, getValues }) => {
return (
@@ -16,12 +17,14 @@ const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, err
- {
return (
field.onChange(value || null)}
+ carCode={field.value || []}
+ setCarCode={(value) => field.onChange(value || [])}
error={error}
+ multiple={true}
/>
);
}}
- name={"cmms_machine_id"}
+ name={"cmms_machines"}
/>
diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/index.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/index.jsx
index 52c2d42..6a204c3 100644
--- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/index.jsx
+++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/index.jsx
@@ -1,11 +1,40 @@
"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 useRequest from "@/lib/hooks/useRequest";
-const OperatorCreateForm = ({ open, setOpen, mutate, rowId }) => {
+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 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);
+ await requestServer(CREATE_ROAD_ITEMS, "post", {
+ data: formData,
+ })
+ .then((response) => {
+ mutate();
+ setOpen(false);
+ })
+ .catch((error) => {
+ });
+ };
return (
);
};
diff --git a/src/components/dashboard/roadItems/operator/ExcelPrint/index.jsx b/src/components/dashboard/roadItems/operator/ExcelPrint/index.jsx
index 605018e..4cf871f 100644
--- a/src/components/dashboard/roadItems/operator/ExcelPrint/index.jsx
+++ b/src/components/dashboard/roadItems/operator/ExcelPrint/index.jsx
@@ -39,7 +39,7 @@ const PrintExcel = ({ table, filterData }) => {
const filename = `خروجی کارتابل فعالیت روزانه تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
FileSaver.saveAs(response.data, filename);
})
- .catch(() => { })
+ .catch(() => {})
.finally(() => {
setLoading(false);
});
diff --git a/src/components/dashboard/roadItems/operator/OperatorList.jsx b/src/components/dashboard/roadItems/operator/OperatorList.jsx
index aed25de..c5cfaba 100644
--- a/src/components/dashboard/roadItems/operator/OperatorList.jsx
+++ b/src/components/dashboard/roadItems/operator/OperatorList.jsx
@@ -1,16 +1,26 @@
"use client";
-import { useMemo } from "react";
-import { Box, Stack, Typography } from "@mui/material";
+import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency";
import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import Toolbar from "./Toolbar";
import { GET_ROAD_ITEMS_OPERATOR_LIST } from "@/core/utils/routes";
+import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
+import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
+import { Box, Stack, Typography } from "@mui/material";
import moment from "jalali-moment";
+import { useMemo } from "react";
import RowActions from "./RowActions";
-import LocationForm from "./RowActions/LocationForm";
import ImageDialog from "./RowActions/ImageForm";
+import LocationForm from "./RowActions/LocationForm";
import RahdaranDialog from "./RowActions/RahdaranForm";
+import Toolbar from "./Toolbar";
+import DescriptionForm from "./RowActions/DescriptionForm";
+import MachinesCodeDialog from "./RowActions/MachinesCodeForm";
const OperatorList = () => {
+ const statusOptions = [
+ { value: 0, label: "درحال بررسی" },
+ { value: 1, label: "تایید" },
+ { value: 2, label: "عدم تایید" },
+ ];
const columns = useMemo(
() => [
{
@@ -21,24 +31,78 @@ const OperatorList = () => {
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
accessorKey: "item_fa",
header: "آیتم فعالیت",
id: "item_fa",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ ColumnSelectComponent: (props) => {
+ const { itemsList, loadingItemsList, errorItemsList } = useRoadItemGetItems();
+
+ const getColumnSelectOptions = () => {
+ if (loadingItemsList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorItemsList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...itemsList.map((item) => ({
+ value: item.id,
+ label: item.name,
+ })),
+ ];
+ };
+
+ const columnSelectOption = getColumnSelectOptions();
+
+ return ;
+ },
},
{
accessorKey: "sub_item_fa",
- header: "موضوع مشاهده شده", // Observed Subject
+ header: "موضوع مشاهده شده",
id: "sub_item_fa",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ dependencyId: "item_fa",
+ ColumnSelectComponent: (props) => {
+ const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(
+ props.dependencyFieldValue.value
+ );
+
+ const getColumnSelectOptions = () => {
+ if (props.dependencyFieldValue.value === "") {
+ return [{ value: "empty", label: "ابتدا آیتم فعالیت را انتخاب کنید" }];
+ }
+ if (loadingSubItemsList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorSubItemsList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...subItemsList.map((item) => ({
+ value: item.id,
+ label: item.name,
+ })),
+ ];
+ };
+
+ const columnSelectOption = getColumnSelectOptions();
+
+ return ;
+ },
},
{
accessorKey: "value",
@@ -48,11 +112,17 @@ const OperatorList = () => {
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 120,
Cell: ({ renderedCellValue, row }) => {
return (
-
- {row.original.sub_item_data}
- {`(${row.original.unit_fa})`}
+
+
+ {(row.original.sub_item_data / 1).toLocaleString()}
+
+
+ {`(${row.original.unit_fa})`}
+
);
},
@@ -64,6 +134,8 @@ const OperatorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -95,6 +167,8 @@ const OperatorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -118,14 +192,35 @@ const OperatorList = () => {
},
},
{
- accessorKey: "cmms_machine_code",
+ accessorKey: "cmms_machines",
header: "کد خودرو", // Car ID
- id: "cmms_machine_code",
+ id: "cmmsMachines__machine_code",
enableColumnFilter: true,
datatype: "text",
- filterMode: "equals",
+ filterMode: "contains",
enableSorting: 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 کد خودرویی وجود ندارد;
+ },
},
{
accessorKey: "rahdaran",
@@ -134,6 +229,8 @@ const OperatorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -162,6 +259,8 @@ const OperatorList = () => {
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
accessorFn: (row) => moment(row.activity_date_time).locale("fa").format("HH:mm | yyyy/MM/DD"),
@@ -171,25 +270,53 @@ const OperatorList = () => {
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
- accessorKey: "status_fa",
+ accessorKey: "status",
header: "وضعیت", // Status
- id: "status_fa",
+ id: "status",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
sortDescFirst: true,
- columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ columnSelectOption: () => {
+ return statusOptions.map((status) => ({
+ value: status.value,
+ label: status.label,
+ }));
+ },
+ Cell: ({ renderedCellValue, row }) => <>{row.original.status_fa},
},
{
accessorKey: "supervisor_description",
- header: "توضیحات", // Description
+ header: "توضیحات کارشناس", // Description
id: "supervisor_description",
enableColumnFilter: false,
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 70,
+ muiTableBodyCellProps: {
+ sx: {
+ borderLeft: "1px solid #e1e1e1",
+ py: 0,
+ "&:first-of-type": {
+ borderLeft: "unset",
+ },
+ },
+ },
+ Cell: ({ renderedCellValue }) => {
+ return (
+
+
+
+ );
+ },
},
],
[]
@@ -202,7 +329,7 @@ const OperatorList = () => {
need_filter={true}
columns={columns}
sorting={[
- { id: "status_fa", desc: true },
+ { id: "status", desc: true },
{ id: "id", desc: true },
]}
table_url={GET_ROAD_ITEMS_OPERATOR_LIST}
diff --git a/src/components/dashboard/roadItems/operator/RowActions/DescriptionForm/index.jsx b/src/components/dashboard/roadItems/operator/RowActions/DescriptionForm/index.jsx
new file mode 100644
index 0000000..3f748c9
--- /dev/null
+++ b/src/components/dashboard/roadItems/operator/RowActions/DescriptionForm/index.jsx
@@ -0,0 +1,51 @@
+import { Dialog, DialogContent, DialogTitle, IconButton, Tooltip, Typography, Card, CardContent } from "@mui/material";
+import { useState } from "react";
+import RemoveRedEyeIcon from "@mui/icons-material/RemoveRedEye";
+import CloseIcon from "@mui/icons-material/Close";
+
+const DescriptionForm = ({ description }) => {
+ const [openOfficerDescriptionDialog, setOpenOfficerDescriptionDialog] = useState(false);
+
+ return (
+ <>
+
+ setOpenOfficerDescriptionDialog(true)}>
+
+
+
+
+
+ );
+};
+
+export default DescriptionForm;
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
new file mode 100644
index 0000000..423bb00
--- /dev/null
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
@@ -0,0 +1,29 @@
+import { LinearProgress, Typography } from "@mui/material";
+import EditFormContent from "./EditFormContent";
+import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
+
+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);
+
+ return (
+ <>
+ {errorSubItemsList ? (
+
+ خطا در دریافت اطلاعات!!!
+
+ ) : loadingSubItemsList ? (
+
+ ) : (
+
+ )}
+
+ );
+};
+export default EditController;
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
index 460d64d..92f7432 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
@@ -12,10 +12,11 @@ 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";
const validationSchema = object({
amount: string().required("وارد کردن مقدار الزامیست!"),
- cmms_machine_id: object().required("وارد کردن کد خودرو الزامیست!"),
+ cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"),
before_image: mixed()
.nullable()
@@ -59,7 +60,7 @@ const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) =>
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_machine_id: row.original.cmms_machine,
+ cmms_machines: row.original.cmms_machines || null,
rahdaran_id: row.original.rahdaran || null,
};
const requestServer = useRequest();
@@ -91,12 +92,12 @@ const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) =>
data.after_image !== defaultValues.after_image &&
formData.append("after_image", data.after_image);
formData.append("amount", data.amount);
- formData.append("cmms_machine_id", data.cmms_machine_id.id);
+ 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);
- requestServer(`${UPDATE_ROAD_ITEMS}/${rowId}`, "post", {
+ await requestServer(`${UPDATE_ROAD_ITEMS}/${rowId}`, "post", {
notificationSuccess: true,
data: formData,
})
@@ -104,8 +105,9 @@ const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) =>
mutate();
setOpenEditDialog(false);
})
- .catch((err) => { });
+ .catch((err) => {});
};
+
return (
<>
@@ -124,11 +126,14 @@ const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) =>
) : null}
-
setValue("amount", watch("amount"));
}
}}
- error={!!errors.amount}
helperText={errors.amount ? errors.amount.message : null}
variant="outlined"
fullWidth
@@ -153,14 +157,15 @@ const EditFormContent = ({ row, mutate, setOpenEditDialog, rowId, subItem }) =>
render={({ field, fieldState: { error } }) => {
return (
field.onChange(value || "")}
- inputValueDefault={row.original.cmms_machine_code}
+ carCode={field.value || []}
+ setCarCode={(value) => field.onChange(value || [])}
+ inputValueDefault={row.original.cmms_machines}
+ multiple={true}
error={error} // اگر خطا وجود داشته باشد
/>
);
}}
- name={"cmms_machine_id"}
+ name={"cmms_machines"}
/>
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/index.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/index.jsx
index 92652e9..888e166 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/index.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/index.jsx
@@ -1,13 +1,11 @@
-import { Dialog, DialogTitle, IconButton, LinearProgress, Tooltip, Typography } from "@mui/material";
+import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material";
import { useState } from "react";
import BorderColorIcon from "@mui/icons-material/BorderColor";
-import EditFormContent from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent";
-import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
+import EditController from "./EditController";
const EditForm = ({ row, mutate, rowId }) => {
const [openEditDialog, setOpenEditDialog] = useState(false);
- const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(row.original?.item);
- const subItem = subItemsList.find((subItem) => subItem.sub_item === row.original?.sub_item);
+
return (
<>
@@ -32,21 +30,7 @@ const EditForm = ({ row, mutate, rowId }) => {
}}
>
ویرایش اطلاعات
- {errorSubItemsList ? (
-
- خطا در دریافت اطلاعات!!!
-
- ) : loadingSubItemsList ? (
-
- ) : (
-
- )}
+
);
diff --git a/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/MachinesCodeContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/MachinesCodeContent.jsx
new file mode 100644
index 0000000..1eef774
--- /dev/null
+++ b/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/MachinesCodeContent.jsx
@@ -0,0 +1,55 @@
+import { DialogContent, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material";
+import ShowPlak from "@/core/components/ShowPlak";
+
+const MachinesCodeContent = ({ machinesLists }) => {
+ return (
+ <>
+
+
+
+
+
+
+ کد ماشین
+ نام خودرو
+ پلاک
+
+
+
+ {machinesLists.map((machine) => {
+ return (
+
+ {machine.machine_code}
+ {machine.car_name}
+
+ {machine.plak_number ? (
+
+ ) : null}
+
+
+ );
+ })}
+
+
+
+
+
+
+ );
+};
+export default MachinesCodeContent;
diff --git a/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/index.jsx b/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/index.jsx
new file mode 100644
index 0000000..d8e8754
--- /dev/null
+++ b/src/components/dashboard/roadItems/operator/RowActions/MachinesCodeForm/index.jsx
@@ -0,0 +1,43 @@
+import { Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import DirectionsCarIcon from "@mui/icons-material/DirectionsCar";
+import { useState } from "react";
+import MachinesCodeContent from "./MachinesCodeContent";
+
+const MachinesCodeDialog = ({ machinesLists }) => {
+ const [openMachinesCodeDialog, setOpenMachinesCodeDialog] = useState(false);
+ return (
+ <>
+
+ setOpenMachinesCodeDialog(true)}>
+
+
+
+
+
+ );
+};
+export default MachinesCodeDialog;
diff --git a/src/components/dashboard/roadItems/supervisor/RowActions/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/roadItems/supervisor/RowActions/ConfirmForm/ConfirmContent.jsx
index f4be809..ebc2556 100644
--- a/src/components/dashboard/roadItems/supervisor/RowActions/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/roadItems/supervisor/RowActions/ConfirmForm/ConfirmContent.jsx
@@ -28,7 +28,7 @@ const ConfirmContent = ({ rowId, mutate, setOpenConfirmDialog }) => {
mutate();
setOpenConfirmDialog(false);
})
- .catch(() => { });
+ .catch(() => {});
};
return (
diff --git a/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/MachinesCodeContent.jsx b/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/MachinesCodeContent.jsx
new file mode 100644
index 0000000..1eef774
--- /dev/null
+++ b/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/MachinesCodeContent.jsx
@@ -0,0 +1,55 @@
+import { DialogContent, Paper, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material";
+import ShowPlak from "@/core/components/ShowPlak";
+
+const MachinesCodeContent = ({ machinesLists }) => {
+ return (
+ <>
+
+
+
+
+
+
+ کد ماشین
+ نام خودرو
+ پلاک
+
+
+
+ {machinesLists.map((machine) => {
+ return (
+
+ {machine.machine_code}
+ {machine.car_name}
+
+ {machine.plak_number ? (
+
+ ) : null}
+
+
+ );
+ })}
+
+
+
+
+
+
+ );
+};
+export default MachinesCodeContent;
diff --git a/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/index.jsx b/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/index.jsx
new file mode 100644
index 0000000..d8e8754
--- /dev/null
+++ b/src/components/dashboard/roadItems/supervisor/RowActions/MachinesCodeForm/index.jsx
@@ -0,0 +1,43 @@
+import { Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip } from "@mui/material";
+import DirectionsCarIcon from "@mui/icons-material/DirectionsCar";
+import { useState } from "react";
+import MachinesCodeContent from "./MachinesCodeContent";
+
+const MachinesCodeDialog = ({ machinesLists }) => {
+ const [openMachinesCodeDialog, setOpenMachinesCodeDialog] = useState(false);
+ return (
+ <>
+
+ setOpenMachinesCodeDialog(true)}>
+
+
+
+
+
+ );
+};
+export default MachinesCodeDialog;
diff --git a/src/components/dashboard/roadItems/supervisor/RowActions/RejectForm/RejectContent.jsx b/src/components/dashboard/roadItems/supervisor/RowActions/RejectForm/RejectContent.jsx
index 81cc311..5fc6794 100644
--- a/src/components/dashboard/roadItems/supervisor/RowActions/RejectForm/RejectContent.jsx
+++ b/src/components/dashboard/roadItems/supervisor/RowActions/RejectForm/RejectContent.jsx
@@ -36,7 +36,7 @@ const RejectContent = ({ rowId, mutate, setOpenRejectDialog }) => {
mutate();
setOpenRejectDialog(false);
})
- .catch(() => { })
+ .catch(() => {})
.finally(() => {
reset();
});
diff --git a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx
index 1166ed6..4f3420b 100644
--- a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx
+++ b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx
@@ -8,8 +8,19 @@ import RowActions from "./RowActions";
import LocationForm from "./RowActions/LocationForm";
import ImageDialog from "./RowActions/ImageForm";
import RahdaranDialog from "./RowActions/RahdaranForm";
+import CustomSelectByDependency from "@/core/components/DataTable/filter/fieldsType/CustomSelectByDependency";
+import useProvinces from "@/lib/hooks/useProvince";
+import useRoadItemGetItems from "@/lib/hooks/useRoadItemGetItems";
+import useRoadItemGetSubItems from "@/lib/hooks/useRoadItemGetISubtems";
+import useEdaratLists from "@/lib/hooks/useEdaratLists";
+import MachinesCodeDialog from "./RowActions/MachinesCodeForm";
const SupervisorList = () => {
+ const statusOptions = [
+ { value: 0, label: "درحال بررسی" },
+ { value: 1, label: "تایید" },
+ { value: 2, label: "عدم تایید" },
+ ];
const columns = useMemo(
() => [
{
@@ -21,42 +32,141 @@ const SupervisorList = () => {
filterMode: "equals",
sortDescFirst: false,
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
- accessorKey: "province_fa",
+ accessorKey: "province_id",
header: "استان", // Province
- id: "province_fa",
+ id: "province_id",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 130,
+ ColumnSelectComponent: (props) => {
+ const { provinces, errorProvinces, loadingProvinces } = useProvinces();
+ const getColumnSelectOptions = () => {
+ if (loadingProvinces) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorProvinces) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...provinces.map((province) => ({
+ value: province.id,
+ label: province.name_fa,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
+ },
+ Cell: ({ renderedCellValue, row }) => <>{row.original.province_fa},
},
{
- accessorKey: "edarat_name",
+ accessorKey: "edarat_id",
header: "اداره", // Office
- id: "edarat_name",
+ id: "edarat_id",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ dependencyId: "province_id",
+ grow: false,
+ size: 120,
+ ColumnSelectComponent: (props) => {
+ const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists(
+ props.dependencyFieldValue.value
+ );
+
+ const getColumnSelectOptions = () => {
+ if (props.dependencyFieldValue.value === "") {
+ return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }];
+ }
+ if (loadingEdaratList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorEdaratList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...edaratList.map((edare) => ({
+ value: edare.id,
+ label: edare.name_fa,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
+ },
+ Cell: ({ renderedCellValue, row }) => <>{row.original.edarat_name},
},
{
accessorKey: "item_fa",
header: "آیتم فعالیت",
id: "item_fa",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ ColumnSelectComponent: (props) => {
+ const { itemsList, loadingItemsList, errorItemsList } = useRoadItemGetItems();
+ const getColumnSelectOptions = () => {
+ if (loadingItemsList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorItemsList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...itemsList.map((item) => ({
+ value: item.id,
+ label: item.name,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
+ },
},
{
accessorKey: "sub_item_fa",
- header: "موضوع مشاهده شده", // Observed Subject
+ header: "موضوع مشاهده شده",
id: "sub_item_fa",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ dependencyId: "item_fa",
+ ColumnSelectComponent: (props) => {
+ const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetSubItems(
+ props.dependencyFieldValue.value
+ );
+ const getColumnSelectOptions = () => {
+ if (props.dependencyFieldValue.value === "") {
+ return [{ value: "empty", label: "ابتدا آیتم فعالیت را انتخاب کنید" }];
+ }
+ if (loadingSubItemsList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorSubItemsList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...subItemsList.map((item) => ({
+ value: item.id,
+ label: item.name,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
+ },
},
{
accessorKey: "value",
@@ -65,12 +175,18 @@ const SupervisorList = () => {
enableColumnFilter: false,
datatype: "text",
filterMode: "equals",
+ grow: false,
+ size: 120,
columnFilterModeOptions: ["equals", "contains"],
Cell: ({ renderedCellValue, row }) => {
return (
-
- {row.original.sub_item_data}
- {`(${row.original.unit_fa})`}
+
+
+ {(row.original.sub_item_data / 1).toLocaleString()}
+
+
+ {`(${row.original.unit_fa})`}
+
);
},
@@ -82,6 +198,8 @@ const SupervisorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -113,6 +231,8 @@ const SupervisorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -136,14 +256,35 @@ const SupervisorList = () => {
},
},
{
- accessorKey: "cmms_machine_code",
+ accessorKey: "cmms_machines",
header: "کد خودرو", // Car ID
- id: "cmms_machine_code",
+ id: "cmmsMachines__machine_code",
enableColumnFilter: true,
datatype: "text",
- filterMode: "equals",
+ filterMode: "contains",
enableSorting: 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 کد خودرویی وجود ندارد;
+ },
},
{
accessorKey: "rahdaran",
@@ -152,6 +293,8 @@ const SupervisorList = () => {
enableColumnFilter: false,
enableSorting: false,
datatype: "array",
+ grow: false,
+ size: 100,
muiTableBodyCellProps: {
sx: {
borderLeft: "1px solid #e1e1e1",
@@ -180,6 +323,8 @@ const SupervisorList = () => {
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
accessorFn: (row) => moment(row.activity_date_time).locale("fa").format("HH:mm | yyyy/MM/DD"),
@@ -189,25 +334,26 @@ const SupervisorList = () => {
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
- accessorKey: "status_fa",
+ accessorKey: "status",
header: "وضعیت", // Status
- id: "status_fa",
+ id: "status",
enableColumnFilter: true,
- datatype: "text",
+ datatype: "numeric",
filterMode: "equals",
sortDescFirst: true,
- columnFilterModeOptions: ["equals", "contains"],
- },
- {
- accessorKey: "supervisor_description",
- header: "توضیحات", // Description
- id: "supervisor_description",
- enableColumnFilter: false,
- datatype: "text",
- filterMode: "equals",
- columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
+ columnSelectOption: () => {
+ return statusOptions.map((status) => ({
+ value: status.value,
+ label: status.label,
+ }));
+ },
+ Cell: ({ renderedCellValue, row }) => <>{row.original.status_fa},
},
],
[]
@@ -220,7 +366,7 @@ const SupervisorList = () => {
need_filter={true}
columns={columns}
sorting={[
- { id: "status_fa", desc: false },
+ { id: "status", desc: false },
{ id: "id", desc: true },
]}
table_url={GET_ROAD_ITEMS_SUPERVISOR_LIST}
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx
new file mode 100644
index 0000000..1fe7e02
--- /dev/null
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionInfo.jsx
@@ -0,0 +1,71 @@
+"use client";
+
+import React from "react";
+import dynamic from "next/dynamic";
+import MapLoading from "@/core/components/MapLayer/Loading";
+import {
+ Box,
+ Card,
+ CardActions,
+ CardContent,
+ CardHeader,
+ Chip,
+ Divider,
+ IconButton,
+ Stack,
+ Typography
+} from "@mui/material";
+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';
+
+const MapLayer = dynamic(() => import("@/core/components/MapLayer"), {
+ loading: () => ,
+ ssr: false,
+});
+
+const ActionInfo = ({action, deleteAction}) => {
+ console.log("action", action)
+ return (
+
+
+ }
+ title={"متن تست"}
+ subheader={"ساب آیتم تست"}
+ />
+
+
+
+ }/>
+
+
+ {moment(action.start_date).locale("fa").format("YYYY/MM/DD")}
+
+
+
+ }/>
+
+
+ {action.action_date}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default ActionInfo;
\ No newline at end of file
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx
new file mode 100644
index 0000000..2d539c5
--- /dev/null
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ActionsDurigPatrol.jsx
@@ -0,0 +1,58 @@
+"use client";
+
+import {Box, Button, Divider, Grid, Typography} from "@mui/material";
+import AddCircleIcon from '@mui/icons-material/AddCircle';
+import React, {useState} from "react";
+import ModalActionsDuringPatrol from "./ModalActionsDuringPatrol";
+import ActionInfo from "./ActionInfo";
+
+const ActionsDuringPatrol = ({tabState, setTabState}) => {
+ const [ActionsList, setActionsList] = useState([]);
+ const [open, setOpen] = useState(false);
+ const handleOpen = () => {
+ setOpen(true);
+ };
+
+ const deleteAction = (indexToRemove) => {
+ setActionsList((prev) => prev.filter((_, index) => index !== indexToRemove));
+ };
+
+ return (
+
+
+ لیست اقدامات حین گشت
+
+
+
+
+ {ActionsList.length !== 0 ?
+
+ {ActionsList.map((action, index) => (
+
+ deleteAction(index)}
+ />
+
+ ))}
+
+ :
+
+
+ فعالیتی ثبت نکرده اید
+
+
+ }
+
+ );
+};
+
+export default ActionsDuringPatrol;
\ No newline at end of file
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ModalActionsDuringPatrol.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ModalActionsDuringPatrol.jsx
new file mode 100644
index 0000000..4482a60
--- /dev/null
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/ModalActionsDuringPatrol.jsx
@@ -0,0 +1,17 @@
+import CreateFormContent from "@/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent";
+import {Dialog} from "@mui/material";
+
+const ModalActionsDuringPatrol = ({open, setOpen, setActionsList}) => {
+
+ const HandleSubmit = async (data) => {
+ setActionsList((prev) => [...prev, data]);
+ setOpen(false);
+ }
+
+ return (
+
+ );
+}
+export default ModalActionsDuringPatrol;
\ No newline at end of file
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetail.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetail.jsx
index aa74c7b..d8cfee6 100644
--- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetail.jsx
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolDetail.jsx
@@ -4,6 +4,7 @@ import {
Box,
Button,
Card,
+ CardActions,
CardContent,
Chip,
Divider,
@@ -243,6 +244,18 @@ const PatrolDetail = ({tabState, setTabState}) => {
+
+
+
+
+
+
:
@@ -250,16 +263,6 @@ const PatrolDetail = ({tabState, setTabState}) => {
ابتدا اطلاعات بالا را تکمیل نمایید
}
-
-
-
-
);
};
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx
index e87151b..b8f681e 100644
--- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/PatrolForms.jsx
@@ -11,7 +11,8 @@ import VerifiedIcon from '@mui/icons-material/Verified';
import PatrolTimeLine from "./PatrolTimeLine";
import PhoneValidation from "./PhoneValidation";
import PatrolDetail from "./PatrolDetail";
-import SuperVisorsDetail from "@/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail";
+import SuperVisorsDetail from "./SuperVisorsDetail";
+import ActionsDuringPatrol from "./ActionsDurigPatrol";
function TabPanel(props) {
const {children, value, index} = props;
@@ -72,7 +73,7 @@ const PatrolForms = () => {
- <>eghdamat heine gasht
+
<>taiidie
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorInfo.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorInfo.jsx
new file mode 100644
index 0000000..cfa7090
--- /dev/null
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorInfo.jsx
@@ -0,0 +1,30 @@
+"use client";
+
+import {Box, Card, IconButton, Stack, Typography} from "@mui/material";
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import DeleteIcon from '@mui/icons-material/Delete';
+import React from "react";
+
+const SuperVisorInfo = ({superVisor, deleteSuperVisor}) => {
+ return (
+
+
+
+
+ {superVisor.name}
+ کد راهدار: {superVisor.code}
+
+
+
+ deleteSuperVisor(superVisor.id)}>
+
+
+ );
+};
+
+export default SuperVisorInfo;
\ No newline at end of file
diff --git a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx
index 070bdcf..cf53f07 100644
--- a/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx
+++ b/src/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorsDetail.jsx
@@ -1,21 +1,32 @@
"use client";
-import {Box, Button, Card, Chip, Divider, IconButton, TextField, Typography} from "@mui/material";
+import {Box, Button, Chip, Divider, Grid, Typography} from "@mui/material";
import SaveAltIcon from '@mui/icons-material/SaveAlt';
-import AccountCircleIcon from '@mui/icons-material/AccountCircle';
-import DeleteIcon from '@mui/icons-material/Delete';
-import React, {useState} from "react";
+import React, {useEffect, useState} from "react";
+import RahdarCode from "@/core/components/RahdarCode";
+import SuperVisorInfo from "@/components/dashboard/roadPatrols/operator/Forms/CreatePatrol/SuperVisorInfo";
+import KeyboardDoubleArrowRightIcon from "@mui/icons-material/KeyboardDoubleArrowRight";
+import KeyboardDoubleArrowLeftIcon from "@mui/icons-material/KeyboardDoubleArrowLeft";
const SuperVisorsDetail = ({tabState, setTabState}) => {
- const [patrolFounded, setPatrolFounded] = useState(false);
+ const [SuperVisorList, setSuperVisorList] = useState([]);
const [rahdarsCode, setRahdarsCode] = useState(null);
const [readyToRequest, setReadyToRequest] = useState(false);
const requestPatrolInfo = () => {
- setPatrolFounded(true)
- setReadyToRequest(false)
+ setSuperVisorList((prev) => [...prev, rahdarsCode]);
+ setReadyToRequest(false);
+ setRahdarsCode(null);
}
+ const deleteSuperVisor = (id) => {
+ setSuperVisorList((prev) => prev.filter((superVisor) => superVisor.id !== id));
+ };
+
+ useEffect(() => {
+ setReadyToRequest(rahdarsCode != null);
+ }, [rahdarsCode]);
+
return (
{
my: 3
}}
>
-
-
- {/**/}
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
- محمد حسین
- کد راهدار: 893
-
+ {SuperVisorList.length !== 0 ? (
+ <>
+
+ {SuperVisorList.map((superVisor) => (
+
+
+
+ ))}
+
+
+
+
-
-
-
-
-
-
-
-
- حسین تقی
- کد راهدار: 123
-
-
-
-
-
-
-
+
+ ) : (
+
+
+ ابتدا اطلاعات بالا را تکمیل نمایید
+
+
+ )}
);
};
-export default SuperVisorsDetail;
\ No newline at end of file
+export default SuperVisorsDetail;
diff --git a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
index 05f083b..a68bdcc 100644
--- a/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
+++ b/src/components/dashboard/roadPatrols/operator/OperatorList.jsx
@@ -18,6 +18,8 @@ const OperatorList = () => {
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
accessorKey: "operator_name",
@@ -29,9 +31,9 @@ const OperatorList = () => {
columnFilterModeOptions: ["equals", "contains"],
},
{
- accessorKey: "phone_number",
+ accessorKey: "officer_phone_number",
header: "تلفن همراه",
- id: "phone_number",
+ id: "officer_phone_number",
enableColumnFilter: true,
datatype: "text",
filterMode: "equals",
@@ -47,46 +49,37 @@ const OperatorList = () => {
columnFilterModeOptions: ["equals", "contains"],
},
{
- accessorKey: "start_date",
+ accessorFn: (row) => moment(row.start_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ شروع",
id: "start_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
{
- accessorKey: "end_date",
+ accessorFn: (row) => moment(row.end_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ پایان",
id: "end_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
{
- accessorKey: "register_date",
+ accessorFn: (row) => moment(row.register_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ ثبت",
id: "register_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
],
[]
@@ -99,6 +92,7 @@ const OperatorList = () => {
table_title={"عملیات"}
need_filter={true}
columns={columns}
+ sorting={[{ id: "id", desc: true }]}
table_url={GET_ROAD_PATROL_OPERATOR_LIST}
page_name={"operator"}
table_name={"operatorList"}
diff --git a/src/components/dashboard/roadPatrols/operator/RowActions/ReportForm/index.jsx b/src/components/dashboard/roadPatrols/operator/RowActions/ReportForm/index.jsx
index 38c98f2..8abb152 100644
--- a/src/components/dashboard/roadPatrols/operator/RowActions/ReportForm/index.jsx
+++ b/src/components/dashboard/roadPatrols/operator/RowActions/ReportForm/index.jsx
@@ -2,7 +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/97314"; // TODO replace id here
+ const reportUrl = "https://rms.rmto.ir/v2/road_patrols/operator/report/96872"; // TODO replace id here
return (
diff --git a/src/components/dashboard/roadPatrols/supervisor/RowActions/ReportForm/index.jsx b/src/components/dashboard/roadPatrols/supervisor/RowActions/ReportForm/index.jsx
index ec373f6..8abb152 100644
--- a/src/components/dashboard/roadPatrols/supervisor/RowActions/ReportForm/index.jsx
+++ b/src/components/dashboard/roadPatrols/supervisor/RowActions/ReportForm/index.jsx
@@ -2,7 +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/541938"; // TODO replace id here
+ const reportUrl = "https://rms.rmto.ir/v2/road_patrols/operator/report/96872"; // TODO replace id here
return (
diff --git a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
index a5e15f4..5d71669 100644
--- a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
+++ b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx
@@ -7,10 +7,11 @@ 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";
const OperatorList = () => {
- const { provinces, errorProvinces, loadingProvinces } = useProvinces();
- const citiesListApi = "https://rms.rmto.ir/public/contents/edarate_shahri_by_province";
const columns = useMemo(
() => [
{
@@ -21,44 +22,74 @@ const OperatorList = () => {
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
+ grow: false,
+ size: 100,
},
{
- accessorKey: "province",
+ accessorKey: "province_id",
header: "استان",
- id: "province",
+ id: "province_id",
enableColumnFilter: true,
datatype: "numeric",
filterMode: "equals",
- columnSelectOption: () => {
- if (loadingProvinces) {
- return [{ value: "", label: "در حال بارگذاری..." }];
- }
-
- if (errorProvinces) {
- return [{ value: "", label: "خطا در بارگذاری" }];
- }
-
- return provinces.map((province) => ({
- value: province.id,
- label: province.name_fa,
- }));
+ ColumnSelectComponent: (props) => {
+ const { provinces, errorProvinces, loadingProvinces } = useProvinces();
+ const getColumnSelectOptions = () => {
+ if (loadingProvinces) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorProvinces) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...provinces.map((province) => ({
+ value: province.id,
+ label: province.name_fa,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
},
+ Cell: ({ renderedCellValue, row }) => <>{row.original.province_fa},
},
{
- accessorKey: "office",
+ accessorKey: "edare_id",
header: "اداره",
- id: "office",
+ id: "edare_id",
enableColumnFilter: true,
datatype: "numeric",
filterMode: "equals",
- dependencyId: "province",
- columnSelectOption: (dependencyField) => {
- if (dependencyField.value === "") {
- return [{ value: "", label: "ابتدا استان را انتخاب کنید" }];
- }
-
- return [{ value: dependencyField.value, label: dependencyField.value }];
+ dependencyId: "province_id",
+ grow: false,
+ size: 120,
+ ColumnSelectComponent: (props) => {
+ const { edaratList, loadingEdaratList, errorEdaratList } = useEdaratLists(
+ props.dependencyFieldValue.value
+ );
+ const getColumnSelectOptions = () => {
+ if (props.dependencyFieldValue.value === "") {
+ return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }];
+ }
+ if (loadingEdaratList) {
+ return [{ value: "loading", label: "در حال بارگذاری..." }];
+ }
+ if (errorEdaratList) {
+ return [{ value: "error", label: "خطا در بارگذاری" }];
+ }
+ return [
+ { value: "", label: props.column.header },
+ ...edaratList.map((edare) => ({
+ value: edare.id,
+ label: edare.name_fa,
+ })),
+ ];
+ };
+ const columnSelectOption = getColumnSelectOptions();
+ return ;
},
+ Cell: ({ renderedCellValue, row }) => <>{row.original.edare_name},
},
{
accessorKey: "operator_name",
@@ -70,9 +101,9 @@ const OperatorList = () => {
columnFilterModeOptions: ["equals", "contains"],
},
{
- accessorKey: "phone_number",
+ accessorKey: "officer_phone_number",
header: "تلفن همراه",
- id: "phone_number",
+ id: "officer_phone_number",
enableColumnFilter: true,
datatype: "text",
filterMode: "equals",
@@ -88,49 +119,40 @@ const OperatorList = () => {
columnFilterModeOptions: ["equals", "contains"],
},
{
- accessorKey: "start_date",
+ accessorFn: (row) => moment(row.start_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ شروع",
id: "start_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
{
- accessorKey: "end_date",
+ accessorFn: (row) => moment(row.end_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ پایان",
id: "end_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
{
- accessorKey: "register_date",
+ accessorFn: (row) => moment(row.register_date).locale("fa").format("HH:mm | yyyy/MM/DD"),
header: "تاریخ ثبت",
id: "register_date",
enableColumnFilter: true,
datatype: "date",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
- Cell: ({ renderedCellValue }) => (
-
- {renderedCellValue ? moment(renderedCellValue).locale("fa").format("YYYY/MM/DD") : "-"}
-
- ),
+ grow: false,
+ size: 100,
},
],
- [provinces]
+ []
);
return (
@@ -140,6 +162,7 @@ const OperatorList = () => {
table_title={"ارزیابی"}
need_filter={true}
columns={columns}
+ sorting={[{ id: "id", desc: true }]}
table_url={GET_ROAD_PATROL_SUPERVISOR_LIST}
page_name={"supervisor"}
table_name={"supervisorList"}
diff --git a/src/core/components/CarCode.jsx b/src/core/components/CarCode.jsx
index 32a4c20..e765d24 100644
--- a/src/core/components/CarCode.jsx
+++ b/src/core/components/CarCode.jsx
@@ -4,11 +4,12 @@ import useRequest from "@/lib/hooks/useRequest";
import { debounce } from "@mui/material/utils";
import { GET_CAR_LIST_SEARCH } from "@/core/utils/routes";
-const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error }) => {
+const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error, multiple = false }) => {
const [inputValue, setInputValue] = useState(inputValueDefault);
const [options, setOptions] = useState([]);
const [loading, setLoading] = useState(false);
const requestServer = useRequest();
+
const fetchCarCodes = (inputValue, controller) => {
const debouncer = debounce((query) => {
if (!query || query?.length < 3) {
@@ -40,20 +41,32 @@ const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error }) => {
return (
{
- setCarCode(newValue || null); // Set an empty string if no value is selected
+ setCarCode(multiple ? newValue || [] : newValue || null);
}}
inputValue={inputValue}
onInputChange={(event, newInputValue) => {
setInputValue(newInputValue || ""); // Prevent inputValue from being null or undefined
}}
options={options}
- getOptionLabel={(option) => (typeof option === "string" ? option : option.machine_code)}
+ getOptionLabel={(option) => {
+ if (typeof option === "string") return option;
+ const { machine_code, car_name, plak_number } = option;
+ let label = `${machine_code || ""}`;
+ if (car_name) {
+ label += ` | ${car_name}`;
+ }
+ if (plak_number) {
+ label += ` | ${plak_number}`;
+ }
+ return label;
+ }}
isOptionEqualToValue={(option, value) => {
- if (!value) return false; // Handle null/undefined values
- if (value === "") return option.machine_code === ""; // Handle empty string case
+ if (!value) return false;
+ if (value === "") return option.machine_code === "";
return option.machine_code === (value?.machine_code || value);
}}
loading={loading}
@@ -65,8 +78,8 @@ const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error }) => {
{...params}
label="کد خودرو"
fullWidth
- error={!!error} // نمایش خطا
- helperText={error?.message} // پیام خطا
+ error={!!error}
+ helperText={error?.message}
InputProps={{
...params.InputProps,
endAdornment: (
diff --git a/src/core/components/DataTable/Main.js b/src/core/components/DataTable/Main.js
index c6d82d5..14d8788 100644
--- a/src/core/components/DataTable/Main.js
+++ b/src/core/components/DataTable/Main.js
@@ -42,8 +42,9 @@ const DataTable_Main = (props) => {
const filteredFilterData = Object.values(filterData)
.filter((filter) => !isValueEmpty(filter.value))
- .map(({ filterMode, ...rest }) => ({
+ .map(({ filterMode, id, ...rest }) => ({
...rest,
+ id: id.replace(/__/g, "."),
fn: filterMode,
}));
diff --git a/src/core/components/DataTable/filter/FilterBodyController.jsx b/src/core/components/DataTable/filter/FilterBodyController.jsx
index df3ba62..c3f70ad 100644
--- a/src/core/components/DataTable/filter/FilterBodyController.jsx
+++ b/src/core/components/DataTable/filter/FilterBodyController.jsx
@@ -2,7 +2,7 @@ import { Controller, useWatch } from "react-hook-form";
import FilterBodyField from "./FilterBodyField";
const FilterBodyController = ({ column, control, reset, errors }) => {
- const dependencyField = useWatch({ control, name: column?.dependencyId });
+ const dependencyField = useWatch({ control, name: column.dependencyId });
return (
{
filterParameters={value}
handleChange={onChange}
handleBlur={onBlur}
- dependencyFieldValue={dependencyField || null}
+ dependencyFieldValue={column.dependencyId ? dependencyField : null}
resetForm={() => reset()}
errors={errors}
/>
diff --git a/src/core/components/DataTable/filter/FilterBodyField.jsx b/src/core/components/DataTable/filter/FilterBodyField.jsx
index 4783f13..869c354 100644
--- a/src/core/components/DataTable/filter/FilterBodyField.jsx
+++ b/src/core/components/DataTable/filter/FilterBodyField.jsx
@@ -54,10 +54,13 @@ function FilterBodyField({
return ;
}
if (filterParameters.filterMode === "equals") {
- return ;
+ return column.ColumnSelectComponent ? (
+
+ ) : (
+
+ );
}
break;
-
case "date":
if (filterParameters.filterMode === "equals") {
return ;
diff --git a/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
new file mode 100644
index 0000000..5658bdd
--- /dev/null
+++ b/src/core/components/DataTable/filter/fieldsType/CustomSelectByDependency.jsx
@@ -0,0 +1,53 @@
+"use client";
+
+import { FormControl, FormHelperText, InputLabel, MenuItem, OutlinedInput, Select, Typography } from "@mui/material";
+import { useCallback, useEffect } from "react";
+
+function CustomSelectByDependency({
+ column,
+ filterParameters,
+ defaultFilterTranslation,
+ handleChange,
+ columnSelectOption,
+}) {
+ const isValidValue = columnSelectOption.some((option) => option.value === filterParameters.value);
+
+ const handleInvalidValue = useCallback(() => {
+ if (!isValidValue && filterParameters.value !== "") {
+ handleChange({ ...filterParameters, value: columnSelectOption[0]?.value || "" });
+ }
+ }, [isValidValue, filterParameters, handleChange, columnSelectOption]);
+
+ useEffect(() => {
+ handleInvalidValue();
+ }, [handleInvalidValue]);
+
+ const selectedValue = isValidValue ? filterParameters.value : columnSelectOption[0]?.value || "";
+
+ return (
+
+ {column.header}
+ }
+ onChange={(e) => handleChange({ ...filterParameters, value: e.target.value })}
+ >
+ {columnSelectOption.map((option) => (
+
+ ))}
+
+
+
+ نوع فیلتر: {defaultFilterTranslation}
+
+
+
+ );
+}
+
+export default CustomSelectByDependency;
diff --git a/src/core/components/DataTable/filter/index.jsx b/src/core/components/DataTable/filter/index.jsx
index 32a09a8..8399857 100644
--- a/src/core/components/DataTable/filter/index.jsx
+++ b/src/core/components/DataTable/filter/index.jsx
@@ -9,14 +9,16 @@ function FilterColumn({ columns, user_id, page_name, table_name }) {
return (
<>
-
+ {open && (
+
+ )}
);
}
diff --git a/src/core/components/DataTable/reset/ResetStorage.jsx b/src/core/components/DataTable/reset/ResetStorage.jsx
index 8e83d3f..7994867 100644
--- a/src/core/components/DataTable/reset/ResetStorage.jsx
+++ b/src/core/components/DataTable/reset/ResetStorage.jsx
@@ -6,7 +6,7 @@ import useDataTable from "@/lib/hooks/useDataTable";
function ResetStorage({ user_id, page_name, table_name }) {
const { resetAction } = useTableSetting();
- const { isDirty } = useDataTable();
+ const { isAnyDirty } = useDataTable();
const reset = () => {
resetAction(user_id, page_name, table_name);
};
@@ -14,7 +14,7 @@ function ResetStorage({ user_id, page_name, table_name }) {
return (
- {isDirty ? (
+ {isAnyDirty ? (
{
[itemInfo.id]: value,
}));
};
+ const label = itemInfo.unit ? `${itemInfo.name} (${itemInfo.unit})` : itemInfo.name;
return (
- {itemInfo.name}
+ {label}
{
[itemInfo.id]: newValue,
}));
};
-
+ const label = itemInfo.unit ? `${itemInfo.name} (${itemInfo.unit})` : itemInfo.name;
return (
- {itemInfo.name}
+ {label}