From 3589fc334dbea1ad88fcd25afc9d9d87ed45770e Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sun, 1 Jun 2025 08:49:41 +0330 Subject: [PATCH 1/3] add alerts --- .../operator/Form/CreateFactor/CreateFactorContent.jsx | 2 +- .../damages/operator/Form/EditForm/EditController.jsx | 4 ++-- .../RowActions/SendToInsurance/SendToInsuranceContent.jsx | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/dashboard/damages/operator/Form/CreateFactor/CreateFactorContent.jsx b/src/components/dashboard/damages/operator/Form/CreateFactor/CreateFactorContent.jsx index 711c1fa..640e00c 100644 --- a/src/components/dashboard/damages/operator/Form/CreateFactor/CreateFactorContent.jsx +++ b/src/components/dashboard/damages/operator/Form/CreateFactor/CreateFactorContent.jsx @@ -151,7 +151,7 @@ const CreateFactorContent = ({ row, mutate, rowId, setOpenCreateFactorDialog }) - بعد از صدور فاکتور، ویرایش اطلاعات کاربر و مبالغ امکان‌پذیر نخواهد بود. + پس از صدور فاکتور، امکان ویرایش مبالغ بیمه و داغی وجود نخواهد داشت لینک پرداخت فاکتور به شماره {row.original?.driver_phone_number} ارسال می شود. diff --git a/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx b/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx index d4a036c..fc600b7 100644 --- a/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx +++ b/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx @@ -29,9 +29,9 @@ const EditController = ({ rowId, mutate, setOpenEditDialog }) => { }, [rowId]); const today = new Date().toISOString().split("T")[0]; - const plaqueNumber = damageItemDetails?.plaque.split("-") || []; + const plaqueNumber = damageItemDetails?.is_foreign == 0 ? damageItemDetails?.plaque.split("-") || [] : []; const defaultData = { - isForeign: damageItemDetails?.is_foreign, + isForeign: String(damageItemDetails?.is_foreign), damage_picture1: damageItemDetails?.damage_picture1 || null, damage_picture2: damageItemDetails?.damage_picture2 || null, accident_date: new Date(damageItemDetails?.accident_date) || "", diff --git a/src/components/dashboard/damages/operator/RowActions/SendToInsurance/SendToInsuranceContent.jsx b/src/components/dashboard/damages/operator/RowActions/SendToInsurance/SendToInsuranceContent.jsx index 620049a..4747d12 100644 --- a/src/components/dashboard/damages/operator/RowActions/SendToInsurance/SendToInsuranceContent.jsx +++ b/src/components/dashboard/damages/operator/RowActions/SendToInsurance/SendToInsuranceContent.jsx @@ -1,4 +1,4 @@ -import { Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material"; +import { Alert, Button, DialogActions, DialogContent, Stack, Typography } from "@mui/material"; import React, { useState } from "react"; import useRequest from "@/lib/hooks/useRequest"; import { GET_INSURANCE, GET_INSURANCE_PAGE } from "@/core/utils/routes"; @@ -24,6 +24,9 @@ const SendToInsuranceContent = ({ setOpenSendInsuranceDialog, rowId, mutate }) = آیا از صدور نامه بیمه اطمینان دارید؟ + + در صورت صدور نامه بیمه، اطلاعات قابل ویرایش یا حذف نخواهند بود + From 41f00c6665f24bde40b82b3f5faa1ce72de0fee6 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sun, 1 Jun 2025 08:51:49 +0330 Subject: [PATCH 2/3] formatting --- .../create/Forms/CreateFormContent.jsx | 50 ++++++++++--------- .../Actions/create/Forms/DamageInfo.jsx | 10 ++-- .../operator/Actions/create/Forms/index.jsx | 4 +- .../operator/Form/EditForm/EditController.jsx | 4 +- .../damages/operator/OperatorList.jsx | 13 +++-- .../damages/operator/RowActions/index.jsx | 4 +- .../dashboard/damages/report/ReportLists.jsx | 6 +-- 7 files changed, 48 insertions(+), 43 deletions(-) diff --git a/src/components/dashboard/damages/operator/Actions/create/Forms/CreateFormContent.jsx b/src/components/dashboard/damages/operator/Actions/create/Forms/CreateFormContent.jsx index 3d71438..e3bc1a2 100644 --- a/src/components/dashboard/damages/operator/Actions/create/Forms/CreateFormContent.jsx +++ b/src/components/dashboard/damages/operator/Actions/create/Forms/CreateFormContent.jsx @@ -32,47 +32,49 @@ const validationSchema = object({ province_id: number().required("لطفا استان را وارد کنید!!!"), city_id: number().required("لطفا شهرستان را وارد کنید!!!"), axis_name: string().required("لطفا نام محور را وارد کنید!!!"), - driver_name: string().when('isForeign', { + driver_name: string().when("isForeign", { is: "0", then: (schema) => schema.required("لطفا نام و نام خانوادگی را وارد کنید!!!"), }), - phone_number: string() - .when('isForeign', { - is: "0", - then: (schema) => schema.matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شده و 11 رقم باشد") - .required("لطفا تلفن همراه را وارد کنید!!!"), - }), - national_code: mixed().when('isForeign', { + phone_number: string().when("isForeign", { is: "0", - then: (schema) => schema.test("max", "کد ملی باید شامل 10 رقم باشد", (value) => value.toString().length === 10) - .test("validation", "کد ملی صحیح نمی باشد", (value) => validateNationalCode(value)) - .required("لطفا کد ملی را وارد کنید!!!"), + then: (schema) => + schema + .matches(/^09\d{9}$/, "شماره موبایل باید با 09 شروع شده و 11 رقم باشد") + .required("لطفا تلفن همراه را وارد کنید!!!"), + }), + national_code: mixed().when("isForeign", { + is: "0", + then: (schema) => + schema + .test("max", "کد ملی باید شامل 10 رقم باشد", (value) => value.toString().length === 10) + .test("validation", "کد ملی صحیح نمی باشد", (value) => validateNationalCode(value)) + .required("لطفا کد ملی را وارد کنید!!!"), }), start_point: mixed() .test("start-point-required", "لطفاً نقطه تصادف را مشخص کنید!", function (value) { return !!value; }) .required("لطفاً نقطه تصادف را مشخص کنید!"), - plate_part1: mixed() - .when('isForeign', { - is: "0", - then: (schema) => schema.test("max", "2رقم", (value) => value.toString().length === 2) - .required("plate_part1 الزامیست"), - }), - plate_part2: mixed().when('isForeign', { + plate_part1: mixed().when("isForeign", { + is: "0", + then: (schema) => + schema.test("max", "2رقم", (value) => value.toString().length === 2).required("plate_part1 الزامیست"), + }), + plate_part2: mixed().when("isForeign", { is: "0", then: (schema) => schema.required("plate_part2 الزامیست"), }), - plate_part3: mixed().when('isForeign', { + plate_part3: mixed().when("isForeign", { is: "0", - then: (schema) => schema.test("max", "3رقم", (value) => value.toString().length === 3) - .required("plate_part3الزامیست"), + then: (schema) => + schema.test("max", "3رقم", (value) => value.toString().length === 3).required("plate_part3الزامیست"), }), - plate_part4: mixed().when('isForeign', { + plate_part4: mixed().when("isForeign", { is: "0", - then: (schema) => schema.test("max", "2رقم", (value) => value.toString().length === 2) - .required("plate_part4الزامیست"), + then: (schema) => + schema.test("max", "2رقم", (value) => value.toString().length === 2).required("plate_part4الزامیست"), }), damage_picture1: mixed().nullable().required("لطفا عکس تصادف را بارگذاری کنید!"), damage_picture2: mixed().nullable().required("لطفا عکس تصادف را بارگذاری کنید!"), diff --git a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageInfo.jsx b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageInfo.jsx index 8f61860..6744039 100644 --- a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageInfo.jsx +++ b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageInfo.jsx @@ -16,7 +16,7 @@ const DamageInfo = ({ control, setValue, errors }) => { return ( - + { exclusive onChange={(event, newAlignment) => field.onChange(newAlignment)} > - - ناوگان داخلی - - - ناوگان خارجی - + ناوگان داخلی + ناوگان خارجی )} /> diff --git a/src/components/dashboard/damages/operator/Actions/create/Forms/index.jsx b/src/components/dashboard/damages/operator/Actions/create/Forms/index.jsx index 1cdedd3..8624134 100644 --- a/src/components/dashboard/damages/operator/Actions/create/Forms/index.jsx +++ b/src/components/dashboard/damages/operator/Actions/create/Forms/index.jsx @@ -23,7 +23,7 @@ const OperatorCreateForm = ({ open, setOpen, mutate }) => { formData.append("city_id", result.city_id); formData.append("axis_name", result.axis_name); formData.append("is_foreign", result.isForeign); - if (result.isForeign == '0') { + if (result.isForeign == "0") { formData.append("driver_name", result.driver_name); formData.append("driver_phone_number", result.phone_number); formData.append("driver_national_code", result.national_code); @@ -54,7 +54,7 @@ const OperatorCreateForm = ({ open, setOpen, mutate }) => { mutate(); setOpen(false); }) - .catch(() => { }); + .catch(() => {}); }; const defaultData = { isForeign: "0", diff --git a/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx b/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx index fc600b7..c925cdf 100644 --- a/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx +++ b/src/components/dashboard/damages/operator/Form/EditForm/EditController.jsx @@ -70,7 +70,7 @@ const EditController = ({ rowId, mutate, setOpenEditDialog }) => { formData.append("city_id", result.city_id); formData.append("axis_name", result.axis_name); formData.append("is_foreign", result.isForeign); - if (result.isForeign == '0') { + if (result.isForeign == "0") { formData.append("driver_name", result.driver_name); formData.append("driver_phone_number", result.phone_number); formData.append("driver_national_code", result.national_code); @@ -103,7 +103,7 @@ const EditController = ({ rowId, mutate, setOpenEditDialog }) => { mutate(); setOpenEditDialog(false); }) - .catch(() => { }); + .catch(() => {}); }; return ( <> diff --git a/src/components/dashboard/damages/operator/OperatorList.jsx b/src/components/dashboard/damages/operator/OperatorList.jsx index bdb7c3e..54a1152 100644 --- a/src/components/dashboard/damages/operator/OperatorList.jsx +++ b/src/components/dashboard/damages/operator/OperatorList.jsx @@ -162,8 +162,8 @@ const OperatorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingCityList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -199,7 +199,11 @@ const OperatorList = () => { })); }, Cell: ({ row }) => { - return {row.original.is_foreign == "0" ? "داخلی" : "خارجی"}; + return ( + + {row.original.is_foreign == "0" ? "داخلی" : "خارجی"} + + ); }, }, { @@ -248,7 +252,8 @@ const OperatorList = () => { enableSorting: false, grow: false, size: 100, - Cell: ({ row, renderedCellValue }) => row.original.is_foreign == "0" ? : '', + Cell: ({ row, renderedCellValue }) => + row.original.is_foreign == "0" ? : "", }, { accessorKey: "accident_type", diff --git a/src/components/dashboard/damages/operator/RowActions/index.jsx b/src/components/dashboard/damages/operator/RowActions/index.jsx index 8f93004..bd0a83f 100644 --- a/src/components/dashboard/damages/operator/RowActions/index.jsx +++ b/src/components/dashboard/damages/operator/RowActions/index.jsx @@ -26,7 +26,9 @@ const RowActions = ({ row, mutate }) => { {hasEditPermission && [0].includes(row.original?.status) && ( )} - {(hasDeletePermission && [0].includes(row.original?.status)) && } + {hasDeletePermission && [0].includes(row.original?.status) && ( + + )} ); }; diff --git a/src/components/dashboard/damages/report/ReportLists.jsx b/src/components/dashboard/damages/report/ReportLists.jsx index 42abbb1..88ce8d5 100644 --- a/src/components/dashboard/damages/report/ReportLists.jsx +++ b/src/components/dashboard/damages/report/ReportLists.jsx @@ -19,7 +19,7 @@ const ReportLists = ({ data, specialFilter }) => { }, { header: "تعداد خسارات ثبت شده", - id: 'countAll', + id: "countAll", enableColumnFilter: false, enableSorting: false, datatype: "text", @@ -118,11 +118,11 @@ const ReportLists = ({ data, specialFilter }) => { return (renderedCellValue / 1).toLocaleString(); }, }, - ] + ], }, { header: "تعداد نحوه شناسایی خسارت", - id: 'police_rah_All', + id: "police_rah_All", enableColumnFilter: false, enableSorting: false, datatype: "text", From bbc897cdf4eb8f1272301da4908cc17b72eda0b5 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Sun, 1 Jun 2025 08:52:39 +0330 Subject: [PATCH 3/3] change version to 1.3.7 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index abf29dd..8537fbc 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ HOST="rms.witel.ir" -NEXT_PUBLIC_VERSION="1.3.6" +NEXT_PUBLIC_VERSION="1.3.7" NEXT_PUBLIC_API_URL="https://rms.witel.ir" NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map" \ No newline at end of file