Merge branch 'feature/amount_unit_debugging' into 'develop'

Mohammad - Feature/amount unit debugging

See merge request witel-front-end/loan-facilities/expert!133
This commit is contained in:
AmirHossein Mahmoodi
2024-01-02 08:45:13 +00:00
5 changed files with 20 additions and 12 deletions

View File

@@ -6,6 +6,7 @@
"first_page": "خوش آمدید",
"login": "ورود",
"login_expert": "ورود کارشناس",
"update_table": "بروزرسانی",
"expert": "کارشناس",
"last_updated_at": "آخرین بروزرسانی",
"filter_mode": "حالت فیلتر",

View File

@@ -169,12 +169,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 10}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>

View File

@@ -133,8 +133,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
if (values.description != "") formData.append("expert_description", values.description);
const attachments = [
{ title: 'فرم الف', file: values.first_img },
{ title: 'فرم ب', file: values.second_img }
{title: 'فرم الف', file: values.first_img},
{title: 'فرم ب', file: values.second_img}
];
attachments.forEach((attachment, index) => {
@@ -142,7 +142,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
formData.append(`attachment[${index}][file]`, attachment.file);
});
requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post',{
requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', {
notification: true,
data: formData,
}).then((response) => {
@@ -220,7 +220,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>

View File

@@ -2,10 +2,11 @@ import UploadSystem from "@/core/components/UploadSystem";
import useNotification from "@/lib/app/hooks/useNotification";
import useRequest from "@/lib/app/hooks/useRequest";
import {
Box,
Button, Checkbox,
Button,
Checkbox,
DialogActions,
DialogContent, FormControlLabel,
DialogContent,
FormControlLabel,
FormHelperText,
Grid,
LinearProgress,
@@ -179,12 +180,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 10}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>

View File

@@ -3,9 +3,10 @@ import useLanguage from "@/lib/app/hooks/useLanguage";
import {useEffect, useMemo, useState} from "react";
import moment from "moment-jalaali";
import useSWR from "swr";
import {Typography} from "@mui/material";
import {IconButton, Tooltip, Typography} from "@mui/material";
import MaterialReactTable from "material-react-table";
import useRequest from "@/lib/app/hooks/useRequest";
import RefreshIcon from '@mui/icons-material/Refresh';
function DataTable(props) {
const requestServer = useRequest({auth: true})
@@ -116,6 +117,11 @@ function DataTable(props) {
<props.CustomToolbar
table={table}
mutate={mutate}/> /* send component */ : <span></span>}
<Tooltip arrow title={t("update_table")} sx={{ml: "auto"}}>
<IconButton onClick={() => mutate()}>
<RefreshIcon/>
</IconButton>
</Tooltip>
</>)}
renderBottomToolbarCustomActions={({table}) => (<>
{props.enableLastUpdate /* send condition */ ? (<Typography