Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2

src/components/Activities/Attendance.jsx

@@ -42,13 +42,13 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
           <>
             <table className="table ">
               <thead>
-                <tr className="border-top-0" style={{ textAlign: 'left' }}>
-                  <td >
+                <tr className="border-none" style={{ textAlign: 'left' }}>
+                  <td style={{ borderBottom: 'none' }}>
                     <strong>Date : {todayDate.toLocaleDateString('en-GB')}</strong>
                   </td>
-                  <td style={{ paddingLeft: '20px' }}>
-                  </td>
+                  <td style={{ paddingLeft: '20px', borderBottom: 'none' }}></td>
                 </tr>
+
                 <tr>
                   <th className="border-top-0" colSpan={2}>
                     Name

src/components/Activities/AttendcesLogs.jsx

@@ -122,6 +122,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
 
   return (
     <>
+      
         <div
           className="dataTables_length text-start py-2 d-flex justify-content-between"
           id="DataTables_Table_0_length"
@@ -138,7 +139,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
             />
           </div>
         </div>
-      <div className="table-responsive text-nowrap">
+        <div className="table-responsive text-nowrap" style={{ minHeight: "250px" }}>
           {data && data.length > 0 && (
             <table className="table mb-0">
               <thead>
@@ -217,6 +218,8 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
                 }, [])}
               </tbody>
             </table>
+
+
           )}
           {!loading && !isRefreshing && data.length === 0 && <span>No employee logs</span>}
           {error && !loading && !isRefreshing && (

src/components/Activities/Regularization.jsx

@@ -31,7 +31,7 @@ const Regularization = ({ handleRequest }) => {
   );
 
   return (
-    <div className="table-responsive text-nowrap">
+    <div className="table-responsive text-nowrap" style={{minHeight:"300px"}}>
       <table className="table mb-0">
         <thead>
           <tr>
@@ -47,7 +47,7 @@ const Regularization = ({ handleRequest }) => {
           </tr>
         </thead>
         <tbody>
-          {loading && <td colSpan={5}>Loading...</td>}
+          {loading && <td colSpan={6} className="text-center py-5">Loading...</td>}
 
           {!loading &&
             (regularizes?.length > 0 ? (
@@ -88,12 +88,17 @@ const Regularization = ({ handleRequest }) => {
               ))
             ) : (
               <tr>
-                <td colSpan={5}>No Record Found</td>
+                <td colSpan={6}
+                  className="text-center" style={{
+                    height: "200px",
+                    verticalAlign: "middle",
+                    borderBottom: "none",
+                  }}>No Record Found</td>
               </tr>
             ))}
         </tbody>
       </table>
-      {!loading && (
+      {!loading >10 && (
         <nav aria-label="Page ">
           <ul className="pagination pagination-sm justify-content-end py-1">
             <li className={`page-item  ${currentPage === 1 ? "disabled" : ""}`}>
@@ -107,8 +112,7 @@ const Regularization = ({ handleRequest }) => {
             {[...Array(totalPages)].map((_, index) => (
               <li
                 key={index}
-                className={`page-item ${
-                  currentPage === index + 1 ? "active" : ""
+                className={`page-item ${currentPage === index + 1 ? "active" : ""
                   }`}
               >
                 <button
@@ -120,8 +124,7 @@ const Regularization = ({ handleRequest }) => {
               </li>
             ))}
             <li
-              className={`page-item ${
-                currentPage === totalPages ? "disabled" : ""
+              className={`page-item ${currentPage === totalPages ? "disabled" : ""
                 }`}
             >
               <button

src/components/Project/Infrastructure/TaskModel.jsx

@@ -86,7 +86,7 @@ const TaskModel = ({
       ...prev,
       floorId: value,
       workAreaId: 0,
-      activityID: 0,
+      activityID: "",
       workCategoryId: categoryData?.[0]?.id?.toString() ?? "",
     }));
   };
@@ -291,7 +291,7 @@ const TaskModel = ({
                     {...register("activityID")}
                     onChange={handleActivityChange}
                   >
-                    <option value="0">Select Activity</option>
+                    <option value="">Select Activity</option>
                     {activityData &&
                       activityData.length > 0 &&
                       activityData

src/components/common/DateRangePicker.jsx

@@ -1,21 +1,27 @@
 import React, { useEffect, useRef } from "react";
 
-const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate = new Date() - 1 }) => {
+const DateRangePicker = ({
+  onRangeChange,
+  DateDifference = 7,
+  endDateMode = "yesterday", // "today" or "yesterday"
+}) => {
   const inputRef = useRef(null);
 
   useEffect(() => {
-    const today = new Date();;
-    today.setDate(today.getDate() - 1);
-    const fifteenDaysAgo = new Date();
+    const endDate = new Date();
+    if (endDateMode === "yesterday") {
+      endDate.setDate(endDate.getDate() - 1);
+    }
 
-    fifteenDaysAgo.setDate(today.getDate() - DateDifference);
+    const startDate = new Date();
+    startDate.setDate(endDate.getDate() - DateDifference);
 
     const fp = flatpickr(inputRef.current, {
       mode: "range",
-      dateFormat: "Y-m-d",           // Format for backend (actual input value)
-      altInput: true,                // Enables a visually different field
+      dateFormat: "Y-m-d",
+      altInput: true,
       altFormat: "d-m-Y",
-      defaultDate: [fifteenDaysAgo, today],
+      defaultDate: [startDate, endDate],
       static: true,
       clickOpens: true,
       onChange: (selectedDates, dateStr) => {
@@ -25,16 +31,14 @@ const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate =
     });
 
     onRangeChange?.({
-      // startDate: fifteenDaysAgo.toISOString().split("T")[0],
-      // endDate: today.toISOString().split("T")[0],
-      startDate: fifteenDaysAgo.toLocaleDateString("en-CA"),
-      endDate: today.toLocaleDateString("en-CA"),
+      startDate: startDate.toLocaleDateString("en-CA"),
+      endDate: endDate.toLocaleDateString("en-CA"),
     });
 
     return () => {
       fp.destroy();
     };
-  }, [onRangeChange]);
+  }, [onRangeChange, DateDifference, endDateMode]);
 
   return (
     <input

src/pages/Activities/DailyTask.jsx

@@ -141,6 +141,7 @@ const DailyTask = () => {
               <div className="col-6 text-start">
                 <DateRangePicker
                   onRangeChange={setDateRange}
+                  endDateMode="today"
                   DateDifference="6"
                   dateFormat="DD-MM-YYYY"
                 />

src/pages/employee/AttendancesEmployeeRecords.jsx

@@ -141,7 +141,7 @@ const AttendancesEmployeeRecords = ({ employee }) => {
           id="DataTables_Table_0_length"
         >
           <div className="col-md-3 my-0 ">
-            <DateRangePicker onRangeChange={setDateRange} />
+            <DateRangePicker onRangeChange={setDateRange} endDateMode="yesterday"/>
           </div>
           <div className="col-md-2 m-0 text-end">
             <i