From dfa26ace1d052d00e75fb51dcc469f6a48992cf7 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 10 Dec 2023 16:28:35 +0330 Subject: [PATCH 1/2] add approved and proposed column to refer pages and tables and update loan history page texts --- public/locales/fa/app.json | 18 +++++- .../dashboard/loan-history/index.jsx | 56 ++++++++++++++++--- .../navgan-province-manager/index.jsx | 38 +++++++++++++ .../dashboard/passenger-boss/index.jsx | 19 +++++++ .../transportation-assistance/index.jsx | 38 +++++++++++++ 5 files changed, 159 insertions(+), 10 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 5088829..d94082a 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -191,6 +191,8 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -206,6 +208,7 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -282,6 +285,8 @@ "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -537,6 +542,17 @@ "update_again": "بروزرسانی مجدد" }, "LoanHistory": { + "id": "کد یکتا", + "name": "نام", + "national_id": "کد ملی", + "phone_number": "موبایل", + "proposed_amount": "مبلغ پیشنهادی", + "approved_amount": "مبلغ مصوب", + "created_at": "تاریخ درخواست", + "updated_at": "تاریخ بروزرسانی", + "navgan_id": "کد ناوگان", + "vehicle_type": "نوع ماشین", + "state_name": "وضعیت درخواست", "history": "تاریخچه", "Table_history_error": "خطا در دریافت اطلاعات", "history_report": "فایل ضمیمه", @@ -547,4 +563,4 @@ "Table_head_file": "فایل پیوست", "empty_history_detail": "سابقه ای برای این وام وجود ندارد" } -} +} \ No newline at end of file diff --git a/src/components/dashboard/loan-history/index.jsx b/src/components/dashboard/loan-history/index.jsx index c2bb293..66f28de 100644 --- a/src/components/dashboard/loan-history/index.jsx +++ b/src/components/dashboard/loan-history/index.jsx @@ -14,7 +14,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.id, id: "id", - header: t("PassengerOffice.id"), + header: t("LoanHistory.id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -33,7 +33,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.name, id: "name", - header: t("MachinaryOffice.name"), + header: t("LoanHistory.name"), enableColumnFilter: true, datatype: "text", filterFn: "contains", @@ -45,7 +45,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.national_id, id: "national_id", - header: t("MachinaryOffice.national_id"), + header: t("LoanHistory.national_id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -64,7 +64,45 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.phone_number, id: "phone_number", - header: t("MachinaryOffice.phone_number"), + header: t("LoanHistory.phone_number"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("LoanHistory.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("LoanHistory.approved_amount"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -84,7 +122,7 @@ function DashboardLoanHistoryComponent() { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), id: "created_at", - header: t("MachinaryOffice.created_at"), + header: t("LoanHistory.created_at"), enableColumnFilter: true, datatype: "date", filterFn: "lessThan", @@ -103,7 +141,7 @@ function DashboardLoanHistoryComponent() { accessorFn: (row) => moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), id: "updated_at", - header: t("MachinaryOffice.updated_at"), + header: t("LoanHistory.updated_at"), enableColumnFilter: false, datatype: "numeric", Cell: ({renderedCellValue}) => ( @@ -113,7 +151,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.navgan_id, id: "navgan_id", - header: t("MachinaryOffice.navgan_id"), + header: t("LoanHistory.navgan_id"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -132,7 +170,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.vehicle_type, id: "vehicle_type", - header: t("MachinaryOffice.vehicle_type"), + header: t("LoanHistory.vehicle_type"), enableColumnFilter: true, datatype: "text", filterFn: "contains", @@ -144,7 +182,7 @@ function DashboardLoanHistoryComponent() { { accessorFn: (row) => row.state_name, id: "state_id", - header: t("MachinaryOffice.state_name"), + header: t("LoanHistory.state_name"), enableColumnFilter: false, datatype: "numeric", Cell: ({renderedCellValue}) => ( diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx index 0397fc5..4e2a9ed 100644 --- a/src/components/dashboard/navgan-province-manager/index.jsx +++ b/src/components/dashboard/navgan-province-manager/index.jsx @@ -82,6 +82,44 @@ function DashboardNavganProvinceManagerComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("NavganProvinceManager.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("NavganProvinceManager.approved_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 1a13b3b..13674dc 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -82,6 +82,25 @@ function DashboardPassengerOfficeComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("PassengerBoss.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index a1cdae0..b0acd92 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -82,6 +82,44 @@ function DashboardTransportationAssistanceComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.proposed_amount, + id: "proposed_amount", + header: t("TransportationAssistance.proposed_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.approved_amount, + id: "approved_amount", + header: t("TransportationAssistance.approved_amount"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), From 55707b4b3968ab96ab7e165e9a1727755a71fea0 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 10 Dec 2023 16:56:59 +0330 Subject: [PATCH 2/2] update confirm modal of transportation assistant --- public/locales/fa/app.json | 8 +-- .../Form/ConfirmForm/ConfirmContent.jsx | 54 +++++++++++-------- .../transportation-assistance/index.jsx | 2 +- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index d94082a..439f259 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -192,7 +192,7 @@ "national_id": "کد ملی", "phone_number": "موبایل", "proposed_amount": "مبلغ پیشنهادی", - "approved_amount": "مبلغ مصوب", + "approved_amount": "مبلغ تصویب شده", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -286,7 +286,7 @@ "national_id": "کد ملی", "phone_number": "موبایل", "proposed_amount": "مبلغ پیشنهادی", - "approved_amount": "مبلغ مصوب", + "approved_amount": "مبلغ تصویب شده", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", @@ -362,7 +362,7 @@ "approved_amount_number": "مبلغ تصویب شده باید عدد باشد", "toman": "میلیون تومان", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", - "proposed_amount": "مقدار پیشنهادی", + "proposed_amount": "مبلغ پیشنهادی", "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد", "proposed_amount_number": "مقدار پیشنهادی باید عدد باشد" }, @@ -547,7 +547,7 @@ "national_id": "کد ملی", "phone_number": "موبایل", "proposed_amount": "مبلغ پیشنهادی", - "approved_amount": "مبلغ مصوب", + "approved_amount": "مبلغ تصویب شده", "created_at": "تاریخ درخواست", "updated_at": "تاریخ بروزرسانی", "navgan_id": "کد ناوگان", diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 076af16..833bdf6 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -6,7 +6,9 @@ import { Button, DialogActions, DialogContent, - FormHelperText, Grid, LinearProgress, + FormHelperText, + Grid, + LinearProgress, Stack, TextField, Typography @@ -18,13 +20,14 @@ import {useEffect, useState} from "react"; import * as Yup from "yup"; import CustomAccordion from "@/core/components/CustomAccordion"; import ImageContent from "@/core/components/ImageContent"; -const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeClick}) => { + +const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeClick}) => { const t = useTranslations(); const [selectedImage, setSelectedImage] = useState(""); const [fileType, setfileType] = useState(null); const [fileName, setfileName] = useState(null); const [showAddIcon, setShowAddIcon] = useState(true); - const requestServer = useRequest({auth: true , notification: false}) + const requestServer = useRequest({auth: true, notification: false}) const [accordionStates, setAccordionStates] = useState([]); const [hasAccordionOpened, setHasAccordionOpened] = useState([]); const {update_notification} = useNotification(); @@ -37,14 +40,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl useEffect(() => { requestServer(`${GET_TRANSPORTATION_ASSISTANCE_DETAILS}/${rowId}`, 'get') .then((response) => { - const booleanData = Array.from({ length: response.data.data.attachment_files.length }, () => false); - setAccordionStates(booleanData); - setHasAccordionOpened(booleanData); - setDetailsData(response.data) + const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false); + setAccordionStates(booleanData); + setHasAccordionOpened(booleanData); + setDetailsData(response.data) }) .catch(() => { }).finally(() => { - setLoading(false); + setLoading(false); }); }, []); @@ -52,13 +55,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false); setAccordionStates(newAccordionStates); - if (!newAccordionStates[index]) - { + if (!newAccordionStates[index]) { handleSizeChangeClick('sm'); setHasImageShown(false); setIsSkeleton(false) - } - else { + } else { handleSizeChangeClick('xl'); setHasImageShown(true); setImageLink(detailsList.data.attachment_files[index]) @@ -144,8 +145,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl const numberShowBox = () => { return ( <> - - {t("ConfirmDialog.approved_amount")} {t("sidebar.machinery-expert")} + + {t("ConfirmDialog.proposed_amount")} {t("sidebar.machinery-expert")} {isNaN((detailsList?.data?.proposed_amount) / 10) ? "" @@ -153,8 +157,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl {t("ConfirmDialog.unit")} - - {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")} + + {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")} {isNaN((detailsList?.data?.approved_amount) / 10) ? "" @@ -170,7 +177,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl - {loading ? : + {loading ? : <> {numberShowBox()} {renderCustomAccordions()} @@ -220,9 +227,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl - - - + + + @@ -233,7 +245,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index b0acd92..2ff3796 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -85,7 +85,7 @@ function DashboardTransportationAssistanceComponent() { { accessorFn: (row) => row.proposed_amount, id: "proposed_amount", - header: t("TransportationAssistance.proposed_amount"), + header: `${t("TransportationAssistance.proposed_amount")}`, enableColumnFilter: true, datatype: "numeric", filterFn: "equals",