diff --git a/src/components/dashboard/fastReact/complaintList/ComplaintListTable.jsx b/src/components/dashboard/fastReact/complaintList/ComplaintListTable.jsx index ac16216..74694e6 100644 --- a/src/components/dashboard/fastReact/complaintList/ComplaintListTable.jsx +++ b/src/components/dashboard/fastReact/complaintList/ComplaintListTable.jsx @@ -115,8 +115,8 @@ const ComplaintListTable = ({ open, setOpen, mutate }) => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -259,13 +259,13 @@ const ComplaintListTable = ({ open, setOpen, mutate }) => { need_filter={true} table_title={"لیست شکایات"} columns={columns} - sorting={[{ id: "fk_RegisteredEventMessage", desc: true }]} + sorting={[{ id: "StartTime_DateTime", desc: true }]} table_url={GET_FAST_REACT_COMPLAINTS} page_name={"fastReactComplaint"} table_name={"fastReactComplaintList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={(props) => } /> diff --git a/src/components/dashboard/fastReact/operator/OperatorList.jsx b/src/components/dashboard/fastReact/operator/OperatorList.jsx index 9de64f1..d50fbc6 100644 --- a/src/components/dashboard/fastReact/operator/OperatorList.jsx +++ b/src/components/dashboard/fastReact/operator/OperatorList.jsx @@ -360,7 +360,7 @@ const OperatorList = () => { table_name={"fastReactOperatorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx b/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx index d543a18..a255174 100644 --- a/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/fastReact/supervisor/SupervisorList.jsx @@ -127,8 +127,8 @@ const SupervisorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -460,7 +460,7 @@ const SupervisorList = () => { table_name={"fastReactSupervisorList"} TableToolbar={Toolbar} enableRowActions - positionActionsColumn={"last"} + positionActionsColumn={"first"} RowActions={RowActions} /> diff --git a/src/core/utils/pageMenu.js b/src/core/utils/pageMenu.js index 3a62499..f4d0aba 100644 --- a/src/core/utils/pageMenu.js +++ b/src/core/utils/pageMenu.js @@ -378,19 +378,11 @@ export const pageMenu = [ id: "roadObservationsManagmentSupervisorCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_observations/supervisor/cartable", - permissions: ["supervise-fast-react", "supervise-fast-react-province"], + route: "/dashboard/fast-react/supervisor", + permissions: ["show-fast-react", "show-fast-react-province"], }, ], }, - { - id: "roadObservationsManagmentList", - label: "رسیدگی به شکایات", - type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_observations", - icon: , - permissions: ["show-fast-react", "show-fast-react-province", "show-fast-react-edarate-shahri"], - }, { id: "roadObservationsManagmentOparation", label: "عملیات", @@ -403,8 +395,8 @@ export const pageMenu = [ id: "roadObservationsManagmentOparationCartable", label: "کارتابل", type: "page", - route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_observations/operator/cartable", - permissions: ["show-fast-react", "show-fast-react-province", "show-fast-react-edarate-shahri"], + route: "/dashboard/fast-react/operator", + permissions: ["show-fast-react-edarate-shahri"], }, ], }, @@ -421,7 +413,7 @@ export const pageMenu = [ label: "گزارش ها", type: "page", route: process.env.NEXT_PUBLIC_API_URL + "/v2/road_observations/report/index", - icon: , + icon: , permissions: ["all"], }, ],