From 7cf54b2441495c0079c227d6df46775b7bf8ff9f Mon Sep 17 00:00:00 2001 From: baslani Date: Mon, 29 Dec 2025 10:36:36 +0330 Subject: [PATCH] cleaned up and commented excel print --- jsconfig.json | 38 +++++++++---------- .../reports/Search/FromDateController.jsx | 3 +- .../reports/Search/SearchReportField.jsx | 9 ++--- .../reports/Search/SelectProvince.jsx | 6 +-- .../reports/Search/ToDateController.jsx | 4 +- .../roadMissions/reports/Toolbar.jsx | 6 +-- .../dashboard/roadMissions/reports/index.jsx | 1 + src/core/utils/pageMenu.js | 18 ++++----- src/core/utils/pageMenuDev.js | 18 ++++----- 9 files changed, 48 insertions(+), 55 deletions(-) diff --git a/jsconfig.json b/jsconfig.json index b51472a..c136578 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,27 +1,27 @@ // javascript for production -{ - "compilerOptions": { - "paths": { - "@/*": ["./src/*"], - "^/*": ["./public/*"] - } - } -} - -// typescript for local development // { // "compilerOptions": { -// "jsx": "react-jsx", -// "noUnusedLocals": true, -// "noImplicitAny": false, -// "checkJs": true, -// "allowJs": true, -// "strict": true, -// "baseUrl": ".", // "paths": { // "@/*": ["./src/*"], // "^/*": ["./public/*"] // } -// }, -// "exclude": ["node_modules"] +// } // } + +// typescript for local development +{ + "compilerOptions": { + "jsx": "react-jsx", + "noUnusedLocals": true, + "noImplicitAny": false, + "checkJs": true, + "allowJs": true, + "strict": true, + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"], + "^/*": ["./public/*"] + } + }, + "exclude": ["node_modules"] +} diff --git a/src/components/dashboard/roadMissions/reports/Search/FromDateController.jsx b/src/components/dashboard/roadMissions/reports/Search/FromDateController.jsx index 45002e1..0a81488 100644 --- a/src/components/dashboard/roadMissions/reports/Search/FromDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/Search/FromDateController.jsx @@ -1,7 +1,6 @@ -import { Controller } from "react-hook-form"; import MuiDatePicker from "@/core/components/MuiDatePicker"; -import React from "react"; import moment from "jalali-moment"; +import { Controller } from "react-hook-form"; const FromDateController = ({ control }) => { return ( diff --git a/src/components/dashboard/roadMissions/reports/Search/SearchReportField.jsx b/src/components/dashboard/roadMissions/reports/Search/SearchReportField.jsx index 5c6aa23..e1b71cd 100644 --- a/src/components/dashboard/roadMissions/reports/Search/SearchReportField.jsx +++ b/src/components/dashboard/roadMissions/reports/Search/SearchReportField.jsx @@ -1,10 +1,9 @@ -import { Button, Grid, LinearProgress, Typography } from "@mui/material"; import SearchIcon from "@mui/icons-material/Search"; -import React from "react"; -import FromDateController from "./FromDateController"; -import ToDateController from "./ToDateController"; -import SelectProvince from "./SelectProvince"; +import { Button, Grid } from "@mui/material"; import { Controller } from "react-hook-form"; +import FromDateController from "./FromDateController"; +import SelectProvince from "./SelectProvince"; +import ToDateController from "./ToDateController"; const SearchReportField = ({ control, hasProvincesPermission }) => { return ( diff --git a/src/components/dashboard/roadMissions/reports/Search/SelectProvince.jsx b/src/components/dashboard/roadMissions/reports/Search/SelectProvince.jsx index 7f738bc..89395f0 100644 --- a/src/components/dashboard/roadMissions/reports/Search/SelectProvince.jsx +++ b/src/components/dashboard/roadMissions/reports/Search/SelectProvince.jsx @@ -1,8 +1,6 @@ -import { Controller } from "react-hook-form"; -import MuiDatePicker from "@/core/components/MuiDatePicker"; -import React from "react"; -import { FormControl, FormHelperText, InputLabel, LinearProgress, MenuItem, Select, Typography } from "@mui/material"; import useProvinces from "@/lib/hooks/useProvince"; +import { FormControl, FormHelperText, InputLabel, MenuItem, Select } from "@mui/material"; +import { Controller } from "react-hook-form"; const SelectProvince = ({ control }) => { const { provinces, loadingProvinces, errorProvinces } = useProvinces(); diff --git a/src/components/dashboard/roadMissions/reports/Search/ToDateController.jsx b/src/components/dashboard/roadMissions/reports/Search/ToDateController.jsx index 4b5f2a8..9b9ac81 100644 --- a/src/components/dashboard/roadMissions/reports/Search/ToDateController.jsx +++ b/src/components/dashboard/roadMissions/reports/Search/ToDateController.jsx @@ -1,7 +1,6 @@ -import { Controller, useWatch } from "react-hook-form"; import MuiDatePicker from "@/core/components/MuiDatePicker"; -import React from "react"; import moment from "jalali-moment"; +import { Controller, useWatch } from "react-hook-form"; const ToDateController = ({ control }) => { const minDate = useWatch({ control, name: "from_date" }); @@ -13,6 +12,7 @@ const ToDateController = ({ control }) => { { - return ( - - - - ); + return {/* */}; }; export default Toolbar; diff --git a/src/components/dashboard/roadMissions/reports/index.jsx b/src/components/dashboard/roadMissions/reports/index.jsx index 83daf1a..2477da8 100644 --- a/src/components/dashboard/roadMissions/reports/index.jsx +++ b/src/components/dashboard/roadMissions/reports/index.jsx @@ -118,6 +118,7 @@ const ReportPage = () => { resolver: yupResolver(validationSchema), mode: "all", }); + return ( diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index 97c7001..08f09f0 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -159,15 +159,15 @@ export const pageMenu = [ // badges: [{ key: "mission.control" }], // TODO: add badge and permission permissions: ["all"], }, - // { - // id: "roadMissionsReports", - // label: "گزارشات", - // type: "page", - // route: "/dashboard/road-missions/reports", - // icon: , - // // badges: [{ key: "mission.control" }], // TODO: add badge and permission - // permissions: ["all"], - // }, + { + id: "roadMissionsReports", + label: "گزارشات", + type: "page", + route: "/dashboard/road-missions/reports", + icon: , + // badges: [{ key: "mission.control" }], // TODO: add badge and permission + permissions: ["all"], + }, ], }, { diff --git a/src/core/utils/pageMenuDev.js b/src/core/utils/pageMenuDev.js index 90ae25f..f78fffe 100644 --- a/src/core/utils/pageMenuDev.js +++ b/src/core/utils/pageMenuDev.js @@ -158,15 +158,15 @@ export const pageMenuDev = [ // badges: [{ key: "mission.control" }], // TODO: add badge and permission permissions: ["all"], }, - // { - // id: "roadMissionsReports", - // label: "گزارشات", - // type: "page", - // route: "/dashboard/road-missions/reports", - // icon: , - // // badges: [{ key: "mission.control" }], // TODO: add badge and permission - // permissions: ["all"], - // }, + { + id: "roadMissionsReports", + label: "گزارشات", + type: "page", + route: "/dashboard/road-missions/reports", + icon: , + // badges: [{ key: "mission.control" }], // TODO: add badge and permission + permissions: ["all"], + }, ], }, {