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

sync name with back end

Browse Source
This commit is contained in:
AminGhasempoor
2023-12-24 11:30:27 +03:30
parent 7639898c3a
commit 3077ed1d63
6 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,19 +358,19 @@
"description": "توضیحات خود را وارد نمائید", "description": "توضیحات خود را وارد نمائید",
"choose_file": "انتخاب فایل", "choose_file": "انتخاب فایل",
"approved_amount": "مبلغ تصویب شده", "approved_amount": "مبلغ تصویب شده",
"sakht_amount": "دوره ساخت", "sakht_period": "دوره ساخت",
"tanafos_amount": "دوره تنفس", "tanafos_period": "دوره تنفس",
"approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست", "approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست",
"sakht_amount_error": "وارد کردن دوره ساخت الزامیست", "sakht_period_error": "وارد کردن دوره ساخت الزامیست",
"tanafos_amount_error": "وارد کردن دوره تنفس الزامیست", "tanafos_period_error": "وارد کردن دوره تنفس الزامیست",
"approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد", "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد",
"approved_amount_number": "مبلغ تصویب شده باید عدد باشد", "approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
"sakht_amount_number": "دوره ساخت باید عدد باشد", "sakht_period_number": "دوره ساخت باید عدد باشد",
"tanafos_amount_number": "دوره تنفس باید عدد باشد", "tanafos_period_number": "دوره تنفس باید عدد باشد",
"toman": "میلیون تومان", "toman": "میلیون تومان",
"tanafos_amount_month": "ماه", "tanafos_period_month": "ماه",
"approved_amount_title": "مبلغ تصویب شده کارگروه", "approved_amount_title": "مبلغ تصویب شده کارگروه",
"sakht_amount_day": "روز", "sakht_period_day": "روز",
"proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست",
"proposed_amount": "مبلغ پیشنهادی", "proposed_amount": "مبلغ پیشنهادی",
"proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد", "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد",

52
src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -81,14 +81,14 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
(value) => value <= vehicle_amount[vehicle_type]) (value) => value <= vehicle_amount[vehicle_type])
.test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0) .test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
.required(t("ConfirmDialog.proposed_amount_error")), .required(t("ConfirmDialog.proposed_amount_error")),
sakht_amount: Yup.mixed() sakht_period: Yup.mixed()
.test("is-number", `${t("ConfirmDialog.sakht_amount_number")}`, .test("is-number", `${t("ConfirmDialog.sakht_period_number")}`,
(value) => !isNaN(value)) (value) => !isNaN(value))
.required(t("ConfirmDialog.sakht_amount_error")), .required(t("ConfirmDialog.sakht_period_error")),
tanafos_amount: Yup.mixed() tanafos_period: Yup.mixed()
.test("is-number", `${t("ConfirmDialog.tanafos_amount_number")}`, .test("is-number", `${t("ConfirmDialog.tanafos_period_number")}`,
(value) => !isNaN(value)) (value) => !isNaN(value))
.required(t("ConfirmDialog.tanafos_amount_error")), .required(t("ConfirmDialog.tanafos_period_error")),
confirm_img: Yup.mixed() confirm_img: Yup.mixed()
.required(t("MachinaryOffice.upload_file_required")) .required(t("MachinaryOffice.upload_file_required"))
.test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => { .test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => {
@@ -104,15 +104,15 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
initialValues: { initialValues: {
description: "", description: "",
proposed_amount: "", proposed_amount: "",
sakht_amount: "", sakht_period: "",
tanafos_amount: "", tanafos_period: "",
confirm_img: null confirm_img: null
}, validationSchema, }, validationSchema,
onSubmit: (values, {setSubmitting}) => { onSubmit: (values, {setSubmitting}) => {
const formData = new FormData(); const formData = new FormData();
formData.append("proposed_amount", values.proposed_amount); formData.append("proposed_amount", values.proposed_amount);
formData.append("sakht_amount", values.sakht_amount); formData.append("sakht_period", values.sakht_period);
formData.append("tanafos_amount", values.tanafos_amount); formData.append("tanafos_period", values.tanafos_period);
if (values.description != "") formData.append("expert_description", values.description); if (values.description != "") formData.append("expert_description", values.description);
if (values.confirm_img != null) formData.append("attachment", values.confirm_img); if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', { requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
@@ -220,49 +220,49 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
</Stack> </Stack>
<Stack> <Stack>
<TextField <TextField
name="sakht_amount" name="sakht_period"
label={t("ConfirmDialog.sakht_amount")} label={t("ConfirmDialog.sakht_period")}
type={'number'} type={'number'}
value={formik.values.sakht_amount} value={formik.values.sakht_period}
onChange={formik.handleChange} onChange={formik.handleChange}
fullWidth fullWidth
variant="outlined" variant="outlined"
sx={{mt: 1}} sx={{mt: 1}}
onBlur={formik.handleBlur("sakht_amount")} onBlur={formik.handleBlur("sakht_period")}
error={ error={
formik.touched.sakht_amount && formik.touched.sakht_period &&
Boolean(formik.errors.sakht_amount) Boolean(formik.errors.sakht_period)
} }
helperText={ helperText={
formik.touched.sakht_amount && formik.errors.sakht_amount formik.touched.sakht_period && formik.errors.sakht_period
} }
InputProps={{ InputProps={{
endAdornment: <InputAdornment endAdornment: <InputAdornment
position="end">{t("ConfirmDialog.sakht_amount_day")}</InputAdornment>, position="end">{t("ConfirmDialog.sakht_period_day")}</InputAdornment>,
}} }}
/> />
</Stack> </Stack>
<Stack> <Stack>
<TextField <TextField
name="tanafos_amount" name="tanafos_period"
label={t("ConfirmDialog.tanafos_amount")} label={t("ConfirmDialog.tanafos_period")}
type={'number'} type={'number'}
value={formik.values.tanafos_amount} value={formik.values.tanafos_period}
onChange={formik.handleChange} onChange={formik.handleChange}
fullWidth fullWidth
variant="outlined" variant="outlined"
sx={{mt: 1}} sx={{mt: 1}}
onBlur={formik.handleBlur("tanafos_amount")} onBlur={formik.handleBlur("tanafos_period")}
error={ error={
formik.touched.tanafos_amount && formik.touched.tanafos_period &&
Boolean(formik.errors.tanafos_amount) Boolean(formik.errors.tanafos_period)
} }
helperText={ helperText={
formik.touched.tanafos_amount && formik.errors.tanafos_amount formik.touched.tanafos_period && formik.errors.tanafos_period
} }
InputProps={{ InputProps={{
endAdornment: <InputAdornment endAdornment: <InputAdornment
position="end">{t("ConfirmDialog.tanafos_amount_month")}</InputAdornment>, position="end">{t("ConfirmDialog.tanafos_period_month")}</InputAdornment>,
}} }}
/> />
</Stack> </Stack>

8
src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -156,13 +156,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.sakht_amount} showNumber={detailsList?.data?.sakht_amount}
headerTitle={t("ConfirmDialog.sakht_amount")} headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_amount_day")} unitTitle={t("ConfirmDialog.sakht_period_day")}
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.tanafos_amount} showNumber={detailsList?.data?.tanafos_amount}
headerTitle={t("ConfirmDialog.tanafos_amount")} headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_amount_month")} unitTitle={t("ConfirmDialog.tanafos_period_month")}
/> />
{renderCustomAccordions()} {renderCustomAccordions()}
</> </>

8
src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -173,13 +173,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.sakht_amount} showNumber={detailsList?.data?.sakht_amount}
headerTitle={t("ConfirmDialog.sakht_amount")} headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_amount_day")} unitTitle={t("ConfirmDialog.sakht_period_day")}
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.tanafos_amount} showNumber={detailsList?.data?.tanafos_amount}
headerTitle={t("ConfirmDialog.tanafos_amount")} headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_amount_month")} unitTitle={t("ConfirmDialog.tanafos_period_month")}
/> />
{renderCustomAccordions()} {renderCustomAccordions()}
</> </>

8
src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -161,13 +161,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.sakht_amount} showNumber={detailsList?.data?.sakht_amount}
headerTitle={t("ConfirmDialog.sakht_amount")} headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_amount_day")} unitTitle={t("ConfirmDialog.sakht_period_day")}
/> />
<NumberShowBox <NumberShowBox
showNumber={detailsList?.data?.tanafos_amount} showNumber={detailsList?.data?.tanafos_amount}
headerTitle={t("ConfirmDialog.tanafos_amount")} headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_amount_month")} unitTitle={t("ConfirmDialog.tanafos_period_month")}
/> />
{renderCustomAccordions()} {renderCustomAccordions()}
</> </>

1
src/core/components/NumberShowBox.jsx
View File

@@ -1,7 +1,6 @@
import {Box, Typography} from "@mui/material"; import {Box, Typography} from "@mui/material";
const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => { const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => {
console.log({showNumber})
return ( return (
<> <>
<Box sx={{border: '1px solid #ccc', p: 2, mb: 2, borderRadius: '8px'}}> <Box sx={{border: '1px solid #ccc', p: 2, mb: 2, borderRadius: '8px'}}>