From 38dbd1c1412a612fd18104c283ebd957b6da0b4d Mon Sep 17 00:00:00 2001 From: baslani Date: Mon, 26 Jan 2026 16:53:24 +0330 Subject: [PATCH] minor folder structure change --- .../road-missions/reports/missionsReports/page.js | 2 +- .../ExcelPrint/index.jsx | 0 .../MissionsReportLists.jsx | 4 ++-- .../Search/FromDateController.jsx | 0 .../Search/SearchReportField.jsx | 0 .../Search/SelectProvince.jsx | 0 .../Search/ToDateController.jsx | 0 .../Search/index.jsx | 0 .../{missionsReports => taradodReports}/Toolbar.jsx | 0 .../{missionsReports => taradodReports}/index.jsx | 13 +++++++------ 10 files changed, 10 insertions(+), 9 deletions(-) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/ExcelPrint/index.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/MissionsReportLists.jsx (97%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Search/FromDateController.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Search/SearchReportField.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Search/SelectProvince.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Search/ToDateController.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Search/index.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/Toolbar.jsx (100%) rename src/components/dashboard/roadMissions/reports/{missionsReports => taradodReports}/index.jsx (93%) diff --git a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js index 7a6bc58..0fae9c1 100644 --- a/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js +++ b/src/app/(withAuth)/(dashboardLayout)/dashboard/road-missions/reports/missionsReports/page.js @@ -1,5 +1,5 @@ import WithPermission from "@/core/middlewares/withPermission"; -import MissionsReportPage from "@/components/dashboard/roadMissions/reports/missionsReports"; +import MissionsReportPage from "@/components/dashboard/roadMissions/reports/taradodReports"; export const metadata = { title: "کارتابل گزارش ترددها", }; diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/ExcelPrint/index.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/ExcelPrint/index.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/MissionsReportLists.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx similarity index 97% rename from src/components/dashboard/roadMissions/reports/missionsReports/MissionsReportLists.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx index 3aa0277..8c43f20 100644 --- a/src/components/dashboard/roadMissions/reports/missionsReports/MissionsReportLists.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/MissionsReportLists.jsx @@ -4,7 +4,7 @@ import { Box } from "@mui/material"; import { useEffect, useMemo } from "react"; import Toolbar from "./Toolbar"; -const MissionsReportLists = ({ data, specialFilter }) => { +const TaradodReportLists = ({ data, specialFilter }) => { useEffect(() => { console.log(data); }, [data]); @@ -138,4 +138,4 @@ const MissionsReportLists = ({ data, specialFilter }) => { ); }; -export default MissionsReportLists; +export default TaradodReportLists; diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Search/FromDateController.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Search/FromDateController.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Search/SearchReportField.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Search/SearchReportField.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Search/SelectProvince.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Search/SelectProvince.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Search/ToDateController.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Search/ToDateController.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Search/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Search/index.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Search/index.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx similarity index 100% rename from src/components/dashboard/roadMissions/reports/missionsReports/Toolbar.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/Toolbar.jsx diff --git a/src/components/dashboard/roadMissions/reports/missionsReports/index.jsx b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx similarity index 93% rename from src/components/dashboard/roadMissions/reports/missionsReports/index.jsx rename to src/components/dashboard/roadMissions/reports/taradodReports/index.jsx index c92face..0a8609b 100644 --- a/src/components/dashboard/roadMissions/reports/missionsReports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/taradodReports/index.jsx @@ -13,20 +13,21 @@ import moment from "jalali-moment"; import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import * as yup from "yup"; -import MissionsReportLists from "./MissionsReportLists"; +import TaradodReportLists from "./MissionsReportLists"; import SearchReportList from "./Search"; -const MissionsReportPage = () => { +const TaradodReportPage = () => { const [data, setData] = useState(null); const { data: userPermissions } = usePermissions(); const { user } = useAuth(); const requestServer = useRequest(); + const [provinceId, setProvinceId] = useState(user.province_id || "-1"); // const hasProvincesPermission = userPermissions?.includes("mission-report-country"); const defaultValues = { from_date: moment(new Date()).format("YYYY-MM-DD"), date_to: moment(new Date()).format("YYYY-MM-DD"), - province_id: user.province_id || "-1", + province_id: provinceId, }; const defaultFilter = [ { value: `${defaultValues.province_id}`, datatype: "numeric", id: "province_id", fn: "equals" }, @@ -127,15 +128,15 @@ const MissionsReportPage = () => { return ( - + - {!data ? : } + {!data ? : } ); }; -export default MissionsReportPage; +export default TaradodReportPage;