From 0e5e716df2434ecb19c17b6128569972d4d21816 Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Thu, 9 Oct 2025 16:20:43 +0530
Subject: [PATCH 1/4] removed debuggger

---
 src/hooks/useAttendance.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hooks/useAttendance.js b/src/hooks/useAttendance.js
index 376b8ea3..e89a94ec 100644
--- a/src/hooks/useAttendance.js
+++ b/src/hooks/useAttendance.js
@@ -207,7 +207,6 @@ export const useMarkAttendance = () => {
     onSuccess: (data, variables) => {
       if (variables.forWhichTab == 1) {
         queryClient.setQueryData(["attendance", selectedProject,selectedOrganization], (oldData) => {
-debugger
           if (!oldData) return oldData;
           return oldData.map((emp) =>
             emp.employeeId === data.employeeId ? { ...emp, ...data } : emp

From 1c4804fed259a5c47583279e1b3d5fca8fcc9241 Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Thu, 9 Oct 2025 16:48:15 +0530
Subject: [PATCH 2/4] added for  serviceI dropdown list

---
 src/pages/DailyProgressReport/DailyProgrssReport.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/DailyProgressReport/DailyProgrssReport.jsx b/src/pages/DailyProgressReport/DailyProgrssReport.jsx
index 282ab27c..2e027935 100644
--- a/src/pages/DailyProgressReport/DailyProgrssReport.jsx
+++ b/src/pages/DailyProgressReport/DailyProgrssReport.jsx
@@ -86,7 +86,7 @@ const DailyProgrssReport = () => {
         />
 
         <div className="card card-fullscreen p-5">
-          <div className="col-sm-4 col-md-3 col-12">
+            {data?.data?.length > 0 && (<div className="col-sm-4 col-md-3 col-12">
             <select
               className="form-select form-select-sm"
               value={service ?? ""}
@@ -107,7 +107,7 @@ const DailyProgrssReport = () => {
                 </>
               )}
             </select>
-          </div>
+          </div>)}
           <div>
             <TaskReportList />
           </div>

From 91ffc5a0e0d5f3705f3b1a978de5a09c9c7e913b Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Thu, 9 Oct 2025 17:23:04 +0530
Subject: [PATCH 3/4] added filter for DailyTask Report

---
 .../TaskReportFilterPanel.jsx                 | 88 +++++++++++--------
 .../DailyProgressRport/TaskRportScheam.jsx    | 18 ++--
 .../master/Services/ServicesGroups.jsx        |  1 -
 src/hooks/useTasks.js                         | 33 ++++++-
 src/pages/Gallary/ImageGallaryPage.jsx        |  4 +-
 src/repositories/TaskRepository.jsx           |  2 +
 6 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/src/components/DailyProgressRport/TaskReportFilterPanel.jsx b/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
index 003339b4..371cdd12 100644
--- a/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
+++ b/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useCurrentService, useProjectInfra } from "../../hooks/useProjects";
+import { useCurrentService } from "../../hooks/useProjects";
 import { useSelectedProject } from "../../slices/apiDataManager";
 import { FormProvider, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -10,15 +10,14 @@ import {
 import { DateRangePicker1 } from "../common/DateRangePicker";
 import SelectMultiple from "../common/SelectMultiple";
 import { localToUtc } from "../../utils/appUtils";
+import { useTaskFilter } from "../../hooks/useTasks";
 
 const TaskReportFilterPanel = ({ handleFilter }) => {
   const [resetKey, setResetKey] = useState(0);
-  const selectedProjec = useSelectedProject();
+  const selectedProject = useSelectedProject();
   const selectedService = useCurrentService();
-  const { projectInfra, isLoading, error, isFetched } = useProjectInfra(
-    selectedProjec,
-    selectedService
-  );
+  const { data } = useTaskFilter(selectedProject);
+
   const methods = useForm({
     resolver: zodResolver(TaskReportFilterSchema),
     defaultValues: TaskReportDefaultValue,
@@ -32,21 +31,19 @@ const TaskReportFilterPanel = ({ handleFilter }) => {
   } = methods;
 
   const onSubmit = (formData) => {
-  console.log(formData)
-     const filterPayload = {
-      startDate:localToUtc(formData.startDate),
-      endDate:localToUtc(formData.endDate)
-      
-     }
+    const filterPayload = {
+      ...formData,
+      dateFrom: localToUtc(formData.dateFrom),
+      dateTo: localToUtc(formData.dateTo),
+    };
     handleFilter(filterPayload);
   };
 
-  const onClear =()=>{
+  const onClear = () => {
     setResetKey((prev) => prev + 1);
-    handleFilter(TaskReportDefaultValue)
-    reset(TaskReportDefaultValue)
-  }
-  
+    handleFilter(TaskReportDefaultValue);
+    reset(TaskReportDefaultValue);
+  };
   return (
     <FormProvider {...methods}>
       <form onSubmit={handleSubmit(onSubmit)} className="p-2 text-start">
@@ -54,34 +51,47 @@ const TaskReportFilterPanel = ({ handleFilter }) => {
           <label className="fw-semibold">Choose Date Range:</label>
           <DateRangePicker1
             placeholder="DD-MM-YYYY To DD-MM-YYYY"
-            startField="startDate"
-            endField="endDate"
+            startField="dateFrom"
+            endField="dateTo"
             resetSignal={resetKey}
-            defaultRange={true}
+            defaultRange={false}
           />
         </div>
 
-        {/* <div className="row g-2">
-            <SelectMultiple
-              name="buildingIds"
-              label="Projects"
-              options={projectInfra}
-              labelKey="buildingName"
-              valueKey="id"
-            />
-          </div>
-          <div className="row g-2">
-            <SelectMultiple
-              name="floorIds"
-              label="Floor"
-              options={projectInfra}
-              labelKey="floorName"
-              valueKey="id"
-            />
-          </div> */}
+        <div className="row g-2">
+          <SelectMultiple
+            name="buildingIds"
+            label="Building"
+            options={data?.buildings}
+            labelKey="name"
+            valueKey="id"
+          />
+        </div>
+        <div className="row g-2">
+          <SelectMultiple
+            name="floorIds"
+            label="Floor"
+            options={data?.floors}
+            labelKey="name"
+            valueKey="id"
+          />
+        </div>
+        <div className="row g-2">
+          <SelectMultiple
+            name="activityIds"
+            label="Activities"
+            options={data?.activities}
+            labelKey="name"
+            valueKey="id"
+          />
+        </div>
 
         <div className="d-flex justify-content-end py-3 gap-2">
-          <button type="button" className="btn btn-label-secondary btn-sm" onClick={onClear}>
+          <button
+            type="button"
+            className="btn btn-label-secondary btn-sm"
+            onClick={onClear}
+          >
             Clear
           </button>
           <button type="submit" className="btn btn-primary btn-sm">
diff --git a/src/components/DailyProgressRport/TaskRportScheam.jsx b/src/components/DailyProgressRport/TaskRportScheam.jsx
index 11a79e6f..0cb38a77 100644
--- a/src/components/DailyProgressRport/TaskRportScheam.jsx
+++ b/src/components/DailyProgressRport/TaskRportScheam.jsx
@@ -1,15 +1,17 @@
 import { z } from "zod";
 
 export const TaskReportFilterSchema = z.object({
-  // buildingIds: z.array(z.string()).optional(),
-  // floorIds: z.array(z.string()).optional(),
-  startDate: z.string().optional(),
-  endDate: z.string().optional(),
+  buildingIds: z.array(z.string()).optional(),
+  floorIds: z.array(z.string()).optional(),
+  activityIds: z.array(z.string()).optional(),
+  dateFrom: z.string().optional(),
+  dateTo: z.string().optional(),
 });
 
 export const TaskReportDefaultValue = {
-    // buildingIds:[],
-    // floorIds:[],
-    startDate:null,
-    endDate:null
+    buildingIds:[],
+    floorIds:[],
+    activityIds:[],
+    dateFrom:null,
+    dateTo:null
 }
\ No newline at end of file
diff --git a/src/components/master/Services/ServicesGroups.jsx b/src/components/master/Services/ServicesGroups.jsx
index b4262351..d135b052 100644
--- a/src/components/master/Services/ServicesGroups.jsx
+++ b/src/components/master/Services/ServicesGroups.jsx
@@ -37,7 +37,6 @@ const ServiceGroups = ({ service }) => {
 
     <div className="w-100 my-2">
       
-      <p className="fs-5 fw-semibold">Manage Service</p>
       <div className="accordion" id="accordionExample">
         <div className="accordion-item active shadow-none">
           {/* Service Header */}
diff --git a/src/hooks/useTasks.js b/src/hooks/useTasks.js
index 5073c115..e1462f92 100644
--- a/src/hooks/useTasks.js
+++ b/src/hooks/useTasks.js
@@ -8,11 +8,30 @@ import { useSelector } from "react-redux";
 
 // ---------Query---------------------------------
 
-export const useTaskList = (projectId, pageSize, pageNumber, serviceId, filter) => {
 
+
+const cleanFilter = (filter) => {
+  const cleaned = { ...filter };
+
+  ["buildingIds", "floorIds", "activityIds"].forEach((key) => {
+    if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
+      delete cleaned[key];
+    }
+  });
+  return cleaned;
+};
+
+export const useTaskList = (
+  projectId,
+  pageSize,
+  pageNumber,
+  serviceId,
+  filter
+) => {
   return useQuery({
     queryKey: ["taskList", projectId, pageSize, pageNumber, serviceId, filter],
     queryFn: async () => {
+      const cleanedFilter  = cleanFilter(filter)
       const response = await TasksRepository.getTaskList(
         projectId,
         pageSize,
@@ -22,10 +41,20 @@ export const useTaskList = (projectId, pageSize, pageNumber, serviceId, filter)
       );
       return response.data;
     },
-    enabled:!!projectId
+    enabled: !!projectId,
   });
 };
 
+export const useTaskFilter = (projectId) => {
+  return useQuery({
+    queryKey: ["taskFilter", projectId],
+    queryFn: async () => {
+      const resp = await TasksRepository.getTaskListFilter(projectId);
+      return resp.data;
+    },
+    enabled:!!projectId
+  });
+};
 
 export const useTaskById = (TaskId) => {
   const {
diff --git a/src/pages/Gallary/ImageGallaryPage.jsx b/src/pages/Gallary/ImageGallaryPage.jsx
index b8d6383d..6322fec6 100644
--- a/src/pages/Gallary/ImageGallaryPage.jsx
+++ b/src/pages/Gallary/ImageGallaryPage.jsx
@@ -77,7 +77,7 @@ const ImageGalleryPage = () => {
         />
 
         <div className="card page-min-h p-2">
-          {selectedProjectId && (
+          {/* {selectedProjectId && (
             <div className="d-flex flex-row w-20 pb-2">
             {!isLoading && assignedServices?.length === 0 ? (
               <span className="badge bg-label-secondary">
@@ -102,7 +102,7 @@ const ImageGalleryPage = () => {
               </select>
             )}
           </div>
-          )}
+          )} */}
 
           <ImageGalleryListView filter={filter}/>
         </div>
diff --git a/src/repositories/TaskRepository.jsx b/src/repositories/TaskRepository.jsx
index 9afc47a0..06e6a8fc 100644
--- a/src/repositories/TaskRepository.jsx
+++ b/src/repositories/TaskRepository.jsx
@@ -16,6 +16,8 @@ export const TasksRepository = {
     return api.get(url);
   },
 
+  getTaskListFilter:(projectId)=>api.get(`/api/task/filter/${projectId}`),
+
   getTaskById: (id) => api.get(`/api/task/get/${id}`),
   reportTask: (data) => api.post("api/task/report", data),
   taskComments: (data) => api.post("api/task/comment", data),

From 5d1ccb957234daa4e35183e6dae6329932abe172 Mon Sep 17 00:00:00 2001
From: "pramod.mahajan" <pramod.mahajan@marcoaiot.com>
Date: Thu, 9 Oct 2025 17:25:03 +0530
Subject: [PATCH 4/4] changed buttons size

---
 src/pages/Directory/ContactFilterPanel.jsx | 4 ++--
 src/pages/Directory/NoteFilterPanel.jsx    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Directory/ContactFilterPanel.jsx b/src/pages/Directory/ContactFilterPanel.jsx
index 25f833db..3c9c580a 100644
--- a/src/pages/Directory/ContactFilterPanel.jsx
+++ b/src/pages/Directory/ContactFilterPanel.jsx
@@ -60,12 +60,12 @@ const ContactFilterPanel = ({ onApply, clearFilter }) => {
         <div className="d-flex justify-content-end py-3 gap-2">
           <button
             type="button"
-            className="btn btn-label-secondary btn-xs"
+            className="btn btn-label-secondary btn-sm"
             onClick={handleClose}
           >
             Clear
           </button>
-          <button type="submit" className="btn btn-primary btn-xs">
+          <button type="submit" className="btn btn-primary btn-sm">
             Apply
           </button>
         </div>
diff --git a/src/pages/Directory/NoteFilterPanel.jsx b/src/pages/Directory/NoteFilterPanel.jsx
index 8a492994..87abd52d 100644
--- a/src/pages/Directory/NoteFilterPanel.jsx
+++ b/src/pages/Directory/NoteFilterPanel.jsx
@@ -60,12 +60,12 @@ const NoteFilterPanel = ({ onApply, clearFilter }) => {
         <div className="d-flex justify-content-end py-3 gap-2">
           <button
             type="button"
-            className="btn btn-label-secondary btn-xs"
+            className="btn btn-label-secondary btn-sm"
             onClick={handleClose}
           >
             Clear
           </button>
-          <button type="submit" className="btn btn-primary btn-xs">
+          <button type="submit" className="btn btn-primary btn-sm">
             Apply
           </button>
         </div>