Merge pull request '"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 s…' (#115) from Kartik_bug#278 into Issue_May_3W

Reviewed-on: #115

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">
+              <li className="d-flex flex-column align-items-start mb-4">
-                <i className="bx bx-flag"></i>
+                <div className="d-flex align-items-center">
-                <span className="fw-medium mx-2">Address:</span>{" "}
+                  <i className="bx bx-flag"></i>
-              </li>
+                  <span className="fw-medium mx-2">Address:</span>
-            </ul>
+                  {data.projectAddress?.length <= 20 && (
-            {/* <small className="card-text text-uppercase text-muted small">
+                    <span>{data.projectAddress}</span>
-              Contacts
+                  )}
-            </small> */}
+                </div>
-            <ul className="list-unstyled my-3 py-1">
+                {data.projectAddress?.length > 20 && (
-             
+                  <div className="ms-4 text-start">{data.projectAddress}</div>
-              {/* <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>
             </ul>
           </div>

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;
+
+

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,
           },

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