From 6e2d6405428beb9b1f34178c015f752648b4b83a Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Fri, 16 May 2025 10:49:54 +0530
Subject: [PATCH 1/2] "In the Manage Building popup (accessed from Project >
 Project List, by selecting a project and navigating to Infrastructure), the
 error message is now correctly displayed as 'Building name is required'.  A
 previous issue caused the message 'Expected string, received null' to appear
 initially."

---
 src/components/Project/Infrastructure/BuildingModel.jsx | 4 +++-
 src/components/Project/Infrastructure/InfraTable.jsx    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Project/Infrastructure/BuildingModel.jsx b/src/components/Project/Infrastructure/BuildingModel.jsx
index bc72c682..395fbbe1 100644
--- a/src/components/Project/Infrastructure/BuildingModel.jsx
+++ b/src/components/Project/Infrastructure/BuildingModel.jsx
@@ -47,7 +47,7 @@ const BuildingModel = ({
     }
 
     return () => {
-      setValue("name", null);
+      setValue("name", "");
     };
   }, [clearTrigger, onClearComplete, editingBuilding, project?.id]);
 
@@ -199,3 +199,5 @@ const BuildingModel = ({
 };
 
 export default BuildingModel;
+
+
diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx
index 91250657..30410c6c 100644
--- a/src/components/Project/Infrastructure/InfraTable.jsx
+++ b/src/components/Project/Infrastructure/InfraTable.jsx
@@ -31,7 +31,7 @@ const InfraTable = ({ buildings }) => {
         {
           building: null,
           floor: {
-            id: data.id || "0",
+            id: data.id || null,
             floorName: data.floorName,
             buildingId: data.buildingId,
           },

From 9e6cfdb659a5db9ca5d5c112c17a5690112da5e3 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 2/2] 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/Project/AboutProject.jsx | 34 +++++++++----------------
 src/pages/Activities/AttendancePage.jsx |  4 ++-
 2 files changed, 15 insertions(+), 23 deletions(-)

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">