diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx index 34f727a..4b78d65 100644 --- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx +++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx @@ -132,12 +132,12 @@ const Approved = () => { display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx index dc44a53..a7be1f9 100644 --- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx +++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx @@ -104,7 +104,8 @@ const Pending = () => { "Comments", "Update by", "Update On", - ...(localStorage?.getItem('role')!=="Maker" ? ["Status"] : []), + // ...(localStorage?.getItem('role')!=="Maker" ? ["Status"] : []), + "Status" ]; const extractedArray = filteredData?.map((item, index) => ({ @@ -149,12 +150,12 @@ const Pending = () => { display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), @@ -164,7 +165,9 @@ const Pending = () => { ), Status: ( - + + {localStorage?.getItem("role") !== "Maker" ? + { + + : } ), })); diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx index 243e624..5a6af37 100644 --- a/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx +++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx @@ -144,12 +144,12 @@ import AddCaseDetails from "./AddCaseDetails"; display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx index 6ffbfa9..c771b46 100644 --- a/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx +++ b/src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx @@ -140,8 +140,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { )} - Maximum length should be 200 characters. You have entered - {watch("checkerComment")?.length || 0} characters. + Maximum length should be 200 characters. You have entered + {watch("checkerComment")?.length || 0} characters. diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx index f6ed889..d9d777f 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx @@ -147,12 +147,12 @@ const Approved = () => { display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx index d68239e..133d758 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx @@ -152,17 +152,19 @@ const Pending = () => { display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), Status: ( - + + {localStorage?.getItem("role") !== "Maker" ? + { + + : } ), })); diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx index 3f0aa17..e94f61c 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx @@ -161,12 +161,12 @@ import AddNavDetails from "./AddNavDetails"; display={"flex"} alignItems={"center"} > - + /> */} {item?.creator?.firstName} ), diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx index 861d3ed..edad9d3 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx @@ -140,7 +140,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { )} - Maximum length should be 200 characters. You have entered + Maximum length should be 200 characters. You have entered {watch("checkerComment")?.length || 0} characters. diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx index b027b7d..4202924 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx @@ -153,7 +153,7 @@ import { color={"gray.800"} fontWeight={"500"} > - {item?.modifier ? formatDate(item?.updatedAt) : "---" } + {item?.modifier?.firstName} {/* { ), "Approved By": ( - {item?.modifier ? item?.modifier : "---"} + {item?.modifier?.firstName} ), "Approved On": ( @@ -193,7 +193,7 @@ const Pending = () => { } }} > - View + {localStorage?.getItem("role") === "Maker" ? : null} {localStorage?.getItem("role") === "Maker" ? "View" : "Approve / reject"} ), diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx index 388ce77..6203687 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx @@ -141,7 +141,7 @@ import { color={"gray.800"} fontWeight={"500"} > - {item?.modifier ? formatDate(item?.updatedAt) : "---" } + {item?.modifier?.firstName} ), "Approved On": ( diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx index 527dbb8..507aeb2 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx @@ -139,7 +139,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => { )} - Maximum length should be 200 characters. You have entered + Maximum length should be 200 characters. You have entered {watch("checkerComment")?.length || 0} characters. diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx index 04ee265..5bc15c7 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx @@ -139,7 +139,7 @@ import { )} - Maximum length should be 200 characters. You have entered + Maximum length should be 200 characters. You have entered {watch("checkerComment")?.length || 0} characters.