Siddhesh.More/tanami-admin-panel
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

update action

Browse Source
This commit is contained in:
YasinShaikh123
2024-11-22 13:32:28 +05:30
parent 1c4f975781
commit f3a8a80f4d
13 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Pages/IO_Management/CreateIO/IOCashDetails/Approved.jsx
View File

@@ -132,12 +132,12 @@ const Approved = () => {
display={"flex"}
alignItems={"center"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item.creator?.firstName}
src={item.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),

25
src/Pages/IO_Management/CreateIO/IOCashDetails/Pending.jsx
View File

@@ -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"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item?.creator?.firstName}
src={item?.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),
@@ -164,7 +165,9 @@ const Pending = () => {
</Text>
),
Status: (
<Box display={"flex"} justifyContent={"center"} gap={2}>
<Box display={"flex"} justifyContent={"center"}>
{localStorage?.getItem("role") !== "Maker" ? <Box>
<Box display={"flex"} justifyContent={"center"} gap={2}>
<Tooltip
rounded={"sm"}
fontSize={"xs"}
@@ -219,6 +222,20 @@ const Pending = () => {
<CloseIcon fontSize={"10px"} />
</Button>
</Tooltip>
</Box>
</Box> : <Button
colorScheme="green"
rounded={"sm"}
size={"xs"}
px={2}
py={1}
fontWeight={500}
onClick={() => {
setActionId(item.id);
}}
>
<ViewIcon me={"4px"} /> View
</Button>}
</Box>
),
}));

4
src/Pages/IO_Management/CreateIO/IOCashDetails/Rejected.jsx
View File

@@ -144,12 +144,12 @@ import AddCaseDetails from "./AddCaseDetails";
display={"flex"}
alignItems={"center"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item.creator?.firstName}
src={item.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),

4
src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
View File

@@ -140,8 +140,8 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
</Text>
)}
<FormHelperText fontSize="xs" color="gray.500">
Maximum length should be 200 characters. You have entered
{watch("checkerComment")?.length || 0} characters.
<Box as="span" me={1}>Maximum length should be 200 characters. You have entered </Box>
{watch("checkerComment")?.length || 0} characters.
</FormHelperText>
</FormControl>
</ModalBody>

4
src/Pages/IO_Management/CreateIO/IONAVDetails/Approved.jsx
View File

@@ -147,12 +147,12 @@ const Approved = () => {
display={"flex"}
alignItems={"center"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item.creator?.firstName}
src={item.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),

22
src/Pages/IO_Management/CreateIO/IONAVDetails/Pending.jsx
View File

@@ -152,17 +152,19 @@ const Pending = () => {
display={"flex"}
alignItems={"center"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item.creator?.firstName}
src={item.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),
Status: (
<Box display={"flex"} justifyContent={"center"} gap={2}>
<Box display={"flex"} justifyContent={"center"}>
{localStorage?.getItem("role") !== "Maker" ? <Box>
<Box display={"flex"} justifyContent={"center"} gap={2}>
<Tooltip
rounded={"sm"}
fontSize={"xs"}
@@ -217,6 +219,20 @@ const Pending = () => {
<CloseIcon fontSize={"10px"} />
</Button>
</Tooltip>
</Box>
</Box> : <Button
colorScheme="green"
rounded={"sm"}
size={"xs"}
px={2}
py={1}
fontWeight={500}
onClick={() => {
setActionId(item.id);
}}
>
<ViewIcon me={"4px"} /> View
</Button>}
</Box>
),
}));

4
src/Pages/IO_Management/CreateIO/IONAVDetails/Rejected.jsx
View File

@@ -161,12 +161,12 @@ import AddNavDetails from "./AddNavDetails";
display={"flex"}
alignItems={"center"}
>
<Avatar
{/* <Avatar
mr={2}
size="sm"
name={item.creator?.firstName}
src={item.creator?.profilePhoto}
/>
/> */}
{item?.creator?.firstName}
</Text>
),

2
src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
View File

@@ -140,7 +140,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
</Text>
)}
<FormHelperText fontSize="xs" color="gray.500">
Maximum length should be 200 characters. You have entered
<Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
{watch("checkerComment")?.length || 0} characters.
</FormHelperText>
</FormControl>

2
src/Pages/IO_Management/CreateIO/IOTransaction/Approved.jsx
View File

@@ -153,7 +153,7 @@ import {
color={"gray.800"}
fontWeight={"500"}
>
{item?.modifier ? formatDate(item?.updatedAt) : "---" }
{item?.modifier?.firstName}
</Text>
{/* <Text
w={"100px"}

4
src/Pages/IO_Management/CreateIO/IOTransaction/Pending.jsx
View File

@@ -163,7 +163,7 @@ const Pending = () => {
),
"Approved By": (
<Text w={"100px"} as={"span"} color={"gray.800"} fontWeight={"500"}>
{item?.modifier ? item?.modifier : "---"}
{item?.modifier?.firstName}
</Text>
),
"Approved On": (
@@ -193,7 +193,7 @@ const Pending = () => {
}
}}
>
<ViewIcon me={"4px"} /> View
{localStorage?.getItem("role") === "Maker" ? <ViewIcon me={"4px"} /> : null} {localStorage?.getItem("role") === "Maker" ? "View" : "Approve / reject"}
</Button>
</Box>
),

2
src/Pages/IO_Management/CreateIO/IOTransaction/Rejected.jsx
View File

@@ -141,7 +141,7 @@ import {
color={"gray.800"}
fontWeight={"500"}
>
{item?.modifier ? formatDate(item?.updatedAt) : "---" }
{item?.modifier?.firstName}
</Text>
),
"Approved On": (

2
src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
View File

@@ -139,7 +139,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
</Text>
)}
<FormHelperText fontSize="xs" color="gray.500">
Maximum length should be 200 characters. You have entered
<Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
{watch("checkerComment")?.length || 0} characters.
</FormHelperText>
</FormControl>

2
src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
View File

@@ -139,7 +139,7 @@ import {
</Text>
)}
<FormHelperText fontSize="xs" color="gray.500">
Maximum length should be 200 characters. You have entered
<Box as="span" me={1}>Maximum length should be 200 characters. You have entered</Box>
{watch("checkerComment")?.length || 0} characters.
</FormHelperText>
</FormControl>