diff --git a/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
index 1c18129..42425c7 100644
--- a/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/DriverReportsList.jsx
@@ -14,6 +14,7 @@ const DriverReportsList = ({ specialFilter }) => {
header: "کد یکتا",
id: "driver_id",
enableColumnFilter: true,
+ filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
enableSorting: true,
datatype: "numeric",
@@ -25,6 +26,7 @@ const DriverReportsList = ({ specialFilter }) => {
header: "نام راننده",
id: "driver_name",
enableColumnFilter: true,
+ filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
enableSorting: true,
datatype: "text",
@@ -36,7 +38,7 @@ const DriverReportsList = ({ specialFilter }) => {
header: "کارکرد",
id: "func",
enableColumnFilter: false,
- enableSorting: true,
+ enableSorting: false,
datatype: "number",
grow: false,
size: 50,
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
index daab8a9..a7ad42c 100644
--- a/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/ExcelPrint/index.jsx
@@ -1,7 +1,6 @@
"use client";
import {
- EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT,
- EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT,
+ EXPORT_GET_DRIVER_ACTIVITY_REPORT,
} from "@/core/utils/routes";
import useRequest from "@/lib/hooks/useRequest";
import { useTheme } from "@emotion/react";
@@ -34,11 +33,7 @@ const PrintExcel = ({ table, filterData }) => {
const clickHandler = () => {
setLoading(true);
- const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
- const requestUrl =
- CountryOrProvince.value === "-1"
- ? EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT
- : EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT;
+ const requestUrl = EXPORT_GET_DRIVER_ACTIVITY_REPORT
requestServer(`${requestUrl}?${filterParams}`, "get", {
requestOptions: { responseType: "blob" },
})
@@ -66,7 +61,7 @@ const PrintExcel = ({ table, filterData }) => {
disabled={loading}
sx={{ textTransform: "unset", alignSelf: "center" }}
startIcon={loading ? : }
- onClick={clickHandler}
+ // onClick={clickHandler}
>
خروجی اکسل
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/ExcelPrint/index.jsx
new file mode 100644
index 0000000..ed6023a
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/ExcelPrint/index.jsx
@@ -0,0 +1,79 @@
+"use client";
+import { EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData, specialFilterData }) => {
+ const theme = useTheme();
+ const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+ const [loading, setLoading] = useState(false);
+ const requestServer = useRequest({ notificationSuccess: true });
+ const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+ if (filter.value) {
+ acc.push({ id: filter.id, value: filter.value });
+ }
+ return acc;
+ }, []);
+ const activeSpecialFilters = Object.entries(specialFilterData).reduce((acc, [key, filter]) => {
+ if (filter.value) {
+ acc.push({ id: filter.id, value: filter.value });
+ }
+ return acc;
+ }, []);
+ const filterParams = useMemo(() => {
+ const params = new URLSearchParams();
+ activeFilters.length > 0 &&
+ activeFilters.map((filter, index) => {
+ params.set(`${filter.id}`, filter.value);
+ });
+ activeSpecialFilters.length > 0 &&
+ activeSpecialFilters.map((filter, index) => {
+ params.set(`${filter.id}`, filter.value);
+ });
+ return params;
+ }, [activeFilters, activeSpecialFilters]);
+
+ const clickHandler = () => {
+ setLoading(true);
+ const requestUrl = EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT;
+ requestServer(`${requestUrl}?${filterParams}`, "get", {
+ requestOptions: { responseType: "blob" },
+ })
+ .then((response) => {
+ const filename = `خروجی کارتابل ریزگزارشات راننده تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+ FileSaver.saveAs(response.data, filename);
+ })
+ .catch(() => {})
+ .finally(() => {
+ setLoading(false);
+ });
+ };
+
+ return (
+ <>
+ {isMobile ? (
+
+
+
+ ) : (
+ : }
+ // onClick={clickHandler}
+ >
+ خروجی اکسل
+
+ )}
+ >
+ );
+};
+export default PrintExcel;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/Toolbar.jsx
new file mode 100644
index 0000000..fab6fb8
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/Toolbar.jsx
@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, specialFilterData, mutate }) => {
+ return (
+
+
+
+ );
+};
+export default Toolbar;
diff --git a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
index 3c12ce3..0a4d142 100644
--- a/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/diverReports/RowActions/DriverDetails/Form/DriverDetailsDialog/DriverList/index.jsx
@@ -5,6 +5,7 @@ import useCities from "@/lib/hooks/useCities";
import useProvinces from "@/lib/hooks/useProvince";
import { Box } from "@mui/material";
import { useMemo } from "react";
+import Toolbar from "./Toolbar";
const DriverList = ({ row, specialFilter }) => {
const columns = useMemo(() => {
@@ -155,11 +156,15 @@ const DriverList = ({ row, specialFilter }) => {
<>
{
const clickHandler = () => {
setLoading(true);
- const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
- const requestUrl =
- CountryOrProvince.value === "-1"
- ? EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT
- : EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT;
+ const requestUrl = EXPORT_GET_MACHINES_ACTIVITY_REPORT
requestServer(`${requestUrl}?${filterParams}`, "get", {
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(() => {})
@@ -66,7 +59,7 @@ const PrintExcel = ({ table, filterData }) => {
disabled={loading}
sx={{ textTransform: "unset", alignSelf: "center" }}
startIcon={loading ? : }
- onClick={clickHandler}
+ // onClick={clickHandler}
>
خروجی اکسل
diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx
index baaa830..726d021 100644
--- a/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/MachinesReportsList.jsx
@@ -18,6 +18,7 @@ const MachinesReportsList = ({ specialFilter }) => {
header: "کد یکتا",
id: "machine_id",
enableColumnFilter: true,
+ filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
enableSorting: true,
datatype: "text",
@@ -28,7 +29,8 @@ const MachinesReportsList = ({ specialFilter }) => {
accessorKey: "car_name",
header: "مدل ماشین",
id: "car_name",
- enableColumnFilter: true,
+ enableColumnFilter: false,
+ filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
enableSorting: true,
datatype: "text",
@@ -41,7 +43,7 @@ const MachinesReportsList = ({ specialFilter }) => {
id: "machine_code",
enableColumnFilter: true,
columnFilterModeOptions: ["equals", "contains"],
- enableSorting: true,
+ enableSorting: false,
datatype: "text",
grow: false,
size: 50,
@@ -52,7 +54,7 @@ const MachinesReportsList = ({ specialFilter }) => {
id: "func",
enableColumnFilter: false,
columnFilterModeOptions: ["equals", "contains"],
- enableSorting: false,
+ enableSorting: true,
datatype: "number",
grow: false,
size: 50,
diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx
new file mode 100644
index 0000000..3efb595
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx
@@ -0,0 +1,70 @@
+"use client";
+import { EXPORT_GET_MACHINES_ACTIVITY_REPORT } from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData }) => {
+ const theme = useTheme();
+ const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+ const [loading, setLoading] = useState(false);
+ const requestServer = useRequest({ notificationSuccess: true });
+ const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+ if (filter.value) {
+ acc.push({ id: filter.id, value: filter.value });
+ }
+ return acc;
+ }, []);
+
+ const filterParams = useMemo(() => {
+ const params = new URLSearchParams();
+ activeFilters.length > 0 &&
+ activeFilters.map((filter, index) => {
+ params.set(`${filter.id}`, filter.value);
+ });
+ return params;
+ }, [activeFilters]);
+
+ const clickHandler = () => {
+ setLoading(true);
+ const requestUrl = EXPORT_GET_MACHINES_ACTIVITY_REPORT
+ requestServer(`${requestUrl}?${filterParams}`, "get", {
+ requestOptions: { responseType: "blob" },
+ })
+ .then((response) => {
+ const filename = `خروجی کارتابل گزارشات ماشین ها تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+ FileSaver.saveAs(response.data, filename);
+ })
+ .catch(() => {})
+ .finally(() => {
+ setLoading(false);
+ });
+ };
+
+ return (
+ <>
+ {isMobile ? (
+
+
+
+ ) : (
+ : }
+ // onClick={clickHandler}
+ >
+ خروجی اکسل
+
+ )}
+ >
+ );
+};
+export default PrintExcel;
diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx
new file mode 100644
index 0000000..afc132c
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx
@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, mutate }) => {
+ return (
+
+
+
+ );
+};
+export default Toolbar;
diff --git a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
index 57a5ef9..5a83510 100644
--- a/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
@@ -5,6 +5,7 @@ import useCities from "@/lib/hooks/useCities";
import useProvinces from "@/lib/hooks/useProvince";
import { Box } from "@mui/material";
import { useMemo } from "react";
+import Toolbar from "./Toolbar";
const MachineMissionsList = ({ row, specialFilter }) => {
const columns = useMemo(() => {
@@ -156,6 +157,7 @@ const MachineMissionsList = ({ row, specialFilter }) => {
{
const clickHandler = () => {
setLoading(true);
- const CountryOrProvince = activeFilters.find((item) => item.id === "province_id");
- const requestUrl =
- CountryOrProvince.value === "-1"
- ? EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT
- : EXPORT_GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT;
+ const requestUrl = EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT;
requestServer(`${requestUrl}?${filterParams}`, "get", {
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(() => {})
@@ -68,7 +61,7 @@ const PrintExcel = ({ table, filterData }) => {
disabled={loading}
sx={{ textTransform: "unset", alignSelf: "center" }}
startIcon={loading ? : }
- onClick={clickHandler}
+ // onClick={clickHandler}
>
خروجی اکسل
diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx
index 198b001..c6b9e55 100644
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/MachinesReportsList.jsx
@@ -4,10 +4,9 @@ import { Box } from "@mui/material";
import { useMemo } from "react";
import Toolbar from "./Toolbar";
import {
- GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT,
- GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT,
+ GET_MACHINES_TYPE_ACTIVITY_REPORT,
} from "@/core/utils/routes";
-// import RowActions from "./RowActions";
+import RowActions from "./RowActions";
const MachinesReportsList = ({ specialFilter }) => {
const columns = useMemo(() => {
@@ -17,6 +16,7 @@ const MachinesReportsList = ({ specialFilter }) => {
header: "نوع ماشین",
id: "car_type",
enableColumnFilter: true,
+ filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
enableSorting: true,
datatype: "text",
@@ -51,18 +51,14 @@ const MachinesReportsList = ({ specialFilter }) => {
x.id === "province_id")?.value === "-1"
- ? GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT
- : GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT
- }
+ table_url={GET_MACHINES_TYPE_ACTIVITY_REPORT}
page_name={"roadMissionReportMachineTypeReport"}
table_name={"roadMissionReportMachineTypeReportList"}
enablePagination={false}
specialFilter={specialFilter}
need_filter={true}
- // enableRowActions
- // RowActions={RowActions}
+ enableRowActions
+ RowActions={RowActions}
/>
);
diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx
new file mode 100644
index 0000000..40242e8
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/ExcelPrint/index.jsx
@@ -0,0 +1,72 @@
+"use client";
+import {
+ EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT,
+} from "@/core/utils/routes";
+import useRequest from "@/lib/hooks/useRequest";
+import { useTheme } from "@emotion/react";
+import DescriptionIcon from "@mui/icons-material/Description";
+import { Button, CircularProgress, IconButton, useMediaQuery } from "@mui/material";
+import FileSaver from "file-saver";
+import moment from "jalali-moment";
+import { useMemo, useState } from "react";
+
+const PrintExcel = ({ table, filterData }) => {
+ const theme = useTheme();
+ const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+ const [loading, setLoading] = useState(false);
+ const requestServer = useRequest({ notificationSuccess: true });
+ const activeFilters = Object.entries(filterData).reduce((acc, [key, filter]) => {
+ if (filter.value) {
+ acc.push({ id: filter.id, value: filter.value });
+ }
+ return acc;
+ }, []);
+
+ const filterParams = useMemo(() => {
+ const params = new URLSearchParams();
+ activeFilters.length > 0 &&
+ activeFilters.map((filter, index) => {
+ params.set(`${filter.id}`, filter.value);
+ });
+ return params;
+ }, [activeFilters]);
+
+ const clickHandler = () => {
+ setLoading(true);
+ const requestUrl = EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT;
+ requestServer(`${requestUrl}?${filterParams}`, "get", {
+ requestOptions: { responseType: "blob" },
+ })
+ .then((response) => {
+ const filename = `خروجی کارتابل گزارشات نوع ماشین تاریخ_${moment().format("jYYYY_jMM_jDD")}.xlsx`;
+ FileSaver.saveAs(response.data, filename);
+ })
+ .catch(() => {})
+ .finally(() => {
+ setLoading(false);
+ });
+ };
+
+ return (
+ <>
+ {isMobile ? (
+
+
+
+ ) : (
+ : }
+ // onClick={clickHandler}
+ >
+ خروجی اکسل
+
+ )}
+ >
+ );
+};
+export default PrintExcel;
diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx
new file mode 100644
index 0000000..afc132c
--- /dev/null
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/Toolbar.jsx
@@ -0,0 +1,11 @@
+import { Box } from "@mui/material";
+import PrintExcel from "./ExcelPrint";
+
+const Toolbar = ({ table, filterData, mutate }) => {
+ return (
+
+
+
+ );
+};
+export default Toolbar;
diff --git a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
index 87f612d..5fb32f9 100644
--- a/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
+++ b/src/components/dashboard/roadMissions/reports/machinesTypeReports/RowActions/MissionDitails/Form/MachineMissionsDetailsDialog/MachineMissionsList/index.jsx
@@ -1,7 +1,8 @@
import DataTableWithAuth from "@/core/components/DataTableWithAuth";
-import { GET_MACHINE_MISSIONS_DETAILS, GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
+import { GET_MACHINE_TYPE_MISSIONS_DETAILS } from "@/core/utils/routes";
import { Box } from "@mui/material";
import { useMemo } from "react";
+import Toolbar from "./Toolbar";
const MachineMissionsList = ({ row }) => {
const columns = useMemo(
@@ -91,10 +92,14 @@ const MachineMissionsList = ({ row }) => {
<>
{
- return <>{/**/}>;
+ return <>
+
+ >;
};
export default RowActions;
diff --git a/src/core/components/DataTable/Main.js b/src/core/components/DataTable/Main.js
index 61c16cb..3812f4c 100644
--- a/src/core/components/DataTable/Main.js
+++ b/src/core/components/DataTable/Main.js
@@ -38,6 +38,7 @@ const DataTable_Main = (props) => {
RowActions,
specific_data,
specialFilter,
+ specialQueries
} = props;
const flatColumns = flattenArrayOfObjects(columns, "columns");
const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
@@ -70,8 +71,15 @@ const DataTable_Main = (props) => {
}))
)
);
+ if (specialQueries) {
+ Object.entries(specialQueries).forEach(([key, value]) => {
+ if (value !== undefined && value !== null && value !== "") {
+ params.set(key, String(value));
+ }
+ });
+ }
return `${table_url}?${params}`;
- }, [table_url, filterData, pagination, sortData, specialFilter]);
+ }, [table_url, filterData, pagination, sortData, specialFilter, specialQueries]);
const fetcher = async (url) => {
try {
@@ -152,7 +160,12 @@ const DataTable_Main = (props) => {
renderTopToolbarCustomActions: ({ table }) => (
<>
{TableToolbar && (
-
+
)}
>
),
diff --git a/src/core/utils/routes.js b/src/core/utils/routes.js
index ce5e6ff..3bd09ac 100644
--- a/src/core/utils/routes.js
+++ b/src/core/utils/routes.js
@@ -253,20 +253,27 @@ export const GET_MACHINES_ACTIVITY_REPORT = api + "/api/v3/missions/report_machi
export const GET_MACHINES_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machines_activity";
export const EXPORT_GET_MACHINES_COUNTRY_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/country_machines_activity_excel";
+export const EXPORT_GET_MACHINES_TYPE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/machines_activity_excel";
export const EXPORT_GET_MACHINES_PROVINCE_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/province_machines_activity_excel";
+export const EXPORT_GET_MACHINES_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/machines_activity_excel";
export const GET_DRIVERS_ACTIVITY_REPORT =
- api + "/api/v3/missions/report_machine/country_machine_drivers_activity";
-export const GET_DRIVER_PROVINCE_ACTIVITY_REPORT =
- api + "/api/v3/missions/report_machine/province_machine_drivers_activity";
+ api + "/api/v3/missions/report_machine/machine_drivers_activity";
+export const GET_DRIVER_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/missions/report_machine/province_machine_drivers_activity";
export const EXPORT_GET_DRIVER_COUNTRY_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/country_machine_drivers_activity_excel";
+
+export const EXPORT_GET_DRIVER_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/machine_drivers_activity_excel";
+export const EXPORT_GET_DRIVER_DETAILS_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/machine_driver_details_report_excel";
export const EXPORT_GET_DRIVER_PROVINCE_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/province_machine_drivers_activity_excel";
-export const GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =
- api + "/api/v3/missions/report_machine/country_machine_types_activity";
+export const GET_MACHINES_TYPE_ACTIVITY_REPORT =
+ api + "/api/v3/missions/report_machine/machine_types_activity";
export const GET_MACHINES_TYPE_PROVINCE_ACTIVITY_REPORT =
api + "/api/v3/missions/report_machine/province_machine_types_activity";
export const EXPORT_GET_MACHINES_TYPE_COUNTRY_ACTIVITY_REPORT =