diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 02ce525..c335958 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -339,6 +339,10 @@ }, "UpdateDialog": { "update": "ویرایش", + "description": "توضیحات خود را وارد نمائید", + "description_error": "وارد کردن توضیحات الزامی است!", + "next-state-id": "وضعیت", + "next-state-id-error": "وارد کردن وضعیت الزامیست", "update-tooltip": "ویرایش", "button-cancel": "بستن", "refahi": "رفاهی", diff --git a/src/components/dashboard/expert-management/index.jsx b/src/components/dashboard/expert-management/index.jsx index 34e6785..a87cab0 100644 --- a/src/components/dashboard/expert-management/index.jsx +++ b/src/components/dashboard/expert-management/index.jsx @@ -170,6 +170,9 @@ function DashboardExpertManagementComponent() { columns={columns} selectableRow={false} CustomToolbar={TableToolbar} + sorting={[{ + id: 'id', desc: true + }]} enableCustomToolbar={true} enableLastUpdate={true} enablePinning={true} diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx index a55653c..555c580 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx @@ -14,7 +14,6 @@ import { } from "@mui/material"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; import UploadSystem from "@/core/components/UploadSystem"; -import useDirection from "@/lib/app/hooks/useDirection"; import {useFormik} from "formik"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; import {CONFIRM_MACHINARY_OFFICE} from "@/core/data/apiRoutes"; @@ -26,7 +25,6 @@ import PriceField from "@/core/components/PriceField"; const Confirm = ({rowId, fetchUrl, mutate}) => { const t = useTranslations(); - const {directionApp} = useDirection(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); @@ -113,7 +111,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => { PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}> {t("ConfirmDialog.confirm")} - + { PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}> {t("ConfirmDialog.confirm")} - + diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx index 7aba85c..6319be8 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx @@ -14,7 +14,6 @@ import { } from "@mui/material"; import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"; import UploadSystem from "@/core/components/UploadSystem"; -import useDirection from "@/lib/app/hooks/useDirection"; import {useFormik} from "formik"; import UploadFileNotification from "@/core/components/notifications/UploadFileNotification"; import {CONFIRM_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes"; @@ -24,7 +23,6 @@ import useNotification from "@/lib/app/hooks/useNotification"; const Confirm = ({rowId, fetchUrl, mutate}) => { const t = useTranslations(); - const {directionApp} = useDirection(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); diff --git a/src/core/components/PriceField.jsx b/src/core/components/PriceField.jsx index 29d8763..e62e4e1 100644 --- a/src/core/components/PriceField.jsx +++ b/src/core/components/PriceField.jsx @@ -1,23 +1,23 @@ -import {InputAdornment, TextField, Typography} from "@mui/material"; +import {Stack, TextField, Typography} from "@mui/material"; import {useTranslations} from "next-intl"; const PriceField = (props) => { const t = useTranslations(); return ( - - {((props.value) / 10).toLocaleString()} - {t("ConfirmDialog.toman")} - - ), - }} - {...props} - /> - ) + + + + + + + {((props.value) / 10).toLocaleString()} + + + {t("ConfirmDialog.toman")} + + + ) } export default PriceField \ No newline at end of file