diff --git a/src/components/Documents/Documents.jsx b/src/components/Documents/Documents.jsx index 930ceb8c..0025a0c7 100644 --- a/src/components/Documents/Documents.jsx +++ b/src/components/Documents/Documents.jsx @@ -142,7 +142,7 @@ const Documents = ({ Document_Entity, Entity }) => { return (
-
+
{/* Search */} diff --git a/src/components/Documents/DocumentsList.jsx b/src/components/Documents/DocumentsList.jsx index 0561b847..4f0a104e 100644 --- a/src/components/Documents/DocumentsList.jsx +++ b/src/components/Documents/DocumentsList.jsx @@ -178,7 +178,7 @@ const DocumentsList = ({ /> )} -
+
diff --git a/src/components/Employee/EmpAttendance.jsx b/src/components/Employee/EmpAttendance.jsx index 034125d6..c7c03808 100644 --- a/src/components/Employee/EmpAttendance.jsx +++ b/src/components/Employee/EmpAttendance.jsx @@ -71,7 +71,7 @@ const EmpAttendance = () => { )} -
+
{
-
+
{!loading && data.length === 0 && (
No employee logs
)} diff --git a/src/components/Organization/OrganizationsList.jsx b/src/components/Organization/OrganizationsList.jsx index 611ce2de..7bc9df2a 100644 --- a/src/components/Organization/OrganizationsList.jsx +++ b/src/components/Organization/OrganizationsList.jsx @@ -5,17 +5,17 @@ import Avatar from "../common/Avatar"; import { useDebounce } from "../../utils/appUtils"; import Pagination from "../common/Pagination"; -const OrganizationsList = ({searchText}) => { - const [currentPage, setCurrentPage] = useState(1); - const searchString = useDebounce(searchText,500) +const OrganizationsList = ({ searchText }) => { + const [currentPage, setCurrentPage] = useState(1); + const searchString = useDebounce(searchText, 500) const { data = [], isLoading, isFetching, isError, error, - } = useOrganizationsList(ITEMS_PER_PAGE, 1, true,null,searchString); - const {onClose, startStep, flowType, onOpen,orgData } = useOrganizationModal(); + } = useOrganizationsList(ITEMS_PER_PAGE, 1, true, null, searchString); + const { onClose, startStep, flowType, onOpen, orgData } = useOrganizationModal(); const organizationsColumns = [ { @@ -39,21 +39,21 @@ const OrganizationsList = ({searchText}) => { label: "Contact Person", getValue: (org) => ( ( -
- - - {org?.name || "N/A"} - -
- ) +
+ + + {org?.name || "N/A"} + +
+ ) ), align: "text-start", }, @@ -67,7 +67,7 @@ const OrganizationsList = ({searchText}) => { key: "email", label: "Email", getValue: (org) => ( - @@ -84,7 +84,7 @@ const OrganizationsList = ({searchText}) => { }, ]; - const paginate = (page) => { + const paginate = (page) => { if (page >= 1 && page <= (data?.totalPages ?? 1)) { setCurrentPage(page); } @@ -93,73 +93,72 @@ const OrganizationsList = ({searchText}) => { if (isError) return
{error?.message || "Something went wrong"}
; return ( -
-
-
- - - {organizationsColumns.map((col) => ( - - ))} - + + )} - + +
-
{col.label}
-
- Action +
+
+ + + + {organizationsColumns.map((col) => ( + - - - - {data?.data?.length > 0 ? ( - data?.data?.map((org) => ( - - {organizationsColumns.map((col) => ( - - ))} - + + + + {data?.data?.length > 0 ? ( + data?.data?.map((org) => ( + + {organizationsColumns.map((col) => ( + - - )) - ) : ( - - - )} - -
+
{col.label}
- {col.customRender - ? col.customRender(org) - : col.getValue(org)} - -
- onOpen({startStep:5,orgData:org.id,flowType:"view"})}> - onOpen({startStep:4,orgData:org,flowType:"edit"})}> - -
+ ))} +
+ Action +
+ {col.customRender + ? col.customRender(org) + : col.getValue(org)}
-

{isLoading ? "Loading....":"Not Found Organization"}

+ ))} +
+
+ onOpen({ startStep: 5, orgData: org.id, flowType: "view" })}> + onOpen({ startStep: 4, orgData: org, flowType: "edit" })}> + +
- {data?.data?.length > 0 && ( - + )) + ) : ( +
+

{isLoading ? "Loading...." : "Not Found Organization"}

+
+ {data?.data?.length > 0 && ( + + )}
+
); }; diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index 0c8791f5..b7987062 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -202,7 +202,7 @@ const AttendancePage = () => {
{/* Search + Organization filter */} -
+