UI updation in Attendance Toady's and Regularization tab.

This commit is contained in:
Kartik Sharma 2025-10-14 15:44:36 +05:30
parent 765b4356a6
commit a9d1ba08dd
2 changed files with 242 additions and 238 deletions

View File

@ -113,6 +113,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
return (
<>
<div>
<div
className="table-responsive text-nowrap h-100"
style={{ minHeight: "200px" }} // Ensures fixed height
@ -228,14 +229,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
</table>
{!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
<Pagination
currentPage={currentPage}
totalPages={totalPages}
onPageChange={paginate}
/>
)}
</>
) : (
<div
@ -250,6 +244,14 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
</div>
)}
</div>
{!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
<Pagination
currentPage={currentPage}
totalPages={totalPages}
onPageChange={paginate}
/>
)}
</div>
</>
);
};

View File

@ -22,7 +22,7 @@ const Regularization = ({ handleRequest, searchTerm, projectId, organizationId,
const { regularizes, loading, error, refetch } =
useRegularizationRequests(selectedProject, organizationId, IncludeInActive);
useEffect(() => {
useEffect(() => {
if (regularizes && regularizes.length) {
setregularizedList((prev) => {
const prevIds = prev.map((i) => i.id).join(",");
@ -33,7 +33,7 @@ useEffect(() => {
return prev;
});
}
}, [regularizes]);
}, [regularizes]);
const sortByName = (a, b) => {
@ -132,6 +132,7 @@ useEffect(() => {
return (
<div>
<div className="table-responsive text-nowrap pb-4" style={{ minHeight: "200px" }}>
{loading ? (
<div className="d-flex justify-content-center align-items-center" style={{ height: "200px" }}>
@ -227,6 +228,7 @@ useEffect(() => {
</span>
</div>
)}
</div>
{!loading && totalPages > 1 && (
<Pagination
currentPage={currentPage}