From 9754d19f879678ec2b2bb80f4514f605ee437868 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 8 Jan 2024 11:15:50 +0330 Subject: [PATCH 1/5] restructured plate number column in data table --- .../dashboard/loan-history/index.jsx | 22 +++++++++++++++++-- .../dashboard/machinary-office/index.jsx | 22 +++++++++++++++++-- .../navgan-loan-management/index.jsx | 22 +++++++++++++++++-- .../navgan-province-manager/index.jsx | 22 +++++++++++++++++-- .../dashboard/passenger-boss/index.jsx | 22 +++++++++++++++++-- .../transportation-assistance/index.jsx | 22 +++++++++++++++++-- 6 files changed, 120 insertions(+), 12 deletions(-) diff --git a/src/components/dashboard/loan-history/index.jsx b/src/components/dashboard/loan-history/index.jsx index 0d8bee8..8fe4bed 100644 --- a/src/components/dashboard/loan-history/index.jsx +++ b/src/components/dashboard/loan-history/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_LOAN_HISTORY} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -267,7 +267,25 @@ function DashboardLoanHistoryComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx index 256ca87..dbf72f0 100644 --- a/src/components/dashboard/machinary-office/index.jsx +++ b/src/components/dashboard/machinary-office/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_MACHINARY_OFFICE} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -267,7 +267,25 @@ function DashboardMachinaryOfficeComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { diff --git a/src/components/dashboard/navgan-loan-management/index.jsx b/src/components/dashboard/navgan-loan-management/index.jsx index d049e01..6c4b8f6 100644 --- a/src/components/dashboard/navgan-loan-management/index.jsx +++ b/src/components/dashboard/navgan-loan-management/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_LOAN_MANAGEMENT_NAVGAN} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -268,7 +268,25 @@ function DashboardNavganLoanManagementComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx index fc8fcef..ea4a568 100644 --- a/src/components/dashboard/navgan-province-manager/index.jsx +++ b/src/components/dashboard/navgan-province-manager/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_NAVGAN_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -211,7 +211,25 @@ function DashboardNavganProvinceManagerComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 0da7cc0..8932e19 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_PASSENGER_BOSS} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -268,7 +268,25 @@ function DashboardPassengerOfficeComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index 46ad2b6..2890c68 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -1,4 +1,4 @@ -import {Box, Typography} from "@mui/material"; +import {Box, Stack, Typography} from "@mui/material"; import {useMemo} from "react"; import {GET_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes"; import {useTranslations} from "next-intl"; @@ -211,7 +211,25 @@ function DashboardTransportationAssistanceComponent() { filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( - {renderedCellValue} + + + {renderedCellValue.split('-')[3]} + + + {renderedCellValue.split('-')[2]} + {renderedCellValue.split('-')[1]} + {renderedCellValue.split('-')[0]} + + ), }, { From 3d8ebb1845264d1f000f905423b4724dff6a9456 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 8 Jan 2024 13:38:05 +0330 Subject: [PATCH 2/5] rename excels and some cartables --- public/locales/fa/app.json | 12 ++++++------ .../dashboard/loan-history/Buttons/printExcel.jsx | 2 +- .../machinary-office/Buttons/printExcel.jsx | 2 +- .../navgan-loan-management/Buttons/printExcel.jsx | 2 +- .../navgan-province-manager/Buttons/printExcel.jsx | 2 +- .../dashboard/passenger-boss/Buttons/printExcel.jsx | 2 +- .../transportation-assistance/Buttons/printExcel.jsx | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index f4caa9c..4971af5 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -46,11 +46,11 @@ "passenger-office-chief": "اداره مسافر", "machinery-expert": "کارتابل کارشناسی", "passenger-boss": "کارتابل کارگروه", - "transportation-assistant": "بررسی وام های تبصره 18", - "navgan-province-manager": "بررسی وام های تبصره 18", + "transportation-assistant": "کارتابل بررسی وام های تبصره 18", + "navgan-province-manager": "کارتابل بررسی وام های تبصره 18", "refahi-province-manager": "مدیر کل استانی", "refahi-loan-management": "مدیریت وام", - "navgan-loan-management": "مدیریت وام", + "navgan-loan-management": "کارتابل مدیریت وام", "commercial-chief": "رئیس اداره بازرگانی", "inspector-expert": "بازدید کارشناس", "province-head-expert": "کارشناس ستادی", @@ -106,12 +106,12 @@ "dashboard_page": "داشبورد", "reports": "گزارشات", "passenger_boss_page": "کارتابل کارگروه", - "transportation_assistance": "بررسی وام های تبصره 18", + "transportation_assistance": "کارتابل بررسی وام های تبصره 18", "change_password": "تغییر رمز عبور", - "province_manager_page": "بررسی وام های تبصره 18", + "province_manager_page": "کارتابل بررسی وام های تبصره 18", "province_head_expert": "کارشناس ستادی", "passenger_office_page": "اداره مسافر", - "loan_management_page": "مدیریت وام", + "loan_management_page": "کارتابل مدیریت وام", "machinary_office_page": "کارتابل کارشناسی", "development_assistant_page": "معاون توسعه", "inspector_expert_page": "بازدید کارشناس", diff --git a/src/components/dashboard/loan-history/Buttons/printExcel.jsx b/src/components/dashboard/loan-history/Buttons/printExcel.jsx index e99111d..914e72f 100644 --- a/src/components/dashboard/loan-history/Buttons/printExcel.jsx +++ b/src/components/dashboard/loan-history/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش وام ها تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل نظارت تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/machinary-office/Buttons/printExcel.jsx b/src/components/dashboard/machinary-office/Buttons/printExcel.jsx index 221e6b3..f1333e0 100644 --- a/src/components/dashboard/machinary-office/Buttons/printExcel.jsx +++ b/src/components/dashboard/machinary-office/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش ماشین آلات تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل کارشناسی تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/navgan-loan-management/Buttons/printExcel.jsx b/src/components/dashboard/navgan-loan-management/Buttons/printExcel.jsx index 45183f7..ee6d336 100644 --- a/src/components/dashboard/navgan-loan-management/Buttons/printExcel.jsx +++ b/src/components/dashboard/navgan-loan-management/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش مدیریت وام ها تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل مدیریت وام ها تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/navgan-province-manager/Buttons/printExcel.jsx b/src/components/dashboard/navgan-province-manager/Buttons/printExcel.jsx index e35c61d..409f73d 100644 --- a/src/components/dashboard/navgan-province-manager/Buttons/printExcel.jsx +++ b/src/components/dashboard/navgan-province-manager/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش مدیر کل استانی تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل بررسی وام های تبصره 18 تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/passenger-boss/Buttons/printExcel.jsx b/src/components/dashboard/passenger-boss/Buttons/printExcel.jsx index b8e7e45..1f34df8 100644 --- a/src/components/dashboard/passenger-boss/Buttons/printExcel.jsx +++ b/src/components/dashboard/passenger-boss/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش کارگروه استانی تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل کارگروه تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { diff --git a/src/components/dashboard/transportation-assistance/Buttons/printExcel.jsx b/src/components/dashboard/transportation-assistance/Buttons/printExcel.jsx index bfce213..a96b429 100644 --- a/src/components/dashboard/transportation-assistance/Buttons/printExcel.jsx +++ b/src/components/dashboard/transportation-assistance/Buttons/printExcel.jsx @@ -40,7 +40,7 @@ const PrintExcel = ({table}) => { auth: true, requestOptions: {responseType: 'blob'} }).then((response) => { - const filename = `گزارش معاونت حمل و نقل تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; + const filename = `خروجی کارتابل بررسی وام های تبصره 18 تاریخ_${moment().format('jYYYY_jMM_jDD')}.xlsx`; FileSaver.saveAs(response.data, filename); }).catch(() => { }).finally(() => { From 031719de492f9609a5921ebb044b358a24168f53 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 8 Jan 2024 15:28:57 +0330 Subject: [PATCH 3/5] excels and some cartables --- public/locales/fa/app.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 4971af5..f4caa9c 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -46,11 +46,11 @@ "passenger-office-chief": "اداره مسافر", "machinery-expert": "کارتابل کارشناسی", "passenger-boss": "کارتابل کارگروه", - "transportation-assistant": "کارتابل بررسی وام های تبصره 18", - "navgan-province-manager": "کارتابل بررسی وام های تبصره 18", + "transportation-assistant": "بررسی وام های تبصره 18", + "navgan-province-manager": "بررسی وام های تبصره 18", "refahi-province-manager": "مدیر کل استانی", "refahi-loan-management": "مدیریت وام", - "navgan-loan-management": "کارتابل مدیریت وام", + "navgan-loan-management": "مدیریت وام", "commercial-chief": "رئیس اداره بازرگانی", "inspector-expert": "بازدید کارشناس", "province-head-expert": "کارشناس ستادی", @@ -106,12 +106,12 @@ "dashboard_page": "داشبورد", "reports": "گزارشات", "passenger_boss_page": "کارتابل کارگروه", - "transportation_assistance": "کارتابل بررسی وام های تبصره 18", + "transportation_assistance": "بررسی وام های تبصره 18", "change_password": "تغییر رمز عبور", - "province_manager_page": "کارتابل بررسی وام های تبصره 18", + "province_manager_page": "بررسی وام های تبصره 18", "province_head_expert": "کارشناس ستادی", "passenger_office_page": "اداره مسافر", - "loan_management_page": "کارتابل مدیریت وام", + "loan_management_page": "مدیریت وام", "machinary_office_page": "کارتابل کارشناسی", "development_assistant_page": "معاون توسعه", "inspector_expert_page": "بازدید کارشناس", From 45d3a876d70da359f31071f1cd99250029d9d077 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Tue, 9 Jan 2024 11:19:34 +0330 Subject: [PATCH 4/5] change version --- example.env.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.env.local b/example.env.local index ccb6c4d..28986c5 100644 --- a/example.env.local +++ b/example.env.local @@ -1,5 +1,5 @@ NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard" -NEXT_PUBLIC_API_VERSION = "1.28.0" +NEXT_PUBLIC_API_VERSION = "1.28.1" NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa" NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl" From 0d2d4b0706be52e16e2365fb9c6c5f4742d902f1 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Tue, 9 Jan 2024 12:16:32 +0330 Subject: [PATCH 5/5] fixed bug --- src/components/dashboard/first/index.jsx | 162 +++++++++++------------ 1 file changed, 79 insertions(+), 83 deletions(-) diff --git a/src/components/dashboard/first/index.jsx b/src/components/dashboard/first/index.jsx index aec8ed5..43b6c87 100644 --- a/src/components/dashboard/first/index.jsx +++ b/src/components/dashboard/first/index.jsx @@ -1,94 +1,90 @@ import FullPageLayout from "@/layouts/FullPageLayout"; import CenterLayout from "@/layouts/CenterLayout"; -import { Box, Divider, Stack, Typography } from "@mui/material"; -import { useEffect, useState } from "react"; +import {Box, Divider, Stack, Typography} from "@mui/material"; +import {useEffect, useState} from "react"; import useRequest from "@/lib/app/hooks/useRequest"; const DashboardFirstComponent = () => { - const requestServer = useRequest({ auth: true, notification: false }); - const [data, setData] = useState(null); + const requestServer = useRequest({auth: true, notification: false}); + const [data, setData] = useState(null); - useEffect(() => { - requestServer( - `${process.env.NEXT_PUBLIC_BASE_URL}/dashboard/reports/navgan/statistics`, - "get" - ) - .then((res) => { - setData(res.data.data); - }) - .catch(() => {}); - }, []); + useEffect(() => { + requestServer(`${process.env.NEXT_PUBLIC_BASE_URL}/dashboard/reports/navgan/statistics`, "get") + .then((res) => { + setData(res.data.data); + }) + .catch(() => { + }); + }, []); - if (!data) return ""; + if (!data) return ""; - return ( - <> - - - - وام های واجد شرایط - - تعداد کل - - {Number(data.totalApprovedLoans).toLocaleString("en")} - - - وام های پیشنهادی - - تعداد کل - - {Number(data.proposedCount).toLocaleString("en")} - - - - مبلغ کل (میلیون ریال) - - {Number(data.totalProposedAmount).toLocaleString("en")} - - - وام های تصویب شده - - تعداد کل - - {Number(data.approvedCount).toLocaleString("en")} - - - - مبلغ کل (میلیون ریال) - - {Number(data.totalApprovedAmount).toLocaleString("en")} - - - - - - - ); + return (<> + + + + وام های واجد شرایط + + تعداد کل + + {Number(data.totalApprovedLoans).toLocaleString("en")} + + + وام های پیشنهادی + + تعداد کل + + {Number(data.proposedCount).toLocaleString("en")} + + + + مبلغ کل (میلیون ریال) + + {Number(data.totalProposedAmount / 1000000).toLocaleString("en")} + + + وام های تصویب شده + + تعداد کل + + {Number(data.approvedCount).toLocaleString("en")} + + + + مبلغ کل (میلیون ریال) + + {Number(data.totalApprovedAmount / 1000000).toLocaleString("en")} + + + + + + ); }; export default DashboardFirstComponent; \ No newline at end of file