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

add sakht and tanafos columns in loan history and sync cartables with backend

Browse Source
This commit is contained in:
AminGhasempoor
2023-12-25 11:32:07 +03:30
parent 3077ed1d63
commit 65a1ed2716
7 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,6 +365,8 @@
"tanafos_period_error": "وارد کردن دوره تنفس الزامیست",
"approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد",
"approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
"sakht_period_positive": "دوره ساخت باید مثبت باشد",
"tanafos_period_positive": "دوره تنفس باید مثبت باشد",
"sakht_period_number": "دوره ساخت باید عدد باشد",
"tanafos_period_number": "دوره تنفس باید عدد باشد",
"toman": "میلیون تومان",
@@ -554,6 +556,8 @@
"LoanHistory": {
"id": "کد یکتا",
"name": "نام",
"tanafos_period": "دوره تنفس",
"sakht_period": "دوره ساخت",
"national_id": "کد ملی",
"phone_number": "موبایل",
"proposed_amount": "مبلغ پیشنهادی",

28
src/components/dashboard/loan-history/index.jsx
View File

@@ -167,6 +167,34 @@ function DashboardLoanHistoryComponent() {
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.sakht_period,
id: "sakht_period",
header: t("LoanHistory.sakht_period"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals"
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.tanafos_period,
id: "tanafos_period",
header: t("LoanHistory.tanafos_period"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals"
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.vehicle_type,
id: "vehicle_type",

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

@@ -84,10 +84,12 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
sakht_period: Yup.mixed()
.test("is-number", `${t("ConfirmDialog.sakht_period_number")}`,
(value) => !isNaN(value))
.test("positive", `${t("ConfirmDialog.sakht_period_positive")}`, (value) => value > 0)
.required(t("ConfirmDialog.sakht_period_error")),
tanafos_period: Yup.mixed()
.test("is-number", `${t("ConfirmDialog.tanafos_period_number")}`,
(value) => !isNaN(value))
.test("positive", `${t("ConfirmDialog.tanafos_period_positive")}`, (value) => value > 0)
.required(t("ConfirmDialog.tanafos_period_error")),
confirm_img: Yup.mixed()
.required(t("MachinaryOffice.upload_file_required"))
@@ -117,6 +119,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand
if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
data: formData,
notification: true
}).then((response) => {
setOpenConfirmDialog(false)
mutate()

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

@@ -90,6 +90,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
requestServer(`${CONFIRM_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', {
data: formData,
notification: true
}).then((response) => {
setOpenConfirmDialog(false)
mutate()
@@ -155,12 +156,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={detailsList?.data?.sakht_amount}
showNumber={detailsList?.data?.sakht_period}
headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_period_day")}
/>
<NumberShowBox
showNumber={detailsList?.data?.tanafos_amount}
showNumber={detailsList?.data?.tanafos_period}
headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_period_month")}
/>

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

@@ -47,6 +47,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false);
setAccordionStates(booleanData);
setDetailsData(response.data)
console.log(response.data.data)
})
.catch(() => {
}).finally(() => {
@@ -105,6 +106,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', {
data: formData,
notification: true
}).then((response) => {
setOpenConfirmDialog(false)
mutate()
@@ -172,12 +174,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={detailsList?.data?.sakht_amount}
showNumber={detailsList?.data?.sakht_period}
headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_period_day")}
/>
<NumberShowBox
showNumber={detailsList?.data?.tanafos_amount}
showNumber={detailsList?.data?.tanafos_period}
headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_period_month")}
/>

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

@@ -96,6 +96,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', {
data: formData,
notification: true
}).then((response) => {
setOpenConfirmDialog(false)
mutate()
@@ -160,12 +161,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={detailsList?.data?.sakht_amount}
showNumber={detailsList?.data?.sakht_period}
headerTitle={t("ConfirmDialog.sakht_period")}
unitTitle={t("ConfirmDialog.sakht_period_day")}
/>
<NumberShowBox
showNumber={detailsList?.data?.tanafos_amount}
showNumber={detailsList?.data?.tanafos_period}
headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_period_month")}
/>

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

@@ -7,7 +7,7 @@ const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => {
<Typography
sx={{color: "primary.main", fontWeight: 500}}>{headerTitle}</Typography>
<Typography pt={1}>
{isNaN(showNumber)
{isNaN(showNumber) || showNumber === null
? ""
: (showNumber).toLocaleString()}{" "}
{unitTitle}