From 9b372889017e6584eb4fbe1d96695bdb8566c098 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 16:32:34 +0530
Subject: [PATCH 1/3] Adding Dropdown in Daily Task Planning and call api.

---
 src/pages/Activities/TaskPlannng.jsx | 52 +++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx
index 25cf63f2..6ab0c7df 100644
--- a/src/pages/Activities/TaskPlannng.jsx
+++ b/src/pages/Activities/TaskPlannng.jsx
@@ -1,22 +1,30 @@
-import React,{useEffect,useRef} from "react";
+import React, { useEffect, useState } from "react";
 import Breadcrumb from "../../components/common/Breadcrumb";
 import InfraPlanning from "../../components/Activities/InfraPlanning";
 import { useProjectName } from "../../hooks/useProjects";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useSelectedProject } from "../../slices/apiDataManager";
-
+import { useProjectAssignedServices } from "../../hooks/useProjects";
 const TaskPlannng = () => {
-const selectedProject = useSelectedProject();
-const dispatch = useDispatch();
-const { projectNames = [], loading: projectLoading } = useProjectName();
+  const selectedProject = useSelectedProject();
+  const dispatch = useDispatch();
+  const { projectNames = [], loading: projectLoading } = useProjectName();
 
-useEffect(() => {
-  if (!selectedProject) {
-    dispatch(setProjectId(projectNames[0]?.id));
-  }
-}, [projectNames, selectedProject?.id, dispatch]);
+  // Service dropdown state
+  const { data: assignedServices, isLoading: servicesLoading } =
+    useProjectAssignedServices(selectedProject);
+  const [selectedService, setSelectedService] = useState("");
 
+  useEffect(() => {
+    if (!selectedProject && projectNames?.length > 0) {
+      dispatch(setProjectId(projectNames[0]?.id));
+    }
+  }, [projectNames, selectedProject, dispatch]);
+
+  const handleServiceChange = (e) => {
+    setSelectedService(e.target.value);
+  };
 
   return (
     <div className="container-fluid">
@@ -26,8 +34,28 @@ useEffect(() => {
           { label: "Daily Task Planning" },
         ]}
       />
+
+      {/* 🔹 Service Dropdown */}
+      <div className="mb-3">
+        <select
+          id="serviceSelect"
+          className="form-select"
+          value={selectedService}
+          onChange={handleServiceChange}
+          style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
+        >
+          {servicesLoading && <option>Loading...</option>}
+          {assignedServices?.map((service) => (
+            <option key={service.id} value={service.id}>
+              {service.name}
+            </option>
+          ))}
+        </select>
+      </div>
+
+      {/* 🔹 InfraPlanning only when project is selected */}
       {selectedProject ? (
-        <InfraPlanning />
+        <InfraPlanning selectedService={selectedService} />
       ) : (
         <div className="text-center">Please Select Project</div>
       )}

From 9223f7a1768ea61544224d76bce87212d2965fc7 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 20:03:36 +0530
Subject: [PATCH 2/3] Adding Card in Daily Progress Report.

---
 src/components/Activities/InfraPlanning.jsx |  4 +-
 src/components/Project/ProjectInfra.jsx     |  2 +-
 src/pages/Activities/TaskPlannng.jsx        | 70 ++++++++++++++-------
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx
index dc237c63..0e9c9590 100644
--- a/src/components/Activities/InfraPlanning.jsx
+++ b/src/components/Activities/InfraPlanning.jsx
@@ -55,7 +55,7 @@ const InfraPlanning = () => {
 
   if (isFetched && (!projectInfra || projectInfra.length === 0)) {
     return (
-      <div className="card text-center">
+      <div className="text-center">
         <p className="my-3">No Result Found</p>
       </div>
     );
@@ -63,11 +63,9 @@ const InfraPlanning = () => {
 
   return (
     <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
-      <div className="card">
         <div className="card-body" style={{ padding: "0.5rem" }}>
           <div className="row">
             <InfraTable buildings={projectInfra} projectId={selectedProject} />
-          </div>
         </div>
       </div>
     </div>
diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 38c05567..a0a137cf 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -129,7 +129,7 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
               <div className="row ">
                 {isLoading && <p>Loading....</p>}
                 {projectInfra && projectInfra?.length > 0 && (
-                  <InfraTable
+                  <InfraTable 
                     buildings={projectInfra}
                     projectId={projectId}
                     // handleFloor={submitData}
diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx
index 6ab0c7df..d24b6a30 100644
--- a/src/pages/Activities/TaskPlannng.jsx
+++ b/src/pages/Activities/TaskPlannng.jsx
@@ -6,6 +6,7 @@ import { useDispatch } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useSelectedProject } from "../../slices/apiDataManager";
 import { useProjectAssignedServices } from "../../hooks/useProjects";
+
 const TaskPlannng = () => {
   const selectedProject = useSelectedProject();
   const dispatch = useDispatch();
@@ -35,30 +36,53 @@ const TaskPlannng = () => {
         ]}
       />
 
-      {/* 🔹 Service Dropdown */}
-      <div className="mb-3">
-        <select
-          id="serviceSelect"
-          className="form-select"
-          value={selectedService}
-          onChange={handleServiceChange}
-          style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
-        >
-          {servicesLoading && <option>Loading...</option>}
-          {assignedServices?.map((service) => (
-            <option key={service.id} value={service.id}>
-              {service.name}
-            </option>
-          ))}
-        </select>
-      </div>
+      <div className="card">
+        <div className="card-body">
+          {/* Service Dropdown */}
+          <div className="mb-3 ms-2">
+            {assignedServices?.length > 1 ? (
+              <select
+                id="serviceSelect"
+                className="form-select"
+                value={selectedService}
+                onChange={handleServiceChange}
+                style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
+              >
+                {assignedServices.map((service) => (
+                  <option key={service.id} value={service.id}>
+                    {service.name}
+                  </option>
+                ))}
+              </select>
+            ) : (
+              <div
+                style={{
+                  fontSize: "0.875rem",
+                  height: "35px",
+                  width: "190px",
+                  border: "1px solid #ced4da",
+                  borderRadius: "0.25rem",
+                  padding: "4px 8px",
+                  display: "flex",
+                  alignItems: "center",
+                }}
+              >
+                {assignedServices?.length === 1
+                  ? assignedServices[0].name
+                  : "No service available"}
+              </div>
+            )}
+          </div>
 
-      {/* 🔹 InfraPlanning only when project is selected */}
-      {selectedProject ? (
-        <InfraPlanning selectedService={selectedService} />
-      ) : (
-        <div className="text-center">Please Select Project</div>
-      )}
+
+          {/* Infra Planning Component */}
+          {selectedProject ? (
+            <InfraPlanning selectedService={selectedService} />
+          ) : (
+            <div className="text-center">Please Select Project</div>
+          )}
+        </div>
+      </div>
     </div>
   );
 };

From 58b5da17939b3df2274e0cfffe733537d2eb6911 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 20 Sep 2025 11:39:14 +0530
Subject: [PATCH 3/3] Changes in Daily Task planning

---
 src/pages/Activities/TaskPlannng.jsx | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx
index d24b6a30..6e5c4987 100644
--- a/src/pages/Activities/TaskPlannng.jsx
+++ b/src/pages/Activities/TaskPlannng.jsx
@@ -39,7 +39,7 @@ const TaskPlannng = () => {
       <div className="card">
         <div className="card-body">
           {/* Service Dropdown */}
-          <div className="mb-3 ms-2">
+          <div className="mb-1 ms-2">
             {assignedServices?.length > 1 ? (
               <select
                 id="serviceSelect"
@@ -56,19 +56,10 @@ const TaskPlannng = () => {
               </select>
             ) : (
               <div
-                style={{
-                  fontSize: "0.875rem",
-                  height: "35px",
-                  width: "190px",
-                  border: "1px solid #ced4da",
-                  borderRadius: "0.25rem",
-                  padding: "4px 8px",
-                  display: "flex",
-                  alignItems: "center",
-                }}
+                className="text-start"
               >
                 {assignedServices?.length === 1
-                  ? assignedServices[0].name
+                  ? <h5>{ assignedServices[0].name}</h5>
                   : "No service available"}
               </div>
             )}