From 2ef50298511c26fa6224d9df110947c8894a6bd0 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Tue, 21 May 2024 13:32:35 +0330 Subject: [PATCH 1/5] disable revert form --- .../navgan-province-manager/Form/RevertForm/RevertContent.jsx | 2 +- .../transportation-assistance/Form/RevertForm/RevertContent.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx b/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx index 23f4268..aeb7a9f 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx @@ -69,7 +69,7 @@ const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { {t("RevertDialog.button-cancel")} diff --git a/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx b/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx index 1a2e524..a4779df 100644 --- a/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx @@ -69,7 +69,7 @@ const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { {t("RevertDialog.button-cancel")} From bb9f5075efcb514c2328a24852ac71ac61f8461a Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 26 May 2024 14:50:17 +0330 Subject: [PATCH 2/5] api backend --- .../navgan-province-manager/Form/RevertForm/RevertContent.jsx | 3 ++- .../Form/RevertForm/RevertContent.jsx | 3 ++- src/core/data/apiRoutes.js | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx b/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx index aeb7a9f..64d1dec 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RevertForm/RevertContent.jsx @@ -4,6 +4,7 @@ import {Button, DialogActions, DialogContent, Stack, TextField} from "@mui/mater import {useFormik} from "formik"; import {useTranslations} from "next-intl"; import * as Yup from "yup"; +import {REFER_NAVGAN_PROVINCE_MANAGER} from "@/core/data/apiRoutes"; const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { const t = useTranslations(); @@ -20,7 +21,7 @@ const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { }, validationSchema, onSubmit: (values, {setSubmitting}) => { - requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { + requestServer(`${REFER_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: { expert_description: values.description }, diff --git a/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx b/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx index a4779df..0528e80 100644 --- a/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RevertForm/RevertContent.jsx @@ -4,6 +4,7 @@ import {Button, DialogActions, DialogContent, Stack, TextField} from "@mui/mater import {useFormik} from "formik"; import {useTranslations} from "next-intl"; import * as Yup from "yup"; +import {REFER_TRANSPORTATION_ASSISTANCE} from "@/core/data/apiRoutes"; const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { const t = useTranslations(); @@ -20,7 +21,7 @@ const RevertContent = ({rowId, mutate, setOpenRevertDialog}) => { }, validationSchema, onSubmit: (values, {setSubmitting}) => { - requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { + requestServer(`${REFER_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: { expert_description : values.description }, diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js index f0d4774..841d6f4 100644 --- a/src/core/data/apiRoutes.js +++ b/src/core/data/apiRoutes.js @@ -56,6 +56,8 @@ export const CONFIRM_TRANSPORTATION_ASSISTANCE = export const REJECT_TRANSPORTATION_ASSISTANCE = BASE_URL + "/dashboard/transportation_assistant/reject"; +export const REFER_TRANSPORTATION_ASSISTANCE = + BASE_URL + "/dashboard/transportation_assistant/refer"; export const EXPORT_TRANSPORTATION_ASSISTANCE = BASE_URL + "/dashboard/transportation_assistant/export"; //transportation assistance @@ -103,6 +105,8 @@ export const CONFIRM_NAVGAN_PROVINCE_MANAGER = export const REJECT_NAVGAN_PROVINCE_MANAGER = BASE_URL + "/dashboard/province_manager/reject"; +export const REFER_NAVGAN_PROVINCE_MANAGER = + BASE_URL + "/dashboard/province_manager/refer"; export const EXPORT_NAVGAN_PROVINCE_MANAGER = BASE_URL + "/dashboard/province_manager/export"; From 77be6b0e2c9fe088a20ee489919065b9fc49587e Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Tue, 28 May 2024 14:16:00 +0330 Subject: [PATCH 3/5] add refer reason passenger boss and transportation assistance --- src/components/dashboard/passenger-boss/index.jsx | 8 ++++---- .../dashboard/transportation-assistance/index.jsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 76aea5b..a8205ff 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -271,16 +271,16 @@ function DashboardPassengerOfficeComponent() { ), }, { - accessorFn: (row) => row.refer_reason, - id: "refer_reason", + accessorFn: (row) => row.latest_history.expert_description, + id: "latest_history.expert_description", header: t("PassengerBoss.refer_reason"), enableColumnFilter: false, datatype: "text", filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], - Cell: ({renderedCellValue, row}) => { + Cell: ({row}) => { return ( - {renderedCellValue} + {row.original.latest_history.action === 'refer'? row.original.latest_history.expert_description : null} ) }, }, diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index a807635..62efc0a 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -413,16 +413,16 @@ function DashboardTransportationAssistanceComponent() { ), }, { - accessorFn: (row) => row.refer_reason, - id: "refer_reason", + accessorFn: (row) => row.latest_history.expert_description, + id: "latest_history.expert_description", header: t("TransportationAssistance.refer_reason"), enableColumnFilter: false, datatype: "text", filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], - Cell: ({renderedCellValue, row}) => { + Cell: ({row}) => { return ( - {renderedCellValue} + {row.original.latest_history.action === 'refer'? row.original.latest_history.expert_description : null} ) }, }, From 0b656ce9cb90f979f552b938b64cce0604f8dc2c Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 29 May 2024 13:20:40 +0330 Subject: [PATCH 4/5] show attachments --- .../Form/ConfirmForm/ConfirmContent.jsx | 22 ++++++++++++------- .../Form/ConfirmForm/ConfirmContent.jsx | 22 ++++++++++++------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx index 0423bd0..ca872db 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -53,14 +53,20 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl useEffect(() => { requestServer(`${CONFIRM_PROVINCE_MANAGER_DETAILS}/${rowId}`, 'get') .then((response) => { - const allAttachments = []; - response.data.data.histories.map((history) => { - history.attachments.map((attachment) => { - allAttachments.push(attachment); - }); - }); - setAttachmentsData(allAttachments); - setDetailsData(response.data); + if (response.data.data.histories.length !== 0) { + let latest_attachments = [] + let attachments = [] + response.data.data.histories.map((allAttachment) => { + if (allAttachment.previous_state_id === 4 || allAttachment.previous_state_id === 5) { + if (!latest_attachments.includes(allAttachment.previous_state_id)) { + attachments = [...attachments, ...allAttachment.attachments] + latest_attachments.push(allAttachment.previous_state_id) + } + } + setDetailsData(response.data); + setAttachmentsData(attachments); + }) + } }) .catch(() => { }).finally(() => { diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index c3b04b4..1bae724 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -44,14 +44,20 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl useEffect(() => { requestServer(`${GET_TRANSPORTATION_ASSISTANCE_DETAILS}/${rowId}`, 'get') .then((response) => { - const allAttachments = []; - response.data.data.histories.map((history) => { - history.attachments.map((attachment) => { - allAttachments.push(attachment); - }); - }); - setDetailsData(response.data); - setAttachmentsData(allAttachments); + if (response.data.data.histories.length !== 0) { + let latest_attachments = [] + let attachments = [] + response.data.data.histories.map((allAttachment) => { + if (allAttachment.previous_state_id !== 4) + return + if (!latest_attachments.includes(allAttachment.previous_state_id)) { + attachments = [...attachments, ...allAttachment.attachments] + latest_attachments.push(allAttachment.previous_state_id) + } + }) + setDetailsData(response.data); + setAttachmentsData(attachments); + } }) .catch(() => { }).finally(() => { From df4fb98969937d23f8d9e1f514bc9458ca32980f Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Wed, 29 May 2024 14:14:15 +0330 Subject: [PATCH 5/5] get api --- .../Form/ConfirmForm/ConfirmContent.jsx | 4 ++-- .../Form/ConfirmForm/ConfirmContent.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx index ca872db..312bbf2 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -53,10 +53,10 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl useEffect(() => { requestServer(`${CONFIRM_PROVINCE_MANAGER_DETAILS}/${rowId}`, 'get') .then((response) => { - if (response.data.data.histories.length !== 0) { + if (response.data.data.latest_histories.length !== 0) { let latest_attachments = [] let attachments = [] - response.data.data.histories.map((allAttachment) => { + response.data.data.latest_histories.map((allAttachment) => { if (allAttachment.previous_state_id === 4 || allAttachment.previous_state_id === 5) { if (!latest_attachments.includes(allAttachment.previous_state_id)) { attachments = [...attachments, ...allAttachment.attachments] diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 1bae724..22f9f1f 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -44,10 +44,10 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl useEffect(() => { requestServer(`${GET_TRANSPORTATION_ASSISTANCE_DETAILS}/${rowId}`, 'get') .then((response) => { - if (response.data.data.histories.length !== 0) { + if (response.data.data.latest_histories.length !== 0) { let latest_attachments = [] let attachments = [] - response.data.data.histories.map((allAttachment) => { + response.data.data.latest_histories.map((allAttachment) => { if (allAttachment.previous_state_id !== 4) return if (!latest_attachments.includes(allAttachment.previous_state_id)) {