- {servicesLoading ? (
-
- ) : assignedServices?.length > 1 ? (
-
+ {servicesLoading ? null : assignedServices && assignedServices.length > 0 ? (
+ assignedServices.length > 1 ? (
+
+ ) : (
+
+
{assignedServices[0].name}
+
+ )
) : (
-
- {/* fier fitting */}
- {assignedServices?.length === 1
- ?
{ assignedServices[0].name}
- : "No service available"}
+
+
No Services Assigned
)}
- {/*
-
-
*/}
@@ -393,7 +382,7 @@ const Teams = () => {
-
{item.services || "N/A"} |
+
{item.serviceName || "N/A"} |
{item.organizationName || "N/A"} |
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index c2f3f9d8..cee9217f 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -41,22 +41,30 @@ export const useProjects = () => {
};
};
-export const useEmployeesByProjectAllocated = (selectedProject) => {
+export const useEmployeesByProjectAllocated = (
+ projectId,
+ serviceId,
+ organizationId,
+) => {
const {
data = [],
isLoading,
refetch,
error,
} = useQuery({
- queryKey: ["empListByProjectAllocated", selectedProject],
+ queryKey: ["empListByProjectAllocated", projectId, serviceId,organizationId],
queryFn: async () => {
- const res = await ProjectRepository.getProjectAllocation(selectedProject);
- return res.data || res;
+ const res = await ProjectRepository.getProjectAllocation(
+ projectId,
+ organizationId,
+ serviceId
+ );
+ return res?.data || res;
},
- enabled: !!selectedProject,
+ enabled: !!projectId,
onError: (error) => {
showToast(
- error.message || "Error while Fetching project Allocated Employees",
+ error.message || "Error while fetching project allocated employees",
"error"
);
},
@@ -270,7 +278,7 @@ export const useProjectLevelEmployeePermission = (employeeId, projectId) => {
export const useProjectAssignedOrganizations =(projectId)=>{
return useQuery({
- queryKey: ["projectAssignedServices", projectId],
+ queryKey: ["projectAssignedOrganization", projectId],
queryFn: async () => {
const resp = await ProjectRepository.getProjectAssignedOrganizations(projectId);
return resp.data;
diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx
index d9a9ada3..113bd627 100644
--- a/src/repositories/ProjectRepository.jsx
+++ b/src/repositories/ProjectRepository.jsx
@@ -5,8 +5,20 @@ const ProjectRepository = {
getProjectByprojectId: (projetid) =>
api.get(`/api/project/details/${projetid}`),
- getProjectAllocation: (projetid) =>
- api.get(`api/project/allocation/${projetid}`),
+ getProjectAllocation: (projectId, organizationId, serviceId) => {
+ let url = `/api/project/allocation/${projectId}`;
+
+ const params = [];
+ if (organizationId) params.push(`organizationId=${organizationId}`);
+ if (serviceId) params.push(`serviceId=${serviceId}`);
+
+ if (params.length > 0) {
+ url += `?${params.join("&")}`;
+ }
+
+ return api.get(url);
+ },
+
getEmployeesByProject: (projectId) =>
api.get(`/api/Project/employees/get/${projectId}`),
@@ -39,18 +51,18 @@ const ProjectRepository = {
),
- // Permission Managment for Employee at Project Level
+ // Permission Managment for Employee at Project Level
- getProjectLevelEmployeeList:(projectId)=>api.get(`/api/Project/get/proejct-level/employees/${projectId}`),
- getProjectLevelModules:()=>api.get(`/api/Project/get/proejct-level/modules`),
- getProjectLevelEmployeePermissions:(employeeId,projectId)=>api.get(`/api/Project/get/project-level-permission/employee/${employeeId}/project/${projectId}`),
- updateProjectLevelEmployeePermission:(data)=>api.post(`/api/Project/assign/project-level-permission`,data),
- getAllProjectLevelPermission:(projectId)=>api.get(`/api/Project/get/all/project-level-permission/${projectId}`),
+ getProjectLevelEmployeeList: (projectId) => api.get(`/api/Project/get/proejct-level/employees/${projectId}`),
+ getProjectLevelModules: () => api.get(`/api/Project/get/proejct-level/modules`),
+ getProjectLevelEmployeePermissions: (employeeId, projectId) => api.get(`/api/Project/get/project-level-permission/employee/${employeeId}/project/${projectId}`),
+ updateProjectLevelEmployeePermission: (data) => api.post(`/api/Project/assign/project-level-permission`, data),
+ getAllProjectLevelPermission: (projectId) => api.get(`/api/Project/get/all/project-level-permission/${projectId}`),
- // Services
- getProjectAssignedServices:(projectId)=>api.get(`/api/Project/get/assigned/services/${projectId}`),
- getProjectAssignedOrganizations:(projectId)=>api.get(`/api/Project/get/assigned/organization/${projectId}`)
+ // Services
+ getProjectAssignedServices: (projectId) => api.get(`/api/Project/get/assigned/services/${projectId}`),
+ getProjectAssignedOrganizations: (projectId) => api.get(`/api/Project/get/assigned/organization/${projectId}`)
};
export const TasksRepository = {
|