loan/expert-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug inspector expert and development assistant

Browse Source
This commit is contained in:
Amin Ghasempoor
2023-08-13 14:58:56 +03:30
parent e015ac36b6
commit 004feca2aa
14 changed files with 29 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/locales/fa/app.json
View File

@@ -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": {

2
src/components/dashboard/commercial-chief/Form/ConfirmForm.jsx
View File

@@ -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', {

4
src/components/dashboard/commercial-chief/Form/RejectForm.jsx
View File

@@ -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', {

2
src/components/dashboard/development-assistant/Form/ConfirmForm.jsx
View File

@@ -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', {

2
src/components/dashboard/development-assistant/Form/RejectForm.jsx
View File

@@ -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', {

2
src/components/dashboard/inspector-expert/Form/ConfirmForm.jsx
View File

@@ -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', {

2
src/components/dashboard/inspector-expert/Form/RejectForm.jsx
View File

@@ -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', {

62
src/components/dashboard/inspector-expert/Form/ReviseForm.jsx
View File

@@ -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 (
<>
<Tooltip title={t("RejectDialog.reject")}>
<Tooltip title={t("ReviseDialog.revise")}>
<IconButton color="primary" onClick={() => setOpenRejectDialog(true)}>
<ThumbDownIcon/>
<EditIcon/>
</IconButton>
</Tooltip>
<Dialog fullWidth open={openRejectDialog}
PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>
<DialogTitle>{t("RejectDialog.reject")}</DialogTitle>
<DialogTitle>{t("ReviseDialog.revise")}</DialogTitle>
<DialogContent>
<Stack spacing={2}>
<Stack>
@@ -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}}
/>
</Stack>
<Stack>
<Typography>{t("UploadSystem.upload_file")}{t("UploadSystem.optional")}</Typography>
<UploadSystem
selectedImage={selectedImage}
handleUploadChange={handleUploadChange} // Pass the updated function directly
setselectedImage={setSelectedImage}
setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue
fieldname="reject_img"
fileType={fileType}
fileName={fileName}
imageAlt={t("app_name")}
imageSize={[250 /*width*/, 150 /*height*/]}
setShowAddIcon={setShowAddIcon}
showAddIcon={showAddIcon}
/>
</Stack>
</Stack>
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenRejectDialog(false)} variant="outlined" color="secondary"
disabled={formik.isSubmitting} autoFocus>
{t("RejectDialog.button-cancel")}
{t("ReviseDialog.button-cancel")}
</Button>
<Button onClick={formik.handleSubmit} variant="contained" color="primary"
disabled={formik.isSubmitting}>
{t("RejectDialog.button-reject")}
{t("ReviseDialog.button-revise")}
</Button>
</DialogActions>
</Dialog>

2
src/components/dashboard/province-head-expert/Form/ReviceForm.jsx
View File

@@ -94,7 +94,7 @@ const Revise = ({rowId, fetchUrl, mutate}) => {
</Button>
<Button onClick={formik.handleSubmit} variant="contained" color="primary"
disabled={formik.isSubmitting}>
{t("ReviseDialog.button-confirm")}
{t("ReviseDialog.button-revise")}
</Button>
</DialogActions>
</Dialog>

6
src/core/data/sidebarMenu.jsx
View File

@@ -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: <AssignmentIndIcon/>,
icon: <BusinessCenterIcon/>,
selected: false,
role: "commercial_chief",
},
@@ -89,7 +91,7 @@ const sidebarMenu = [
key: "sidebar.inspector-expert",
type: "page",
route: "/dashboard/inspector-expert",
icon: <DesktopWindowsIcon/>,
icon: <GradingIcon/>,
selected: false,
role: "inspector_expert",
},

2
src/pages/dashboard/commercial-chief/index.jsx
View File

@@ -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 (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>

4
src/pages/dashboard/development-assistant/index.jsx
View File

@@ -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 (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>
@@ -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,
},
};

2
src/pages/dashboard/inspector-expert/index.jsx
View File

@@ -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 (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>

2
src/pages/dashboard/province-head-expert/index.jsx
View File

@@ -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 (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>