From 7d6fda790ad6f80b701abb455c98d662300e4be2 Mon Sep 17 00:00:00 2001 From: Kartik Sharma Date: Sun, 21 Sep 2025 10:29:00 +0530 Subject: [PATCH] Calling API in Attendance Dropdown for showing Organization dropdown. --- src/pages/Activities/AttendancePage.jsx | 29 ++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx index cef91843..28bdd31c 100644 --- a/src/pages/Activities/AttendancePage.jsx +++ b/src/pages/Activities/AttendancePage.jsx @@ -17,7 +17,7 @@ import { hasUserPermission } from "../../utils/authUtils"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { REGULARIZE_ATTENDANCE } from "../../utils/constants"; import eventBus from "../../services/eventBus"; -import { useProjectName } from "../../hooks/useProjects"; +import { useProjectAssignedOrganizations, useProjectName } from "../../hooks/useProjects"; import GlobalModel from "../../components/common/GlobalModel"; import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm"; import AttendLogs from "../../components/Activities/AttendLogs"; @@ -39,11 +39,15 @@ const AttendancePage = () => { const [modelConfig, setModelConfig] = useState(); const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE); const { projectNames, loading: projectLoading, fetchData } = useProjectName(); + + const { data: organizations = [], isLoading: orgLoading } = useProjectAssignedOrganizations(selectedProject); + const [appliedFilters, setAppliedFilters] = useState({ selectedOrganization: "", selectedServices: [], }); + const [formData, setFormData] = useState({ markTime: "", description: "", @@ -85,7 +89,7 @@ const AttendancePage = () => { // Handler to change tab and reset search term const handleTabChange = (tabName) => { setActiveTab(tabName); - setSearchTerm(""); // Reset search term when tab changes + setSearchTerm(""); }; return ( @@ -169,18 +173,6 @@ const AttendancePage = () => { - {/* Single search input that moves */} - {/*
- setSearchTerm(e.target.value)} - style={{ minWidth: "200px" }} - /> -
*/} - {/* Search + Organization filter */}
{/* Organization Dropdown */} @@ -194,11 +186,14 @@ const AttendancePage = () => { selectedOrganization: e.target.value, })) } + disabled={orgLoading} > - - - + {organizations?.map((org) => ( + + ))} {/* Search Input */}