Resolve #86c2a6cz3 "Feature/road safety "
This commit is contained in:
@@ -115,8 +115,8 @@ const ComplaintListTable = ({ open, setOpen, mutate }) => {
|
||||
props.dependencyFieldValue?.value === ""
|
||||
? "empty"
|
||||
: loadingEdaratList
|
||||
? "loading"
|
||||
: props.filterParameters.value
|
||||
? "loading"
|
||||
: props.filterParameters.value
|
||||
}
|
||||
columnSelectOption={getColumnSelectOptions}
|
||||
/>
|
||||
@@ -237,7 +237,10 @@ const ComplaintListTable = ({ open, setOpen, mutate }) => {
|
||||
size: 100,
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A").locale("fa").format("HH:mm | yyyy/MM/DD"),
|
||||
accessorFn: (row) =>
|
||||
moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A")
|
||||
.locale("fa")
|
||||
.format("HH:mm | yyyy/MM/DD"),
|
||||
header: "تاریخ ثبت",
|
||||
id: "StartTime_DateTime",
|
||||
enableColumnFilter: false,
|
||||
@@ -246,8 +249,8 @@ const ComplaintListTable = ({ open, setOpen, mutate }) => {
|
||||
grow: false,
|
||||
size: 100,
|
||||
},
|
||||
]
|
||||
}
|
||||
],
|
||||
},
|
||||
];
|
||||
}, []);
|
||||
|
||||
|
||||
@@ -6,12 +6,10 @@ import { usePermissions } from "@/lib/hooks/usePermissions";
|
||||
|
||||
const RowActions = ({ row, mutate }) => {
|
||||
const { data: userPermissions } = usePermissions();
|
||||
const hasActionPermission = userPermissions.includes("show-fast-react-edarate-shahri")
|
||||
const hasActionPermission = userPermissions.includes("show-fast-react-edarate-shahri");
|
||||
return (
|
||||
<Box sx={{ display: "flex", gap: 1 }}>
|
||||
{hasActionPermission && (
|
||||
<RegisterAction mutate={mutate} rowId={row.getValue("road_observeds__id")} />
|
||||
)}
|
||||
{hasActionPermission && <RegisterAction mutate={mutate} rowId={row.getValue("road_observeds__id")} />}
|
||||
<Refer rowId={row.getValue("road_observeds__id")} mutate={mutate} />
|
||||
<ReferList rowId={row.getValue("road_observeds__id")} />
|
||||
</Box>
|
||||
|
||||
@@ -181,7 +181,10 @@ const OperatorList = () => {
|
||||
size: 100,
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A").locale("fa").format("HH:mm | yyyy/MM/DD"),
|
||||
accessorFn: (row) =>
|
||||
moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A")
|
||||
.locale("fa")
|
||||
.format("HH:mm | yyyy/MM/DD"),
|
||||
header: "تاریخ ثبت",
|
||||
id: "StartTime_DateTime",
|
||||
enableColumnFilter: false,
|
||||
@@ -190,7 +193,7 @@ const OperatorList = () => {
|
||||
grow: false,
|
||||
size: 100,
|
||||
},
|
||||
]
|
||||
],
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => {
|
||||
|
||||
@@ -18,7 +18,9 @@ const RowActions = ({ row, mutate }) => {
|
||||
{hasSupervisePermission && row.original?.status === 0 && (
|
||||
<RejectForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />
|
||||
)}
|
||||
{hasRestorePermission && row.original?.status !== 0 && <RestoreForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />}
|
||||
{hasRestorePermission && row.original?.status !== 0 && (
|
||||
<RestoreForm rowId={row.getValue("road_observeds__id")} mutate={mutate} />
|
||||
)}
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -125,8 +125,8 @@ const SupervisorList = () => {
|
||||
props.dependencyFieldValue?.value === ""
|
||||
? "empty"
|
||||
: loadingEdaratList
|
||||
? "loading"
|
||||
: props.filterParameters.value
|
||||
? "loading"
|
||||
: props.filterParameters.value
|
||||
}
|
||||
columnSelectOption={getColumnSelectOptions}
|
||||
/>
|
||||
@@ -282,7 +282,10 @@ const SupervisorList = () => {
|
||||
size: 100,
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A").locale("fa").format("HH:mm | yyyy/MM/DD"),
|
||||
accessorFn: (row) =>
|
||||
moment(row.StartTime_DateTime, "M/D/YYYY h:mm:ss A")
|
||||
.locale("fa")
|
||||
.format("HH:mm | yyyy/MM/DD"),
|
||||
header: "تاریخ ثبت",
|
||||
id: "StartTime_DateTime",
|
||||
enableColumnFilter: false,
|
||||
@@ -291,7 +294,7 @@ const SupervisorList = () => {
|
||||
grow: false,
|
||||
size: 100,
|
||||
},
|
||||
]
|
||||
],
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => {
|
||||
|
||||
Reference in New Issue
Block a user