delete edare id from rahdaran

This commit is contained in:
2025-12-27 13:29:45 +03:30
parent 7a269ae8fb
commit e5ab3f75d0
8 changed files with 25 additions and 13 deletions

View File

@@ -6,7 +6,14 @@ export const metadata = {
const Page = () => { const Page = () => {
return ( return (
<> <>
<WithPermission permission_name={["all"]}> <WithPermission
permission_name={[
"manage-violation-city",
"manage-violation-country",
"manage-violation-province",
"manage-violation-station",
]}
>
<ViolationsPage /> <ViolationsPage />
{/* <ActivityCodeLog activity_code={1152} /> */} {/* <ActivityCodeLog activity_code={1152} /> */}
</WithPermission> </WithPermission>

View File

@@ -19,7 +19,6 @@ import LogesticController from "./LogesticController";
const validationSchema = object({ const validationSchema = object({
provinceId: string().required("لطفا استان را وارد کنید!!!"), provinceId: string().required("لطفا استان را وارد کنید!!!"),
edarehShahriId: string().required("لطفا اداره را وارد کنید!!!"),
name: string().required("وارد کردن نام و نام خانوادگی الزامیست!"), name: string().required("وارد کردن نام و نام خانوادگی الزامیست!"),
code: string() code: string()
.required("لطفا کد ملی را وارد کنید!!!") .required("لطفا کد ملی را وارد کنید!!!")

View File

@@ -33,9 +33,6 @@ const LogesticController = ({ control }) => {
/> />
</Stack> </Stack>
) : null} ) : null}
<Stack>
<CityController control={control} />
</Stack>
</> </>
); );
}; };

View File

@@ -17,7 +17,6 @@ const CreateForm = ({ open, setOpen, mutate }) => {
isDriver: "0", isDriver: "0",
isProvince: !hasCountryPermission, isProvince: !hasCountryPermission,
provinceId: !hasCountryPermission ? user.province_id : "", provinceId: !hasCountryPermission ? user.province_id : "",
edarehShahriId: "",
name: "", name: "",
code: "", code: "",
phone_number: "", phone_number: "",
@@ -26,7 +25,6 @@ const CreateForm = ({ open, setOpen, mutate }) => {
const formData = new FormData(); const formData = new FormData();
formData.append("is_driver", result.isDriver); formData.append("is_driver", result.isDriver);
formData.append("province_id", result.provinceId); formData.append("province_id", result.provinceId);
formData.append("edareh_shahri_id", result.edarehShahriId);
formData.append("name", result.name); formData.append("name", result.name);
formData.append("code", result.code); formData.append("code", result.code);
formData.append("mobile", result.phone_number); formData.append("mobile", result.phone_number);

View File

@@ -10,7 +10,6 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {
const defaultData = { const defaultData = {
isDriver: `${row.original?.is_driver}` || "0", isDriver: `${row.original?.is_driver}` || "0",
provinceId: row.original?.province_id || "", provinceId: row.original?.province_id || "",
edarehShahriId: row.original?.edareh_shahri_id || "",
name: row.original?.name || "", name: row.original?.name || "",
code: row.original?.code || "", code: row.original?.code || "",
phone_number: row.original?.mobile || "", phone_number: row.original?.mobile || "",
@@ -19,7 +18,6 @@ const EditController = ({ rowId, mutate, setOpen, row }) => {
const formData = new FormData(); const formData = new FormData();
formData.append("is_driver", result.isDriver); formData.append("is_driver", result.isDriver);
formData.append("province_id", result.provinceId); formData.append("province_id", result.provinceId);
formData.append("edareh_shahri_id", result.edarehShahriId);
formData.append("name", result.name); formData.append("name", result.name);
formData.append("code", result.code); formData.append("code", result.code);
formData.append("mobile", result.phone_number); formData.append("mobile", result.phone_number);

View File

@@ -35,8 +35,11 @@ const EditController = ({ row, mutate, openEditDialog, setOpenEditDialog }) => {
const submitForm = async (result) => { const submitForm = async (result) => {
setSubmitting(true); setSubmitting(true);
const bound = result.bound.getLatLngs(); const latlngs = result.bound.getLatLngs();
let area = bound.map((ring) => ring.map((latlng) => [latlng.lat, latlng.lng]));
const normalized = result.bound_type === "polygon" ? latlngs : [latlngs];
const area = normalized.map((ring) => ring.map(({ lat, lng }) => [lat, lng]));
await requestServer(`${UPDATE_REQUEST_MISSION}/${row.original.id}`, "post", { await requestServer(`${UPDATE_REQUEST_MISSION}/${row.original.id}`, "post", {
data: { data: {
explanation: result.explanation, explanation: result.explanation,

View File

@@ -157,7 +157,12 @@ export const pageMenu = [
icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />, icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />,
route: "/dashboard/road-missions/violation", route: "/dashboard/road-missions/violation",
// badges: [{ key: "mission.control" }], // TODO: add badge and permission // badges: [{ key: "mission.control" }], // TODO: add badge and permission
permissions: ["all"], permissions: [
"manage-violation-city",
"manage-violation-country",
"manage-violation-province",
"manage-violation-station",
],
}, },
// { // {
// id: "roadMissionsReports", // id: "roadMissionsReports",

View File

@@ -156,7 +156,12 @@ export const pageMenuDev = [
icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />, icon: <RemoveRoadIcon sx={{ width: "inherit", height: "inherit" }} />,
route: "/dashboard/road-missions/violation", route: "/dashboard/road-missions/violation",
// badges: [{ key: "mission.control" }], // TODO: add badge and permission // badges: [{ key: "mission.control" }], // TODO: add badge and permission
permissions: ["all"], permissions: [
"manage-violation-city",
"manage-violation-country",
"manage-violation-province",
"manage-violation-station",
],
}, },
// { // {
// id: "roadMissionsReports", // id: "roadMissionsReports",