No Record Available !
+ No data available for the selected date range. Please Select another date.
)}
{paginatedAttendances?.length == 0 && filteredSearchData?.length > 0 && (
diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index ca47dd8c..40eb0a75 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -5,7 +5,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
import TimePicker from "../common/TimePicker";
import { usePositionTracker } from "../../hooks/usePositionTracker";
import { useDispatch, useSelector } from "react-redux";
-import { markAttendance } from "../../slices/apiSlice/attedanceLogsSlice";
import showToast from "../../services/toastService";
import { checkIfCurrentDate } from "../../utils/dateUtils";
import { useMarkAttendance } from "../../hooks/useAttendance";
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 (
-
+
);
@@ -63,11 +63,9 @@ const InfraPlanning = () => {
return (
Name
Date
+ Organization
Check-In
@@ -115,7 +146,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
{moment(att.checkOutTime).format("DD-MMM-YYYY")}
+
+ {att.organizationName || "--"}
+
{convertShortTime(att.checkInTime)}
{att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
@@ -136,12 +170,12 @@ const Regularization = ({ handleRequest, searchTerm }) => {
handleRequest={handleRequest}
refresh={refetch}
/>
- {/* */}
))}
+
) : (
No Result Found
-
diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx
index 82c906b5..8f1d21d5 100644
--- a/src/components/Activities/Regularization.jsx
+++ b/src/components/Activities/Regularization.jsx
@@ -10,13 +10,13 @@ import eventBus from "../../services/eventBus";
import { cacheData, clearCacheKey, useSelectedProject } from "../../slices/apiDataManager";
import { useQueryClient } from "@tanstack/react-query";
-const Regularization = ({ handleRequest, searchTerm }) => {
+const Regularization = ({ handleRequest, searchTerm,projectId, organizationId, IncludeInActive }) => {
const queryClient = useQueryClient();
// var selectedProject = useSelector((store) => store.localVariables.projectId);
const selectedProject = useSelectedProject();
const [regularizesList, setregularizedList] = useState([]);
const { regularizes, loading, error, refetch } =
- useRegularizationRequests(selectedProject);
+ useRegularizationRequests(selectedProject, organizationId, IncludeInActive);
useEffect(() => {
setregularizedList(regularizes);
@@ -59,6 +59,36 @@ const Regularization = ({ handleRequest, searchTerm }) => {
});
}, [regularizesList, searchTerm]);
+ // const filteredSearchData = useMemo(() => {
+ // let sortedList = [...regularizesList].sort(sortByName);
+
+ // // Search filter
+ // if (searchTerm) {
+ // const lowercasedSearchTerm = searchTerm.toLowerCase();
+ // sortedList = sortedList.filter((item) => {
+ // const fullName = `${item.firstName} ${item.lastName}`.toLowerCase();
+ // return fullName.includes(lowercasedSearchTerm);
+ // });
+ // }
+
+ // // Organization filter
+ // if (filters?.selectedOrganization) {
+ // sortedList = sortedList.filter(
+ // (item) => item.organization?.name === filters.selectedOrganization
+ // );
+ // }
+
+ // // Services filter
+ // if (filters?.selectedServices?.length > 0) {
+ // sortedList = sortedList.filter((item) =>
+ // filters.selectedServices.includes(item.service?.name)
+ // );
+ // }
+
+ // return sortedList;
+ // }, [regularizesList, searchTerm, filters]);
+
+
const { currentPage, totalPages, currentItems, paginate } =
usePagination(filteredSearchData, 20);
@@ -98,6 +128,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
{
const { projects } = useProjects();
- const today = new Date().toISOString().split("T")[0]; // Format: YYYY-MM-DD
+ const today = new Date().toISOString().split("T")[0]; // YYYY-MM-DD
const [selectedDate, setSelectedDate] = useState(today);
- const storedProjectId = localStorage.getItem(LOCAL_STORAGE_PROJECT_KEY);
- const initialProjectId = storedProjectId || "all";
- const [selectedProjectId, setSelectedProjectId] = useState(initialProjectId);
- const [displayedProjectName, setDisplayedProjectName] =
- useState("Select Project");
- const [activeTab, setActiveTab] = useState("Summary");
+
+ // central project selection hook
+const selectedProjectId = useSelectedProject()
const {
dashboard_Attendancedata: AttendanceData,
@@ -23,38 +18,24 @@ const Attendance = () => {
error: isError,
} = useDashboard_AttendanceData(selectedDate, selectedProjectId);
- useEffect(() => {
- if (selectedProjectId === "all") {
- setDisplayedProjectName("All Projects");
- } else if (projects) {
- const foundProject = projects.find((p) => p.id === selectedProjectId);
- setDisplayedProjectName(
- foundProject ? foundProject.name : "Select Project"
- );
- } else {
- setDisplayedProjectName("Select Project");
- }
-
- localStorage.setItem(LOCAL_STORAGE_PROJECT_KEY, selectedProjectId);
+ // project name derived once
+ const displayedProjectName = useMemo(() => {
+ if (selectedProjectId === "all") return "All Projects";
+ const found = projects?.find((p) => p.id === selectedProjectId);
+ return found?.name || "Select Project";
}, [selectedProjectId, projects]);
- const handleProjectSelect = (projectId) => {
- setSelectedProjectId(projectId);
- };
-
- const handleDateChange = (e) => {
- setSelectedDate(e.target.value);
- };
-
return (
-
-
+ {/* Header */}
+
+
+ {/* Project Dropdown */}
-
Attendance
Daily Attendance Data
- {/* Tabs */}
-
-
- {/* ✅ Date Picker Aligned Left with Padding */}
- -
-
- - - -
- - - -
-
-
-
+ {/* Tabs + Date Picker */}
+
+
+ {/* Body */}
-
+
- + + +
- + + +
+ setSelectedDate(e.target.value)}
+ />
- {activeTab === "Summary" && (
+ {/* Summary */}
+ {AttendanceData?.activeTab === "Summary" && (
{isLoading ? (
@@ -143,7 +115,7 @@ const Attendance = () => {
) : (
AttendanceData && (
<>
-
+
)}
- {activeTab === "Details" && (
-
+
Attendance
@@ -164,11 +136,9 @@ const Attendance = () => {
+ {/* Details */}
+ {AttendanceData?.activeTab === "Details" && (
+
| - {record.firstName} {record.lastName} - | -- {new Date(record.inTime).toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} - | -- {new Date(record.outTime).toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} - | + {AttendanceData?.attendanceTable?.length ? ( + AttendanceData.attendanceTable.map((r, i) => ( +|||||||
| {r.firstName} {r.lastName} | +{r.inTime ? new Date(r.inTime).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "-"} | +{r.outTime ? new Date(r.outTime).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "-"} | |||||||
| - No attendance data available - | +No attendance data available | ||||||||
|
{col.label}
diff --git a/src/components/Employee/EmpAttendance.jsx b/src/components/Employee/EmpAttendance.jsx
index c441b826..548471d8 100644
--- a/src/components/Employee/EmpAttendance.jsx
+++ b/src/components/Employee/EmpAttendance.jsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
import moment from "moment";
import DateRangePicker, { DateRangePicker1 } from "../common/DateRangePicker";
import { useDispatch, useSelector } from "react-redux";
-import { fetchEmployeeAttendanceData } from "../../slices/apiSlice/employeeAttendanceSlice";
import usePagination from "../../hooks/usePagination";
import Avatar from "../common/Avatar";
import { convertShortTime } from "../../utils/dateUtils";
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index 94ec39ac..41c7ce03 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -19,6 +19,7 @@ import { useProjectName } from "../../hooks/useProjects";
import eventBus from "../../services/eventBus";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { MANAGE_PROJECT } from "../../utils/constants";
+import { useAuthModal, useLogout } from "../../hooks/useAuth";
const Header = () => {
const { profile } = useProfile();
@@ -26,10 +27,9 @@ const Header = () => {
const dispatch = useDispatch();
const { data, loading } = useMaster();
const navigate = useNavigate();
+ const {onOpen} = useAuthModal()
const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
- // {
- // console.log(location.pathname);
- // }
+ const { mutate : logout,isPending:logouting} = useLogout()
const isDashboardPath =
/^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
@@ -59,41 +59,9 @@ const Header = () => {
return role ? role.name : "User";
};
- const handleLogout = (e) => {
- e.preventDefault();
- logout();
- };
+
- const logout = async () => {
- try {
- let data = {
- refreshToken: localStorage.getItem("refreshToken"),
- };
-
- AuthRepository.logout(data)
- .then(() => {
- localStorage.removeItem("jwtToken");
- localStorage.removeItem("refreshToken");
- localStorage.removeItem("user");
- localStorage.clear();
- clearAllCache();
- window.location.href = "/auth/login";
- })
- .catch(() => {
- localStorage.removeItem("jwtToken");
- localStorage.removeItem("refreshToken");
- localStorage.removeItem("user");
- localStorage.clear();
- clearAllCache();
- window.location.href = "/auth/login";
- });
- } catch (error) {
- console.error(
- "Error during logout:",
- error?.response?.data || error.message
- );
- }
- };
+
const handleProfilePage = () => {
navigate(`/employee/${profile?.employeeInfo?.id}`);
@@ -455,6 +423,16 @@ const Header = () => {
Change Password
+
+ Loading.... ;
+
+ return (
+
+ {/* Organization Info Display */}
+
+ );
+};
+
+export default AssignOrg;
diff --git a/src/components/Organization/ManagOrg.jsx b/src/components/Organization/ManagOrg.jsx
new file mode 100644
index 00000000..0f4aa49e
--- /dev/null
+++ b/src/components/Organization/ManagOrg.jsx
@@ -0,0 +1,203 @@
+import React, { useEffect } from "react";
+import { FormProvider, useForm } from "react-hook-form";
+import {
+ useCreateOrganization,
+ useOrganizationModal,
+ useUpdateOrganization,
+} from "../../hooks/useOrganization";
+import {
+ defaultOrganizationValues,
+ organizationSchema,
+} from "./OrganizationSchema";
+import Label from "../common/Label";
+import { useGlobalServices } from "../../hooks/masterHook/useMaster";
+import { zodResolver } from "@hookform/resolvers/zod";
+import SelectMultiple from "../common/SelectMultiple";
+
+const ManagOrg = () => {
+ const { data: service, isLoading } = useGlobalServices();
+ const { flowType, orgData, startStep, onOpen, onClose, prevStep } =
+ useOrganizationModal();
+
+ const method = useForm({
+ resolver: zodResolver(organizationSchema),
+ defaultValues: defaultOrganizationValues,
+ });
+
+ const {
+ handleSubmit,
+ register,
+ reset,
+ formState: { errors },
+ } = method;
+
+ // Create & Update mutations
+ const { mutate: createOrganization, isPending: isCreating } =
+ useCreateOrganization(() => {
+ reset(defaultOrganizationValues);
+ onOpen({ startStep: 1 });
+ onClose();
+ });
+
+ const { mutate: updateOrganization, isPending: isUpdating } =
+ useUpdateOrganization(() => {
+ reset(defaultOrganizationValues);
+ onOpen({ startStep: 1 });
+ onClose();
+ });
+
+ // Prefill form if editing
+ useEffect(() => {
+ if (orgData) {
+ console.log(orgData);
+ reset({
+ name: orgData.name || "",
+ contactPerson: orgData.contactPerson || "",
+ contactNumber: orgData.contactNumber || "",
+ email: orgData.email || "",
+ serviceIds: orgData.services?.map((s) => s.id) || [],
+ address: orgData.address || "",
+ });
+ }
+ }, [orgData, reset]);
+
+ const onSubmit = (payload) => {
+ if (orgData?.id) {
+ updateOrganization({ id: orgData.id, ...payload });
+ } else {
+ createOrganization(payload);
+ }
+ };
+ const handleBack = () => {
+ if (flowType === "edit") {
+ onClose();
+ return;
+ }
+
+ if (flowType === "assign") {
+ if (prevStep === 1) {
+ onOpen({ startStep: 1 });
+ } else {
+ onOpen({ startStep: prevStep ?? 2 });
+ }
+ return;
+ }
+ onOpen({ startStep: 2 });
+ };
+ return (
+
+
+
+ {/* Contact Info */}
+
+
+ {orgData.name}
+
+
+
+
+
+
+
+
+ {orgData.contactPerson}
+
+
+
+
+
+ {orgData.contactNumber}
+
+
+
+
+
+ {orgData.email}
+
+
+
+
+
+ {orgData.sprid}
+
+
+
+ {/* Form */}
+
+
+
+ {orgData.address}
+
+
+
+
+
+
+ );
+};
+
+export default OrgPickerFromSPId;
diff --git a/src/components/Organization/OrgPickerfromTenant.jsx b/src/components/Organization/OrgPickerfromTenant.jsx
new file mode 100644
index 00000000..5471df2b
--- /dev/null
+++ b/src/components/Organization/OrgPickerfromTenant.jsx
@@ -0,0 +1,167 @@
+import { useState } from "react";
+import {
+ useOrganizationModal,
+ useOrganizationsList,
+} from "../../hooks/useOrganization";
+import { ITEMS_PER_PAGE } from "../../utils/constants";
+import Label from "../common/Label";
+import Pagination from "../common/Pagination";
+
+const OrgPickerfromTenant = ({ title }) => {
+ const [searchText, setSearchText] = useState("");
+ const [currentPage, setCurrentPage] = useState(1);
+ const { data, isLoading } = useOrganizationsList(
+ ITEMS_PER_PAGE - 10,
+ 1,
+ true,
+ null,
+ searchText
+ );
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+ const { isOpen, orgData, startStep, onOpen, flowType, prevStep } =
+ useOrganizationModal();
+
+ const handleBack = () => {
+ if (prevStep == 1 && flowType == "assign") {
+ onOpen({ startStep: prevStep });
+ } else if (prevStep == 1 && flowType == "assign") {
+ onOpen({ startStep: 1 });
+ } else {
+ onOpen({ startStep: 2 });
+ }
+ };
+
+ const contactList = [
+ {
+ key: "name",
+ label: "Name",
+ getValue: (org) => (
+
+ {" "}
+ {errors.spridSearchText && (
+
+
+ {/* ---- Organization list ---- */}
+ {isLoading ? (
+ + {errors.spridSearchText.message} + + )} +
+
+ ) : SPRID ? (
+
+ {data.data.map((org) => (
+
+
+
+ ))}
+
+
+ 
+ onOpen({ startStep: 3, orgData: org })}
+ >
+ {org.name}
+
+
+
+ SPRID :{" "}
+
+ {org.sprid}
+
+
+ Address:
+
+ {org.address}
+
+ No organization found for "{SPRID}"
+
+ ) : null}
+
+
+ Do not have SPRID or could not find organization ?
+
+
+
+
+ {/* ---- Footer buttons ---- */}
+
+ {flowType !== "default" && (
+
+ )}
+
+
+
+
+ {org?.name || "N/A"}
+
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "sprid",
+ label: "SPRID",
+ getValue: (org) => (
+
+ {org?.sprid || "N/A"}
+
+ ),
+ align: "text-center",
+ },
+ ];
+
+ return (
+
+
+ );
+};
+
+export default OrgPickerfromTenant;
diff --git a/src/components/Organization/OrganizationModal.jsx b/src/components/Organization/OrganizationModal.jsx
new file mode 100644
index 00000000..da742427
--- /dev/null
+++ b/src/components/Organization/OrganizationModal.jsx
@@ -0,0 +1,110 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import React, { useMemo, useState } from "react";
+import { FormProvider, useForm } from "react-hook-form";
+import {
+ defaultOrganizationValues,
+ organizationSchema,
+} from "./OrganizationSchema";
+import Modal from "../common/Modal";
+import {
+ useCreateOrganization,
+ useOrganizationBySPRID,
+ useOrganizationModal,
+ useOrganizationsList,
+} from "../../hooks/useOrganization";
+import Label from "../common/Label";
+import SelectMultiple from "../common/SelectMultiple";
+import { useServices } from "../../hooks/masterHook/useMaster";
+import AssignOrg from "./AssignOrg";
+import ManagOrg from "./ManagOrg";
+import OrgPickerFromSPId from "./OrgPickerFromSPId";
+import OrgPickerfromTenant from "./OrgPickerfromTenant";
+
+const OrganizationModal = () => {
+ const { isOpen, orgData, startStep, onOpen, onClose, onToggle } =
+ useOrganizationModal();
+ const { data: masterService, isLoading } = useServices();
+ const [searchText, setSearchText] = useState();
+ const [SPRID, setSPRID] = useState("");
+
+ const [Organization, setOrganization] = useState({});
+
+ const method = useForm({
+ resolver: zodResolver(organizationSchema),
+ defaultValues: defaultOrganizationValues,
+ });
+
+ const {
+ handleSubmit,
+ register,
+ reset,
+ formState: { errors },
+ } = method;
+
+ const { mutate: CreateOrganization, isPending } = useCreateOrganization(
+ () => {
+ reset(defaultOrganizationValues);
+ onClose();
+ }
+ );
+
+ const onSubmit = (OrgPayload) => {
+ CreateOrganization(OrgPayload);
+ };
+
+ const RenderTitle = useMemo(() => {
+ if (orgData) {
+ return "Assign Organization";
+ }
+
+ if (startStep === 1) {
+ return orgData && orgData !== null
+ ? "Add Organization"
+ : "Choose Organization1";
+ }
+
+ if (startStep === 2) {
+ return "Add Organization";
+ }
+
+ if (startStep === 3) {
+ return "Assign Organization";
+ }
+
+ return "Manage Organization";
+ }, [startStep, orgData]);
+
+ const contentBody = (
+
+
+ setSearchText?.(e.target.value)}
+ className="form-control form-control-sm w-auto"
+ placeholder="Enter Organization Name"
+ />
+
+
+ {/* ---- Organization list ---- */}
+ {isLoading ? (
+ Loading....
+ ) : data && data?.data?.length > 0 ? (
+
+
+ ) : null}
+
+
+ Could not find organization in your database? Please search within the
+ global database.
+
+
+
+ {/* ---- Footer buttons ---- */}
+
+ {flowType == "default" && (
+
+ )}
+
+ {/* */}
+
+
+ {/* ---------- STEP 1: Service Provider- Form Own Tenant list ---------- */}
+ {startStep === 1 &&
+ );
+
+ return (
+
+ {[...Array(1)].map((_, idx) => (
+
+ );
+};
diff --git a/src/components/Organization/OrganizationsList.jsx b/src/components/Organization/OrganizationsList.jsx
new file mode 100644
index 00000000..d5243e87
--- /dev/null
+++ b/src/components/Organization/OrganizationsList.jsx
@@ -0,0 +1,164 @@
+import React, { useState } from "react";
+import { useOrganizationModal, useOrganizationsList } from "../../hooks/useOrganization";
+import { ITEMS_PER_PAGE } from "../../utils/constants";
+import Avatar from "../common/Avatar";
+import { useDebounce } from "../../utils/appUtils";
+import Pagination from "../common/Pagination";
+
+const OrganizationsList = ({searchText}) => {
+ const [currentPage, setCurrentPage] = useState(1);
+ const searchString = useDebounce(searchText,500)
+ const {
+ data = [],
+ isLoading,
+ isFetching,
+ isError,
+ error,
+ } = useOrganizationsList(ITEMS_PER_PAGE, 1, true,null,searchString);
+ const {onClose, startStep, flowType, onOpen,orgData } = useOrganizationModal();
+
+ const organizationsColumns = [
+ {
+ key: "name",
+ label: "Organization Name",
+ getValue: (org) => (
+
+ {/* Left: Logo/avatar placeholder */}
+
+ ))}
+
+
+
+ {/* Right: Info section */}
+
+ {/* Org name */}
+
+
+
+
+ {/* Address */}
+
+
+
+
+
+ {org?.name || "N/A"}
+
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "contactPerson",
+ label: "Contact Person",
+ getValue: (org) => (
+ (
+
+
+ )
+ ),
+ align: "text-start",
+ },
+ {
+ key: "contactNumber",
+ label: "Phone Number",
+ getValue: (org) => org.contactNumber || "N/A",
+ align: "text-start",
+ },
+ {
+ key: "email",
+ label: "Email",
+ getValue: (org) => (
+
+ {org?.email || "N/A"}
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "sprid",
+ label: "SPRID Id",
+ getValue: (org) => org.sprid || "N/A",
+ align: "text-center",
+ },
+ ];
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+ if (isFetching && !isFetching) return Loading... ;
+ if (isError) return {error?.message || "Something went wrong"} ;
+
+ return (
+
+
+ );
+};
+
+export default OrganizationsList;
diff --git a/src/components/Organization/tempCodeRunnerFile.jsx b/src/components/Organization/tempCodeRunnerFile.jsx
new file mode 100644
index 00000000..f6957317
--- /dev/null
+++ b/src/components/Organization/tempCodeRunnerFile.jsx
@@ -0,0 +1 @@
+useAssignOrgToTenant
\ No newline at end of file
diff --git a/src/components/Project/Infrastructure/Floor.jsx b/src/components/Project/Infrastructure/Floor.jsx
index 2ee5d84b..0f7f00f7 100644
--- a/src/components/Project/Infrastructure/Floor.jsx
+++ b/src/components/Project/Infrastructure/Floor.jsx
@@ -1,6 +1,6 @@
import React from "react";
import WorkArea from "./WorkArea";
-const Floor = ({ floor, workAreas, forBuilding }) => {
+const Floor = ({ floor, workAreas, forBuilding,serviceId }) => {
return (
+
+
+
+
|
|---|
diff --git a/src/components/Tenant/Profile.jsx b/src/components/Tenant/Profile.jsx
index 50cd99a4..963f6ce3 100644
--- a/src/components/Tenant/Profile.jsx
+++ b/src/components/Tenant/Profile.jsx
@@ -5,12 +5,12 @@ import GlobalModel from "../common/GlobalModel";
import { useTenantContext } from "../../pages/Tenant/TenantPage";
import { useTenantDetailsContext } from "../../pages/Tenant/TenantDetails";
import IconButton from "../common/IconButton";
-import { hasUserPermission } from "../../utils/authUtils";
import { MANAGE_TENANTS } from "../../utils/constants";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
const Profile = ({ data }) => {
const {setEditTenant} = useTenantDetailsContext()
- const canUpdateTenant = hasUserPermission(MANAGE_TENANTS)
+ const canUpdateTenant = useHasUserPermission(MANAGE_TENANTS)
return (
<>
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 = ({
<>
-
Floors
+ Floors
{uniqueFloors.length > 0 ? (
uniqueFloors.map((floor, idx) => (
@@ -235,7 +235,7 @@ const FilterIcon = ({
<>
-
Activities
+ Activities
{uniqueActivities.length > 0 ? (
uniqueActivities.map((activity, idx) => (
diff --git a/src/components/common/Modal.jsx b/src/components/common/Modal.jsx
new file mode 100644
index 00000000..876ff0e8
--- /dev/null
+++ b/src/components/common/Modal.jsx
@@ -0,0 +1,50 @@
+import { useCallback } from "react";
+
+const Modal = ({
+ isOpen,
+ onClose,
+ title,
+ body,
+ disabled,
+ size = "md",
+ position = "top",
+}) => {
+ const handleClose = useCallback(() => {
+ if (disabled) return;
+ onClose();
+ }, [disabled, onClose]);
+
+ if (!isOpen) return null;
+
+ return (
+
+
+ );
+};
+
+export default Modal;
diff --git a/src/components/common/SelectMultiple.jsx b/src/components/common/SelectMultiple.jsx
index 0dee93d3..ff59d89a 100644
--- a/src/components/common/SelectMultiple.jsx
+++ b/src/components/common/SelectMultiple.jsx
@@ -2,15 +2,17 @@ import React, { useState, useEffect, useRef } from "react";
import { useFormContext } from "react-hook-form";
import { createPortal } from "react-dom";
import "./MultiSelectDropdown.css";
+import Label from "./Label";
const SelectMultiple = ({
name,
options = [],
label = "Select options",
- labelKey = "name", // Can now be a function or a string
+ labelKey = "name",
valueKey = "id",
placeholder = "Please select...",
IsLoading = false,
+ required = false
}) => {
const { setValue, watch } = useFormContext();
const selectedValues = watch(name) || [];
@@ -20,7 +22,11 @@ const SelectMultiple = ({
const containerRef = useRef(null);
const dropdownRef = useRef(null);
- const [dropdownStyles, setDropdownStyles] = useState({ top: 0, left: 0, width: 0 });
+ const [dropdownStyles, setDropdownStyles] = useState({
+ top: 0,
+ left: 0,
+ width: 0,
+ });
useEffect(() => {
const handleClickOutside = (e) => {
@@ -100,8 +106,14 @@ const SelectMultiple = ({
return (
+
+
+ {/* Header */}
+
+
+
+
+ {/* Body */}
+ {title}
+ +{body}
+
-
-
+
)}
{activeTab === "regularization" && DoRegularized && (
+
+
)}
@@ -199,12 +227,16 @@ const AttendancePage = () => {
0 ? "placeholder-style-selected" : "placeholder-style"
+ selectedValues.length > 0
+ ? "placeholder-style-selected"
+ : "placeholder-style"
}
>
@@ -191,6 +218,7 @@ const AttendancePage = () => {
handleModalData={handleModalData}
getRole={getRole}
searchTerm={searchTerm}
+ organizationId={appliedFilters.selectedOrganization}
/>
@@ -149,7 +168,10 @@ const SelectMultiple = ({
const found = options.find((opt) => opt[valueKey] === val);
const label = found ? getLabel(found) : "";
return (
-
+
{label}
);
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index d6665767..bd7f9ba1 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -16,6 +16,7 @@ import ManagePaymentMode from "./ManagePaymentMode";
import ManageExpenseStatus from "./ManageExpenseStatus";
import ManageDocumentCategory from "./ManageDocumentCategory";
import ManageDocumentType from "./ManageDocumentType";
+import ManageServices from "./Services/ManageServices";
const MasterModal = ({ modaldata, closeModal }) => {
if (!modaldata?.modalType || modaldata.modalType === "delete") {
@@ -60,6 +61,12 @@ const MasterModal = ({ modaldata, closeModal }) => {
"Edit-Document Type": (
//
-
-
- //
// ,
)
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index f0e00ad5..4cd5956a 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -13,11 +13,10 @@ import Regularization from "../../components/Activities/Regularization";
import { useAttendance } from "../../hooks/useAttendance";
import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice";
-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,6 +38,13 @@ const AttendancePage = () => {
const [modelConfig, setModelConfig] = useState();
const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
+ const [appliedFilters, setAppliedFilters] = useState({
+ selectedOrganization: "",
+ selectedServices: [],
+ });
+
+ const { data: organizations = [], isLoading: orgLoading } =
+ useProjectAssignedOrganizations(selectedProject);
const [formData, setFormData] = useState({
markTime: "",
@@ -95,11 +101,11 @@ const AttendancePage = () => {
{(modelConfig?.action === 0 ||
modelConfig?.action === 1 ||
modelConfig?.action === 2) && (
-
- {/* Single search input that moves */}
-
+ {/* Search + Organization filter */}
+
+ {/* Organization Dropdown */}
+
+
+ {/* Search Input */}
{
style={{ minWidth: "200px" }}
/>
+
+
-
)}
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index fc51f756..908c7ea9 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) => (
{
return (
<>
- {/* --- Modals --- */}
{modal.type === "report" && (
+
);
};
-export default DailyTask;
+export default DailyTask;
\ No newline at end of file
diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx
index 25cf63f2..c9356dfd 100644
--- a/src/pages/Activities/TaskPlannng.jsx
+++ b/src/pages/Activities/TaskPlannng.jsx
@@ -1,22 +1,31 @@
-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 (
{!selectedProject && (
@@ -241,11 +280,10 @@ const DailyTask = () => {
-
Please Select Project
)}
- {/* --- Filters --- */}
-
-
+
+ {/* --- Left: Service Dropdown + Filter Icon --- */}
+
{/* --- Table --- */}
+
+
+ {/* --- Right: DateRangePicker --- */}
+
+ {!servicesLoading && assignedServices?.length > 0 && (
+ assignedServices.length > 1 ? (
+
+ ) : (
+
+ {assignedServices[0].name}
+ ) + )} +
+
+
+
@@ -26,11 +35,50 @@ useEffect(() => {
{ label: "Daily Task Planning" },
]}
/>
- {selectedProject ? (
-
);
};
diff --git a/src/pages/Directory/ContactsPage.jsx b/src/pages/Directory/ContactsPage.jsx
index d3e84e6e..670b3ef9 100644
--- a/src/pages/Directory/ContactsPage.jsx
+++ b/src/pages/Directory/ContactsPage.jsx
@@ -69,7 +69,7 @@ const ContactsPage = ({ projectId, searchText, onExport }) => {
};
if (isError) return Please Select Project
- )}
+
+
+
+ {/* Service Dropdown */}
+
+
+
+ {!servicesLoading && assignedServices?.length > 0 && (
+ assignedServices.length > 1 ? (
+
+ ) : (
+
+
+
+ {/* Infra Planning Component */}
+ {selectedProject ? (
+ {assignedServices[0].name}
+ ) + )} +Please Select Project
+ )}
+ {error.message}
;
- if (isLoading) return gridView ?
@@ -94,11 +94,11 @@ const ContactsPage = ({ projectId, searchText, onExport }) => {
) : (
{
const projectId = useSelectedProject();
@@ -96,6 +97,8 @@ const ProjectDetails = () => {
return
+
+
+
+ );
+};
+
+export default OrganizationPage;
diff --git a/src/pages/Tenant/SelfTenantDetails.jsx b/src/pages/Tenant/SelfTenantDetails.jsx
index 5375bcc3..ea4b107d 100644
--- a/src/pages/Tenant/SelfTenantDetails.jsx
+++ b/src/pages/Tenant/SelfTenantDetails.jsx
@@ -1,16 +1,16 @@
import React, { useEffect, useMemo } from "react";
import { useProfile } from "../../hooks/useProfile";
import TenantDetails from "./TenantDetails";
-import { hasUserPermission } from "../../utils/authUtils";
import { VIEW_TENANTS } from "../../utils/constants";
import { useNavigate } from "react-router-dom";
import Loader from "../../components/common/Loader";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
const SelfTenantDetails = () => {
const { profile, loading } = useProfile();
const tenantId = profile?.employeeInfo?.tenantId;
const navigate = useNavigate();
- const isSelfTenantView = hasUserPermission(VIEW_TENANTS);
+ const isSelfTenantView = useHasUserPermission(VIEW_TENANTS);
useEffect(() => {
if (!isSelfTenantView) {
diff --git a/src/pages/Tenant/TenantPage.jsx b/src/pages/Tenant/TenantPage.jsx
index ef33efbf..640c8fc2 100644
--- a/src/pages/Tenant/TenantPage.jsx
+++ b/src/pages/Tenant/TenantPage.jsx
@@ -20,7 +20,6 @@ import TenantFilterPanel from "../../components/Tenant/TenantFilterPanel";
import { useDebounce } from "../../utils/appUtils";
import { useFab } from "../../Context/FabContext";
import { setCurrentTenant } from "../../slices/globalVariablesSlice";
-import { hasUserPermission } from "../../utils/authUtils";
// ------ Schema -------
import {
@@ -35,6 +34,7 @@ import {
VIEW_TENANTS,
} from "../../utils/constants";
import { useProfile } from "../../hooks/useProfile";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
// ---------- Context ----------
export const TenantContext = createContext();
@@ -63,9 +63,9 @@ const TenantPage = () => {
const debouncedSearch = useDebounce(searchText, 500);
const { setOffcanvasContent, setShowTrigger } = useFab();
- const isSuperTenant = hasUserPermission(SUPPER_TENANT);
- const canManageTenants = hasUserPermission(MANAGE_TENANTS);
- const isSelfTenant = hasUserPermission(VIEW_TENANTS);
+ const isSuperTenant = useHasUserPermission(SUPPER_TENANT);
+ const canManageTenants = useHasUserPermission(MANAGE_TENANTS);
+ const isSelfTenant = useHasUserPermission(VIEW_TENANTS);
const methods = useForm({
resolver: zodResolver(filterSchema),
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 3e331376..363de91f 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -44,7 +44,7 @@ const LoginPage = () => {
localStorage.setItem("jwtToken", response.data.token);
localStorage.setItem("refreshToken", response.data.refreshToken);
setLoading(false);
- navigate("/dashboard");
+ navigate("/auth/switch/org");
} else {
await AuthRepository.sendOTP({ email: data.username });
showToast("OTP has been sent to your email.", "success");
diff --git a/src/pages/authentication/SwitchTenant.jsx b/src/pages/authentication/SwitchTenant.jsx
new file mode 100644
index 00000000..b5a8652a
--- /dev/null
+++ b/src/pages/authentication/SwitchTenant.jsx
@@ -0,0 +1,105 @@
+import React, { useState } from "react";
+import Modal from "../../components/common/Modal";
+import { useAuthModal, useSelectTenant, useTenants } from "../../hooks/useAuth";
+import { useProfile } from "../../hooks/useProfile";
+import { useQueryClient } from "@tanstack/react-query";
+import AuthRepository from "../../repositories/AuthRepository";
+import Loader from "../../components/common/Loader";
+
+const SwitchTenant = () => {
+ const queryClient = useQueryClient();
+ const { profile } = useProfile();
+ const [pendingTenant, setPendingTenant] = useState(null);
+ const { isOpen, onClose, onOpen } = useAuthModal();
+ const { data, isLoading, isError, error } = useTenants();
+ const { mutate: chooseTenant, isPending } = useSelectTenant(() => {
+ onClose();
+ queryClient.clear();
+
+ // 2. Force fetch profile fresh for the new tenant
+ queryClient.fetchQuery({
+ queryKey: ["profile"],
+ queryFn: () => AuthRepository.profile(),
+ });
+ window.location.reload();
+ });
+ const currentTenant = localStorage.getItem("ctnt");
+ const handleTenantselection = (tenantId) => {
+ setPendingTenant(tenantId);
+ localStorage.setItem("ctnt", tenantId);
+ chooseTenant(tenantId);
+ };
+
+
+ const contentBody = (
+
+
+
+
+
+
+
+
+
+
+ setSearchText(e.target.value)}
+ className="form-control form-control-sm w-auto"
+ placeholder="Search Organization"
+ aria-describedby="search-label"
+ />
+
+
+
+
+
+
+ );
+ return Switch Workplace
+
+ {data?.data.map((tenant) => (
+
+
+
+ ))}
+
+
+
+ 
+
+
+
+
+ + {tenant?.name} +
+ +
+
+
+ {tenant?.description && (
+ Industry:
++ {tenant?.industry?.name || "Not Available"} +
++ {tenant?.description} +
+ )} + + +
+
+ );
+ }
+
+
+ return (
+ No tenant assigned to your account.
+
+ {/* Logo */}
+
+
+ );
+};
+
+export default TenantSelectionPage;
\ No newline at end of file
diff --git a/src/pages/authentication/tempCodeRunnerFile.jsx b/src/pages/authentication/tempCodeRunnerFile.jsx
new file mode 100644
index 00000000..e9f12b60
--- /dev/null
+++ b/src/pages/authentication/tempCodeRunnerFile.jsx
@@ -0,0 +1 @@
+login
\ No newline at end of file
diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index 648b736b..b0f10a75 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -11,7 +11,7 @@ import {
} from "../../hooks/useEmployees";
import { useProjectName, useProjects } from "../../hooks/useProjects";
import { useProfile } from "../../hooks/useProfile";
-import { hasUserPermission } from "../../utils/authUtils";
+
import {
ITEMS_PER_PAGE,
MANAGE_EMPLOYEES,
@@ -19,7 +19,6 @@ import {
VIEW_TEAM_MEMBERS,
} from "../../utils/constants";
import { clearCacheKey } from "../../slices/apiDataManager";
-import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import SuspendEmp from "../../components/Employee/SuspendEmp"; // Keep if you use SuspendEmp
import {
exportToCSV,
@@ -36,6 +35,7 @@ import { newlineChars } from "pdf-lib";
import GlobalModel from "../../components/common/GlobalModel";
import usePagination from "../../hooks/usePagination";
import { setProjectId } from "../../slices/localVariablesSlice";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
const EmployeeList = () => {
const selectedProjectId = useSelector(
diff --git a/src/pages/master/MasterPage.jsx b/src/pages/master/MasterPage.jsx
index 1640f2ba..b187efd1 100644
--- a/src/pages/master/MasterPage.jsx
+++ b/src/pages/master/MasterPage.jsx
@@ -91,7 +91,7 @@ const MasterPage = () => {
{modalConfig && (
+ 
+
+
+ {/* Heading */}
+
+
+
+
+ {/* Card Section */}
+ Welcome
++ Please select which dashboard you want to explore!!! +
+handleLogout()}>
+ {isLogouting ? "Please Wait...":SignOut}
+
+
+
+ {data?.data.map((tenant) => (
+
+
+
+ ))}
+
+
+ {/* Image */}
+
+
+
+
+
+ {/* Content */}
+
+ {/* Title */}
+
+ + {tenant?.name} +
+ + {/* Industry */} +
+
+
+ {/* Description */}
+ {tenant?.description && (
+ Industry:
++ {tenant?.industry?.name || "Not Available"} +
++ {tenant?.description} +
+ )} + + {/* Button */} + +