Merge pull request '401 Unauthorized Error on Attendance Menu.' (#222) from KartikBug#623 into Issues_Jun_3W

Reviewed-on: #222

src/components/Activities/AttendcesLogs.jsx

@@ -334,11 +334,11 @@ const AttendanceLog = ({
         {!loading && !isRefreshing && data.length === 0 && (
           <span>No employee logs</span>
         )}
-        {error && !loading && !isRefreshing && (
+        {/* {error && !loading && !isRefreshing && (
           <tr>
             <td colSpan={6}>{error}</td>
           </tr>
-        )}
+        )} */}
       </div>
       {!loading && !isRefreshing && processedData.length > 10 && (
         <nav aria-label="Page ">

src/components/Activities/Regularization.jsx

@@ -44,7 +44,7 @@ const Regularization = ({ handleRequest }) => {
 
   const { currentPage, totalPages, currentItems, paginate } = usePagination(
     filteredData,
-    10
+    20
   );
   useEffect(() => {
     eventBus.on("regularization", handler);
@@ -67,8 +67,8 @@ const Regularization = ({ handleRequest }) => {
 
   return (
     <div
-      className="table-responsive text-nowrap"
+      className="table-responsive text-nowrap pb-4"
-      style={{ minHeight: "300px" }}
+      
     >
       <table className="table mb-0">
         <thead>
@@ -85,11 +85,11 @@ const Regularization = ({ handleRequest }) => {
           </tr>
         </thead>
         <tbody>
-          {loading && (
+          {/* {loading && (
             <td colSpan={6} className="text-center py-5">
               Loading...
             </td>
-          )}
+          )} */}
 
           {!loading &&
             (regularizes?.length > 0 ? (
@@ -145,9 +145,9 @@ const Regularization = ({ handleRequest }) => {
             ))}
         </tbody>
       </table>
-      {!loading > 10 && (
+      {!loading && totalPages > 1 && (
         <nav aria-label="Page ">
-          <ul className="pagination pagination-sm justify-content-end py-1">
+          <ul className="pagination pagination-sm justify-content-end py-1 mt-3">
             <li className={`page-item  ${currentPage === 1 ? "disabled" : ""}`}>
               <button
                 className="page-link btn-xs"
@@ -190,4 +190,4 @@ const Regularization = ({ handleRequest }) => {
   );
 };
 
-export default Regularization;
+export default Regularization;