Merge branch 'feature/passenger_office_implement' into 'develop'

Feature/passenger office implement

See merge request witel3/loan-facilities-expert!26
This commit is contained in:
yasaman aliakbari
2023-07-16 06:42:51 +00:00
4 changed files with 28 additions and 17 deletions

View File

@@ -1,3 +1,4 @@
import { CONFIRM_PASSENGER_OFFICE } from "@/core/data/apiRoutes";
import {
Dialog,
DialogTitle,
@@ -13,11 +14,12 @@ const ConfirmForm = ({
handleClose,
handleDelete,
rowId,
deleteData,
confirmData,
}) => {
const t = useTranslations();
const handleDeleteExpert = () => {
const handleConfirm = () => {
handleDelete();
confirmData(CONFIRM_PASSENGER_OFFICE, rowId);
};
return (
<Dialog open={open} onClose={handleClose}>
@@ -26,7 +28,7 @@ const ConfirmForm = ({
<DialogContentText>{t("ConfirmDialog.context")}</DialogContentText>
</DialogContent>
<DialogActions>
<Button onClick={handleDeleteExpert} color="primary">
<Button onClick={handleConfirm} color="primary">
{t("ConfirmDialog.button-confirm")}
</Button>
<Button onClick={handleClose} color="secondary" autoFocus>

View File

@@ -1,3 +1,4 @@
import { REJECT_PASSENGER_OFFICE } from "@/core/data/apiRoutes";
import {
Dialog,
DialogTitle,
@@ -8,12 +9,12 @@ import {
} from "@mui/material";
import { useTranslations } from "next-intl";
const RejectForm = ({ open, handleClose, handleDelete, rowId, deleteData }) => {
const RejectForm = ({ open, handleClose, handleDelete, rowId, rejectData }) => {
const t = useTranslations();
const handleRejectRequest = () => {
handleDelete();
rejectData(REJECT_PASSENGER_OFFICE, rowId);
};
console.log(rowId);
return (
<Dialog open={open} onClose={handleClose}>
<DialogTitle>{t("RejectDialog.reject")}</DialogTitle>

View File

@@ -19,7 +19,8 @@ const TableRowActions = ({ row }) => {
handleConfirmDialog,
handleRejectDialog,
rowId,
deleteData,
confirmData,
rejectData,
} = useContext(DataTableContext);
return (
<Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
@@ -31,7 +32,7 @@ const TableRowActions = ({ row }) => {
open={openConfirmDialog}
handleClose={handleCloseConfirmDialog}
handleDelete={handleConfirmDialog}
deleteData={deleteData}
confirmData={confirmData}
/>
<IconButton color="primary" onClick={() => handleOpenRejectDialog(row)}>
<ThumbDownIcon />
@@ -41,7 +42,7 @@ const TableRowActions = ({ row }) => {
open={openRejectDialog}
handleClose={handleCloseRejectDialog}
handleDelete={handleRejectDialog}
deleteData={deleteData}
rejectData={rejectData}
/>
</Box>
);

View File

@@ -2,6 +2,9 @@ import axios from "axios";
import { useCallback, useContext, useReducer, useState } from "react";
import { ReloadDataTableContext } from "../contexts/ReloadDatatableContext";
import useUser from "./useUser";
import Notifications from "@/core/components/notifications";
import useDirection from "./useDirection";
import { useTranslations } from "next-intl";
const initialValues = {
url: "",
@@ -35,37 +38,40 @@ const useDataTable = () => {
const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
const [openRejectDialog, setOpenRejectDialog] = useState(false);
const [rowId, setRowId] = useState(null);
const { directionApp } = useDirection();
const t = useTranslations();
const { token } = useUser();
const confirmData = useCallback(async (url, rowID) => {
dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID });
axios
.post(`${url}/${rowID}`, {
headers: {
authorization: `Bearer ${token}`,
},
headers: { authorization: `Bearer ${token}` },
})
.then(() => {
setReloadDataTable(true);
})
.catch(() => {});
.catch((error) => {
Notifications(directionApp, error.response, t);
});
}, []);
const rejectData = useCallback(async (url, rowID) => {
dispatch({ type: "REJECT_DATA", url: url, rowID: rowID });
axios
.post(`${url}/${rowID}`, {
headers: {
authorization: `Bearer ${token}`,
},
headers: { authorization: `Bearer ${token}` },
})
.then(() => {
setReloadDataTable(true);
})
.catch(() => {});
.catch((error) => {
Notifications(directionApp, error.response, t);
});
}, []);
//Confirm Data
const handleOpenConfirmDialog = (row) => {
setRowId(row.getValue("id"));
setOpenConfirmDialog(true);
@@ -78,6 +84,7 @@ const useDataTable = () => {
const handleConfirmDialog = () => {
setOpenConfirmDialog(false);
};
//End Confirm Data
// Reject Data
const handleOpenRejectDialog = (row) => {