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

fixed bug

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2025-04-20 11:30:07 +03:30
parent db8ca03921
commit 38899c322a
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/dashboard/fastReact/complaintList/Form/registerAction/RegisterActionContent.jsx
View File

@@ -1,13 +1,13 @@
import { Button, DialogActions, DialogContent, FormControlLabel, RadioGroup, Stack } from "@mui/material";
import { Controller, useForm } from "react-hook-form";
import Radio from "@mui/material/Radio";
import StyledForm from "@/core/components/StyledForm"; import StyledForm from "@/core/components/StyledForm";
import { yupResolver } from "@hookform/resolvers/yup";
import BeenhereIcon from "@mui/icons-material/Beenhere";
import { Button, DialogActions, DialogContent, FormControlLabel, RadioGroup, Stack } from "@mui/material";
import Radio from "@mui/material/Radio";
import { useState } from "react"; import { useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { mixed, object, string } from "yup";
import RegisterActionDone from "./RegisterActionDone"; import RegisterActionDone from "./RegisterActionDone";
import RegisterActionUndone from "./RegisterActionUndone"; import RegisterActionUndone from "./RegisterActionUndone";
import { yupResolver } from "@hookform/resolvers/yup";
import { mixed, object, string } from "yup";
import BeenhereIcon from "@mui/icons-material/Beenhere";
const RegisterActionContent = ({ setOpen, defaultValues, onBaseSubmit }) => { const RegisterActionContent = ({ setOpen, defaultValues, onBaseSubmit }) => {
const [selectedOption, setSelectedOption] = useState(defaultValues?.rms_status || "1"); const [selectedOption, setSelectedOption] = useState(defaultValues?.rms_status || "1");
@@ -19,7 +19,12 @@ const RegisterActionContent = ({ setOpen, defaultValues, onBaseSubmit }) => {
description: string().required("توضیحات الزامی است"), description: string().required("توضیحات الزامی است"),
start_point: mixed().when("rms_status", { start_point: mixed().when("rms_status", {
is: "1", is: "1",
then: (schema) => schema.required("مکان اقدام الزامی است"), then: (schema) =>
schema
.test("start-point-required", "مکان اقدام الزامی است", function (value) {
return !!value;
})
.required("مکان اقدام الزامی است"),
otherwise: (schema) => schema.notRequired(), otherwise: (schema) => schema.notRequired(),
}), }),
image_before_1: mixed().when("rms_status", { image_before_1: mixed().when("rms_status", {

11
src/components/dashboard/fastReact/supervisor/RowActions/index.jsx
View File

@@ -6,18 +6,11 @@ import RestoreForm from "./RestoreForm";
const RowActions = ({ row, mutate }) => { const RowActions = ({ row, mutate }) => {
const { data: userPermissions } = usePermissions(); const { data: userPermissions } = usePermissions();
const hasSupervisePermission = userPermissions.some((item) =>
["supervise-fast-react", "supervise-fast-react-province"].includes(item)
);
const hasRestorePermission = userPermissions.includes("restore-fast-react"); const hasRestorePermission = userPermissions.includes("restore-fast-react");
return ( return (
<Box sx={{ display: "flex", gap: 1 }}> <Box sx={{ display: "flex", gap: 1 }}>
{hasSupervisePermission && row.original?.status === 0 && ( {row.original?.status === 0 && <ConfirmForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />}
<ConfirmForm rowId={row.getValue("road_observeds__id")} mutate={mutate} /> {row.original?.status === 0 && <RejectForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />}
)}
{hasSupervisePermission && row.original?.status === 0 && (
<RejectForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />
)}
{hasRestorePermission && row.original?.status !== 0 && ( {hasRestorePermission && row.original?.status !== 0 && (
<RestoreForm rowId={row.getValue("road_observeds__id")} mutate={mutate} /> <RestoreForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />
)} )}