From 004feca2aad39e579c2c58806c9952505f8a0da0 Mon Sep 17 00:00:00 2001 From: Amin Ghasempoor Date: Sun, 13 Aug 2023 14:58:56 +0330 Subject: [PATCH] debug inspector expert and development assistant --- public/locales/fa/app.json | 7 +-- .../commercial-chief/Form/ConfirmForm.jsx | 2 +- .../commercial-chief/Form/RejectForm.jsx | 4 +- .../Form/ConfirmForm.jsx | 2 +- .../development-assistant/Form/RejectForm.jsx | 2 +- .../inspector-expert/Form/ConfirmForm.jsx | 2 +- .../inspector-expert/Form/RejectForm.jsx | 2 +- .../inspector-expert/Form/ReviseForm.jsx | 62 +++---------------- .../province-head-expert/Form/ReviceForm.jsx | 2 +- src/core/data/sidebarMenu.jsx | 6 +- .../dashboard/commercial-chief/index.jsx | 2 +- .../dashboard/development-assistant/index.jsx | 4 +- .../dashboard/inspector-expert/index.jsx | 2 +- .../dashboard/province-head-expert/index.jsx | 2 +- 14 files changed, 29 insertions(+), 72 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 6aecc8d..2caf47f 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -85,8 +85,7 @@ "province_head_expert": "کارشناس ستادی", "passenger_office_page": "اداره مسافر", "machinary_office_page": "ماشین آلات", - "development_assistant": "معاون توسعه", - "development_assistant": "معاون توسعه", + "development_assistant_page": "معاون توسعه", "inspector_expert_page": "بازدید کارشناس", "commercial_chief_page": "رئیس اداره بازرگانی", "edit_profile": "ویرایش پروفایل" @@ -270,10 +269,10 @@ }, "ReviseDialog": { "revise": "ویرایش", - "button-cancel": "بستن", - "button-confirm": "تایید", "description_error": "وارد کردن توضیحات الزامی است!", "optional": " (اختیاری)", + "button-cancel": "بستن", + "button-revise": "ویرایش", "description": "توضیحات خود را وارد نمائید" }, "RejectDialog": { diff --git a/src/components/dashboard/commercial-chief/Form/ConfirmForm.jsx b/src/components/dashboard/commercial-chief/Form/ConfirmForm.jsx index ca19fd0..d3aa7ce 100644 --- a/src/components/dashboard/commercial-chief/Form/ConfirmForm.jsx +++ b/src/components/dashboard/commercial-chief/Form/ConfirmForm.jsx @@ -35,7 +35,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { }, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - if (values.description != "") formData.append("expert_description", values.description); + if (values.description != "") formData.append("description", values.description); if (values.confirm_img != null) formData.append("attachment", values.confirm_img); requestServer(`${CONFIRM_COMMERCIAL_CHIEF}/${rowId}`, 'post', { diff --git a/src/components/dashboard/commercial-chief/Form/RejectForm.jsx b/src/components/dashboard/commercial-chief/Form/RejectForm.jsx index 8a76078..42d7694 100644 --- a/src/components/dashboard/commercial-chief/Form/RejectForm.jsx +++ b/src/components/dashboard/commercial-chief/Form/RejectForm.jsx @@ -17,7 +17,6 @@ import * as Yup from "yup"; import {useState} from "react"; import UploadSystem from "@/core/components/UploadSystem"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import useDirection from "@/lib/app/hooks/useDirection"; import ThumbDownIcon from "@mui/icons-material/ThumbDown"; import useRequest from "@/lib/app/hooks/useRequest"; @@ -27,7 +26,6 @@ const Reject = ({rowId, fetchUrl, mutate}) => { const [fileName, setfileName] = useState(null); const [showAddIcon, setShowAddIcon] = useState(true); const t = useTranslations(); - const {directionApp} = useDirection(); const [openRejectDialog, setOpenRejectDialog] = useState(false); const requestServer = useRequest({auth: true}) @@ -43,7 +41,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - formData.append("expert_description", values.description); + formData.append("description", values.description); if (values.reject_img != null) formData.append("attachment", values.reject_img); requestServer(`${REJECT_COMMERCIAL_CHIEF}/${rowId}`, 'post', { diff --git a/src/components/dashboard/development-assistant/Form/ConfirmForm.jsx b/src/components/dashboard/development-assistant/Form/ConfirmForm.jsx index e3732f1..73cad5f 100644 --- a/src/components/dashboard/development-assistant/Form/ConfirmForm.jsx +++ b/src/components/dashboard/development-assistant/Form/ConfirmForm.jsx @@ -35,7 +35,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { }, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - if (values.description != "") formData.append("expert_description", values.description); + if (values.description != "") formData.append("description", values.description); if (values.confirm_img != null) formData.append("attachment", values.confirm_img); requestServer(`${CONFIRM_DEVELOPMENT_ASSISTANT}/${rowId}`, 'post', { diff --git a/src/components/dashboard/development-assistant/Form/RejectForm.jsx b/src/components/dashboard/development-assistant/Form/RejectForm.jsx index 81d54ea..69df945 100644 --- a/src/components/dashboard/development-assistant/Form/RejectForm.jsx +++ b/src/components/dashboard/development-assistant/Form/RejectForm.jsx @@ -41,7 +41,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - formData.append("expert_description", values.description); + formData.append("description", values.description); if (values.reject_img != null) formData.append("attachment", values.reject_img); requestServer(`${REJECT_DEVELOPMENT_ASSISTANT}/${rowId}`, 'post', { diff --git a/src/components/dashboard/inspector-expert/Form/ConfirmForm.jsx b/src/components/dashboard/inspector-expert/Form/ConfirmForm.jsx index 7343ea5..6beaed1 100644 --- a/src/components/dashboard/inspector-expert/Form/ConfirmForm.jsx +++ b/src/components/dashboard/inspector-expert/Form/ConfirmForm.jsx @@ -35,7 +35,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { }, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - if (values.description != "") formData.append("expert_description", values.description); + if (values.description != "") formData.append("description", values.description); if (values.confirm_img != null) formData.append("attachment", values.confirm_img); requestServer(`${CONFIRM_INSPECTOR_EXPERT}/${rowId}`, 'post', { diff --git a/src/components/dashboard/inspector-expert/Form/RejectForm.jsx b/src/components/dashboard/inspector-expert/Form/RejectForm.jsx index 8719749..47a4bf4 100644 --- a/src/components/dashboard/inspector-expert/Form/RejectForm.jsx +++ b/src/components/dashboard/inspector-expert/Form/RejectForm.jsx @@ -43,7 +43,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => { validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - formData.append("expert_description", values.description); + formData.append("description", values.description); if (values.reject_img != null) formData.append("attachment", values.reject_img); requestServer(`${REJECT_INSPECTOR_EXPERT}/${rowId}`, 'post', { diff --git a/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx b/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx index 3093a5e..988b3ee 100644 --- a/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx +++ b/src/components/dashboard/inspector-expert/Form/ReviseForm.jsx @@ -9,40 +9,31 @@ import { Stack, TextField, Tooltip, - Typography, } from "@mui/material"; import {useTranslations} from "next-intl"; import {useFormik} from "formik"; import * as Yup from "yup"; import {useState} from "react"; -import UploadSystem from "@/core/components/UploadSystem"; -import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; -import ThumbDownIcon from "@mui/icons-material/ThumbDown"; import useRequest from "@/lib/app/hooks/useRequest"; +import EditIcon from "@mui/icons-material/Edit"; const Revise = ({rowId, fetchUrl, mutate}) => { - const [selectedImage, setSelectedImage] = useState(""); - const [fileType, setfileType] = useState(null); - const [fileName, setfileName] = useState(null); - const [showAddIcon, setShowAddIcon] = useState(true); const t = useTranslations(); const [openRejectDialog, setOpenRejectDialog] = useState(false); const requestServer = useRequest({auth: true}) const validationSchema = Yup.object().shape({ - description: Yup.string().required(t("RejectDialog.description_error")), + description: Yup.string().required(t("ReviseDialog.description_error")), }); const formik = useFormik({ initialValues: { description: "", - reject_img: null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - formData.append("expert_description", values.description); - if (values.reject_img != null) formData.append("attachment", values.reject_img); + formData.append("description", values.description); requestServer(`${REVISE_INSPECTOR_EXPERT}/${rowId}`, 'post', { data: formData, @@ -59,34 +50,17 @@ const Revise = ({rowId, fetchUrl, mutate}) => { formik.setFieldValue("description", event.target.value); formik.handleChange(event); }; - const handleUploadChange = (event) => { - const uploadedFile = event.target?.files?.[0]; - if (uploadedFile) { - const maxFileSize = 2 * 1024 * 1024; - if (uploadedFile.size > maxFileSize) { - UploadFileNotification(t); - event.target.value = ""; - return; - } - const fileType = event.target?.files?.[0].type; - const fileName = event.target?.files?.[0].name; - setSelectedImage(URL.createObjectURL(uploadedFile)); - setfileType(fileType); - setfileName(fileName); - formik.setFieldValue("reject_img", uploadedFile); - setShowAddIcon(false); - } - }; + return ( <> - + setOpenRejectDialog(true)}> - + - {t("RejectDialog.reject")} + {t("ReviseDialog.revise")} @@ -94,7 +68,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => { name="description" multiline rows={8} - label={t("RejectDialog.description")} + label={t("ReviseDialog.description")} value={formik.values.description} onChange={handleDescriptionChange} onBlur={formik.handleBlur("description")} @@ -107,32 +81,16 @@ const Revise = ({rowId, fetchUrl, mutate}) => { sx={{mt: 1}} /> - - {t("UploadSystem.upload_file")}{t("UploadSystem.optional")} - - diff --git a/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx b/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx index 0e7f0ff..fa5045e 100644 --- a/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx +++ b/src/components/dashboard/province-head-expert/Form/ReviceForm.jsx @@ -94,7 +94,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => { diff --git a/src/core/data/sidebarMenu.jsx b/src/core/data/sidebarMenu.jsx index 25009af..5a9c9c3 100644 --- a/src/core/data/sidebarMenu.jsx +++ b/src/core/data/sidebarMenu.jsx @@ -5,6 +5,8 @@ import DirectionsRailwayIcon from "@mui/icons-material/DirectionsRailway"; import AssignmentIndIcon from "@mui/icons-material/AssignmentInd"; import DesktopWindowsIcon from "@mui/icons-material/DesktopWindows"; import GavelIcon from '@mui/icons-material/Gavel'; +import BusinessCenterIcon from '@mui/icons-material/BusinessCenter'; +import GradingIcon from '@mui/icons-material/Grading'; const sidebarMenu = [ [ @@ -73,7 +75,7 @@ const sidebarMenu = [ key: "sidebar.commercial-chief", type: "page", route: "/dashboard/commercial-chief", - icon: , + icon: , selected: false, role: "commercial_chief", }, @@ -89,7 +91,7 @@ const sidebarMenu = [ key: "sidebar.inspector-expert", type: "page", route: "/dashboard/inspector-expert", - icon: , + icon: , selected: false, role: "inspector_expert", }, diff --git a/src/pages/dashboard/commercial-chief/index.jsx b/src/pages/dashboard/commercial-chief/index.jsx index 348bedb..6a0d02a 100644 --- a/src/pages/dashboard/commercial-chief/index.jsx +++ b/src/pages/dashboard/commercial-chief/index.jsx @@ -4,7 +4,7 @@ import {parse} from "next-useragent"; import DashboardCommercialChiefComponent from "@/components/dashboard/commercial-chief"; const requiredPermissions = ["commercial_chief"]; -export default function PassengerBoss() { +export default function CommercialChief() { return ( diff --git a/src/pages/dashboard/development-assistant/index.jsx b/src/pages/dashboard/development-assistant/index.jsx index 1db0d2e..90685ee 100644 --- a/src/pages/dashboard/development-assistant/index.jsx +++ b/src/pages/dashboard/development-assistant/index.jsx @@ -4,7 +4,7 @@ import {parse} from "next-useragent"; import DashboardDevelopmentAssistantComponent from "@/components/dashboard/development-assistant"; const requiredPermissions = ["development_assistant"]; -export default function PassengerBoss() { +export default function DevelopmentAssistant() { return ( @@ -19,7 +19,7 @@ export async function getServerSideProps({req, locale}) { return { props: { messages: (await import(`&/locales/${locale}/app.json`)).default, - title: "Dashboard.development_assistant", + title: "Dashboard.development_assistant_page", isBot, }, }; diff --git a/src/pages/dashboard/inspector-expert/index.jsx b/src/pages/dashboard/inspector-expert/index.jsx index e47e596..b573446 100644 --- a/src/pages/dashboard/inspector-expert/index.jsx +++ b/src/pages/dashboard/inspector-expert/index.jsx @@ -4,7 +4,7 @@ import {parse} from "next-useragent"; import DashboardInspectorExpertComponent from "@/components/dashboard/inspector-expert"; const requiredPermissions = ["inspector_expert"]; -export default function PassengerOffice() { +export default function InspectorExpert() { return ( diff --git a/src/pages/dashboard/province-head-expert/index.jsx b/src/pages/dashboard/province-head-expert/index.jsx index 72c2820..a1b81d0 100644 --- a/src/pages/dashboard/province-head-expert/index.jsx +++ b/src/pages/dashboard/province-head-expert/index.jsx @@ -4,7 +4,7 @@ import {parse} from "next-useragent"; import DashboardProvinceHeadExpertComponent from "@/components/dashboard/province-head-expert"; const requiredPermissions = ["province_head_expert"]; -export default function PassengerOffice() { +export default function ProvinceHeadExpertOffice() { return (