From bc56ecfc76d3f88bc24ecb930ae5e880d89471c3 Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Fri, 16 May 2025 15:01:49 +0530
Subject: [PATCH] Changes in Attendance tab. 1. Filter the view to show only
 "Today's" attendance. 2. Display today's date prominently above the names in
 that tab.

---
 src/components/Activities/Attendance.jsx | 23 +++++++++-------
 src/components/Project/AboutProject.jsx  | 34 +++++++++---------------
 src/pages/Activities/AttendancePage.jsx  |  4 ++-
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index 9d4de50a..656df75b 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -9,6 +9,7 @@ import { useNavigate } from "react-router-dom";
 const Attendance = ({ attendance, getRole, handleModalData }) => {
   const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
+  const [todayDate, setTodayDate] = useState(new Date());
 
   // Ensure attendance is an array
   const attendanceList = Array.isArray(attendance) ? attendance : [];
@@ -41,6 +42,13 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
           <>
             <table className="table ">
               <thead>
+                <tr className="border-top-0" style={{ textAlign: 'left' }}>
+                  <td >
+                    <strong>Date : {todayDate.toLocaleDateString('en-GB')}</strong>
+                  </td>
+                  <td style={{ paddingLeft: '20px' }}>
+                  </td>
+                </tr>
                 <tr>
                   <th className="border-top-0" colSpan={2}>
                     Name
@@ -126,9 +134,8 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
               <nav aria-label="Page ">
                 <ul className="pagination pagination-sm justify-content-end py-1">
                   <li
-                    className={`page-item  ${
-                      currentPage === 1 ? "disabled" : ""
-                    }`}
+                    className={`page-item  ${currentPage === 1 ? "disabled" : ""
+                      }`}
                   >
                     <button
                       className="page-link btn-xs"
@@ -140,9 +147,8 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
                   {[...Array(totalPages)].map((_, index) => (
                     <li
                       key={index}
-                      className={`page-item ${
-                        currentPage === index + 1 ? "active" : ""
-                      }`}
+                      className={`page-item ${currentPage === index + 1 ? "active" : ""
+                        }`}
                     >
                       <button
                         className="page-link "
@@ -153,9 +159,8 @@ const Attendance = ({ attendance, getRole, handleModalData }) => {
                     </li>
                   ))}
                   <li
-                    className={`page-item ${
-                      currentPage === totalPages ? "disabled" : ""
-                    }`}
+                    className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                      }`}
                   >
                     <button
                       className="page-link "
diff --git a/src/components/Project/AboutProject.jsx b/src/components/Project/AboutProject.jsx
index 438de6be..b358e8c8 100644
--- a/src/components/Project/AboutProject.jsx
+++ b/src/components/Project/AboutProject.jsx
@@ -12,7 +12,7 @@ const AboutProject = ({ data }) => {
             <small className="card-text text-uppercase text-muted small">
               Profile
             </small>
-            <ul className="list-unstyled my-3 py-1">
+            <ul className="list-unstyled my-3">
               <li className="d-flex align-items-center mb-4">
                 <i className="bx bx-check"></i>
                 <span className="fw-medium mx-2">Start Date:</span>{" "}
@@ -41,27 +41,17 @@ const AboutProject = ({ data }) => {
                 <span className="fw-medium mx-2">Contact:</span>{" "}
                 <span>{data.contactPerson}</span>
               </li>
-              <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-flag"></i>
-                <span className="fw-medium mx-2">Address:</span>{" "}
-              </li>
-            </ul>
-            {/* <small className="card-text text-uppercase text-muted small">
-              Contacts
-            </small> */}
-            <ul className="list-unstyled my-3 py-1">
-             
-              {/* <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-phone"></i>
-                <span className="fw-medium mx-2">Contact Number:</span>{" "}
-                <span>NA</span>
-              </li> */}
-              {/* <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-envelope"></i>
-                <span className="fw-medium mx-2">Email:</span> <span>NA</span>
-              </li> */}          
-              <li className="d-flex align-items-start test-start mb-4">
-                <span>{data.projectAddress}</span>
+              <li className="d-flex flex-column align-items-start mb-4">
+                <div className="d-flex align-items-center">
+                  <i className="bx bx-flag"></i>
+                  <span className="fw-medium mx-2">Address:</span>
+                  {data.projectAddress?.length <= 20 && (
+                    <span>{data.projectAddress}</span>
+                  )}
+                </div>
+                {data.projectAddress?.length > 20 && (
+                  <div className="ms-4 text-start">{data.projectAddress}</div>
+                )}
               </li>
             </ul>
           </div>
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index d8ac6830..85ec52fe 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -161,6 +161,7 @@ const AttendancePage = () => {
               )}
             </div>
           </ul>
+          
           <ul className="nav nav-tabs" role="tablist">
             <li className="nav-item">
               <button
@@ -170,7 +171,7 @@ const AttendancePage = () => {
                 data-bs-toggle="tab"
                 data-bs-target="#navs-top-home"
               >
-                All
+                Today's
               </button>
             </li>
             <li className="nav-item">
@@ -216,6 +217,7 @@ const AttendancePage = () => {
                 </div>
               </>
             )}
+            
 
             {activeTab === "logs" && (
               <div className="tab-pane fade show active py-0">