From e9d8b6daea9f1b0cdf4ad976f4d5f3f7f4ad768d Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 16:43:44 +0530
Subject: [PATCH 1/3] Adding Dropdown and API call in Daily Progress Report.

---
 src/pages/Activities/DailyTask.jsx | 58 +++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index fc51f756..87bc52e2 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { useDispatch } from "react-redux";
 import { useTaskList } from "../../hooks/useTasks";
-import { useProjectName } from "../../hooks/useProjects";
+import { useProjectAssignedServices, useProjectName } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import Breadcrumb from "../../components/common/Breadcrumb";
 import DateRangePicker from "../../components/common/DateRangePicker";
@@ -24,6 +24,14 @@ const DailyTask = () => {
   const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK);
   const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK);
 
+  const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(selectedProject);
+
+  const [selectedService, setSelectedService] = useState("");
+
+  const handleServiceChange = (e) => {
+    setSelectedService(e.target.value);
+  };
+
   const [filters, setFilters] = useState({
     selectedBuilding: "",
     selectedFloors: [],
@@ -38,7 +46,6 @@ const DailyTask = () => {
     dateRange?.endDate || null
   );
 
-  // Ensure project is set
   useEffect(() => {
     if (!selectedProject && projectNames.length > 0) {
       debugger
@@ -46,7 +53,6 @@ const DailyTask = () => {
     }
   }, [selectedProject, projectNames, dispatch]);
 
-  // 🔹 Reset filters when project changes
   useEffect(() => {
     setFilters({
       selectedBuilding: "",
@@ -55,7 +61,6 @@ const DailyTask = () => {
     });
   }, [selectedProject]);
 
-  //  Memoized filtering
   const filteredTasks = useMemo(() => {
     if (!TaskList) return [];
     return TaskList.filter((task) => {
@@ -69,7 +74,6 @@ const DailyTask = () => {
     });
   }, [TaskList, filters]);
 
-  //  Memoized dates
   const groupedTasks = useMemo(() => {
     const groups = {};
     filteredTasks.forEach((task) => {
@@ -82,13 +86,11 @@ const DailyTask = () => {
       .map((date) => ({ date, tasks: groups[date] }));
   }, [filteredTasks]);
 
-  // --- Modal State
   const [modal, setModal] = useState({ type: null, data: null });
 
   const openModal = (type, data = null) => setModal({ type, data });
   const closeModal = () => setModal({ type: null, data: null });
 
-  // --- Render helpers
   const renderTeamMembers = (task, refIndex) => (
     <div
       key={refIndex}
@@ -133,7 +135,6 @@ const DailyTask = () => {
 
   return (
     <>
-      {/* --- Modals --- */}
       {modal.type === "report" && (
         <GlobalModel isOpen size="md" closeModal={closeModal}>
           <ReportTask report={modal.data} closeModal={closeModal} />
@@ -165,7 +166,7 @@ const DailyTask = () => {
           <div className="card-body p-1 p-sm-2">
             {!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
             {/* --- Filters --- */}
-            <div className="d-flex align-items-center mb-2">
+            {/* <div className="d-flex align-items-center mb-2">
               <DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
               <FilterIcon
                 taskListData={TaskList}
@@ -175,8 +176,47 @@ const DailyTask = () => {
                 currentSelectedActivities={filters.selectedActivities}
                 selectedProject={selectedProject}
               />
+            </div> */}
+
+            <div className="d-flex align-items-center justify-content-between mb-2">
+
+              <div className="d-flex align-items-center">
+                <DateRangePicker
+                  onRangeChange={setDateRange}
+                  endDateMode="today"
+                  DateDifference="6"
+                  dateFormat="DD-MM-YYYY"
+                />
+                <FilterIcon
+                  taskListData={TaskList}
+                  onApplyFilters={setFilters}
+                  currentSelectedBuilding={filters.selectedBuilding}
+                  currentSelectedFloors={filters.selectedFloors}
+                  currentSelectedActivities={filters.selectedActivities}
+                  selectedProject={selectedProject}
+                />
+              </div>
+
+              <div>
+                <select
+                  name="serviceSelect"
+                  className="form-select form-select-sm"
+                  value={selectedService}
+                  onChange={handleServiceChange}
+                  style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
+                >
+                  {servicesLoading && <option>Loading...</option>}
+                  {assignedServices?.map((service) => (
+                    <option key={service.id} value={service.id}>
+                      {service.name}
+                    </option>
+                  ))}
+                </select>
+              </div>
             </div>
 
+
+
             {/* --- Table --- */}
             <div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>
               <table className="table">

From 27b62c858df737cb29933ff26f404576d294d6b8 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 19:50:50 +0530
Subject: [PATCH 2/3] Change the position of Datepicker and Dropdown box.

---
 src/pages/Activities/DailyTask.jsx | 86 +++++++++++++++++-------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 87bc52e2..b935b0a6 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -165,28 +165,48 @@ const DailyTask = () => {
         <div className="card card-action mb-6">
           <div className="card-body p-1 p-sm-2">
             {!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
-            {/* --- Filters --- */}
-            {/* <div className="d-flex align-items-center mb-2">
-              <DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
-              <FilterIcon
-                taskListData={TaskList}
-                onApplyFilters={setFilters}
-                currentSelectedBuilding={filters.selectedBuilding}
-                currentSelectedFloors={filters.selectedFloors}
-                currentSelectedActivities={filters.selectedActivities}
-                selectedProject={selectedProject}
-              />
-            </div> */}
 
             <div className="d-flex align-items-center justify-content-between mb-2">
 
-              <div className="d-flex align-items-center">
-                <DateRangePicker
-                  onRangeChange={setDateRange}
-                  endDateMode="today"
-                  DateDifference="6"
-                  dateFormat="DD-MM-YYYY"
-                />
+              {/* --- Left: Service Dropdown + Filter Icon --- */}
+              <div className="d-flex align-items-center gap-6">
+                <div className="me-3">
+                  {servicesLoading ? (
+                    <span>Loading...</span>
+                  ) : assignedServices?.length > 1 ? (
+                    <select
+                      name="serviceSelect"
+                      className="form-select form-select-sm"
+                      value={selectedService}
+                      onChange={handleServiceChange}
+                      style={{ fontSize: "0.875rem", height: "32px", minWidth: "190px" }}
+                    >
+                      {assignedServices.map((service) => (
+                        <option key={service.id} value={service.id}>
+                          {service.name}
+                        </option>
+                      ))}
+                    </select>
+                  ) : (
+                    <div
+                      style={{
+                        fontSize: "0.875rem",
+                        height: "32px",
+                        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>
+
                 <FilterIcon
                   taskListData={TaskList}
                   onApplyFilters={setFilters}
@@ -197,26 +217,16 @@ const DailyTask = () => {
                 />
               </div>
 
-              <div>
-                <select
-                  name="serviceSelect"
-                  className="form-select form-select-sm"
-                  value={selectedService}
-                  onChange={handleServiceChange}
-                  style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
-                >
-                  {servicesLoading && <option>Loading...</option>}
-                  {assignedServices?.map((service) => (
-                    <option key={service.id} value={service.id}>
-                      {service.name}
-                    </option>
-                  ))}
-                </select>
+              {/* --- Right: DateRangePicker --- */}
+              <div className="me-8">
+                <DateRangePicker
+                  onRangeChange={setDateRange}
+                  endDateMode="today"
+                  DateDifference="6"
+                  dateFormat="DD-MM-YYYY"
+                />
               </div>
             </div>
-
-
-
             {/* --- Table --- */}
             <div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>
               <table className="table">
@@ -288,4 +298,4 @@ const DailyTask = () => {
     </>
   );
 };
-export default DailyTask;
+export default DailyTask;
\ No newline at end of file

From 731d2dbed727e4c79f43698bc8fd70793749d762 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 20 Sep 2025 11:51:32 +0530
Subject: [PATCH 3/3] Changes in Infrastructure.

---
 src/components/common/FilterIcon.jsx |  4 ++--
 src/pages/Activities/DailyTask.jsx   | 34 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/common/FilterIcon.jsx b/src/components/common/FilterIcon.jsx
index 0f938e1a..2dc43daa 100644
--- a/src/components/common/FilterIcon.jsx
+++ b/src/components/common/FilterIcon.jsx
@@ -203,7 +203,7 @@ const FilterIcon = ({
           <>
             <li><hr className="my-1" /></li>
             <li>
-              <div className="fw-bold text-dark mb-1">Floors</div>
+              <div className="fw-bold text-dark mb-2 mt-2">Floors</div>
               <div className="row">
                 {uniqueFloors.length > 0 ? (
                   uniqueFloors.map((floor, idx) => (
@@ -235,7 +235,7 @@ const FilterIcon = ({
           <>
             <li><hr className="my-1" /></li>
             <li>
-              <div className="fw-bold text-dark mb-1">Activities</div>
+              <div className="fw-bold text-dark mb-2 mt-2">Activities</div>
               <div className="row">
                 {uniqueActivities.length > 0 ? (
                   uniqueActivities.map((activity, idx) => (
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index b935b0a6..ca676647 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -162,7 +162,7 @@ const DailyTask = () => {
       <div className="container-fluid">
         <Breadcrumb data={[{ label: "Home", link: "/dashboard" }, { label: "Daily Progress Report" }]} />
 
-        <div className="card card-action mb-6">
+        <div className="card card-action mb-6 p-5">
           <div className="card-body p-1 p-sm-2">
             {!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
 
@@ -172,7 +172,7 @@ const DailyTask = () => {
               <div className="d-flex align-items-center gap-6">
                 <div className="me-3">
                   {servicesLoading ? (
-                    <span>Loading...</span>
+                    <span></span>
                   ) : assignedServices?.length > 1 ? (
                     <select
                       name="serviceSelect"
@@ -189,24 +189,27 @@ const DailyTask = () => {
                     </select>
                   ) : (
                     <div
-                      style={{
-                        fontSize: "0.875rem",
-                        height: "32px",
-                        width: "190px",
-                        border: "1px solid #ced4da",
-                        borderRadius: "0.25rem",
-                        padding: "4px 8px",
-                        display: "flex",
-                        alignItems: "center",
-                      }}
+                      className="ms-4 mt-2"
                     >
                       {assignedServices?.length === 1
-                        ? assignedServices[0].name
+                        ? <h5>{assignedServices[0].name}</h5>
                         : "No service available"}
                     </div>
                   )}
                 </div>
 
+                {/* <FilterIcon
+                  taskListData={TaskList}
+                  onApplyFilters={setFilters}
+                  currentSelectedBuilding={filters.selectedBuilding}
+                  currentSelectedFloors={filters.selectedFloors}
+                  currentSelectedActivities={filters.selectedActivities}
+                  selectedProject={selectedProject}
+                /> */}
+              </div>
+
+              {/* --- Right: DateRangePicker --- */}
+              <div className="d-flex justify-content-end align-items-center gap-3 me-3">
                 <FilterIcon
                   taskListData={TaskList}
                   onApplyFilters={setFilters}
@@ -215,10 +218,6 @@ const DailyTask = () => {
                   currentSelectedActivities={filters.selectedActivities}
                   selectedProject={selectedProject}
                 />
-              </div>
-
-              {/* --- Right: DateRangePicker --- */}
-              <div className="me-8">
                 <DateRangePicker
                   onRangeChange={setDateRange}
                   endDateMode="today"
@@ -226,6 +225,7 @@ const DailyTask = () => {
                   dateFormat="DD-MM-YYYY"
                 />
               </div>
+
             </div>
             {/* --- Table --- */}
             <div className="table-responsive text-nowrap mt-3" style={{ minHeight: "200px" }}>