admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Changes in the Teams Services dropdown will reflect the Services data.

Browse Source
This commit is contained in:
Kartik Sharma 2025-09-20 19:30:47 +05:30
parent 9711144236
commit fa7dc2860c
3 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/components/Project/Teams.jsx
View File

@ -36,10 +36,11 @@ const Teams = () => {
const [activeEmployee, setActiveEmployee] = useState(true); const [activeEmployee, setActiveEmployee] = useState(true);
const [deleteEmployee, setDeleteEmplyee] = useState(null); const [deleteEmployee, setDeleteEmplyee] = useState(null);
const [searchTerm, setSearchTerm] = useState(""); // State for search term const [searchTerm, setSearchTerm] = useState(""); // State for search term
const [selectedService, setSelectedService] = useState(null);
const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId); const { data: assignedServices, isLoading: servicesLoading } = useProjectAssignedServices(projectId);
const handleToggleActive = e => setActiveEmployee(e.target.checked); const handleToggleActive = e => setActiveEmployee(e.target.checked);
const [selectedService, setSelectedService] = useState("");
const handleServiceChange = (e) => { const handleServiceChange = (e) => {
setSelectedService(e.target.value); setSelectedService(e.target.value);
@ -53,7 +54,7 @@ const Teams = () => {
projectEmployees, projectEmployees,
loading: employeeLodaing, loading: employeeLodaing,
refetch, refetch,
} = useEmployeesByProjectAllocated(projectId); } = useEmployeesByProjectAllocated(projectId,selectedService);
const { const {
mutate: submitAllocations, mutate: submitAllocations,
isPending, isPending,
@ -264,50 +265,38 @@ const Teams = () => {
<div className="row d-flex justify-content-between mb-4"> <div className="row d-flex justify-content-between mb-4">
<div className="col-md-6 col-12 d-flex align-items-center"> <div className="col-md-6 col-12 d-flex align-items-center">
<div className="dataTables_length text-start py-1 px-0 col-md-4 col-12"> <div className="dataTables_length text-start py-1 px-0 col-md-4 col-12">
{servicesLoading ? ( {servicesLoading ? null : assignedServices && assignedServices.length > 0 ? (
<span></span> assignedServices.length > 1 ? (
) : assignedServices?.length > 1 ? ( <label>
<label> <select
<select name="serviceFilter"
name="DataTables_Table_0_length" aria-controls="DataTables_Table_0"
aria-controls="DataTables_Table_0" className="form-select form-select-sm"
className="form-select form-select-sm" aria-label="Select Service"
aria-label="Select Service" value={selectedService}
value={selectedService} onChange={handleServiceChange}
onChange={handleServiceChange} style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
style={{ fontSize: "0.875rem", height: "32px", width: "190px" }} >
> <option value="">All Services</option>
{assignedServices.map((service) => ( {assignedServices.map((service) => (
<option key={service.id} value={service.id}> <option key={service.id} value={service.id}>
{service.name} {service.name}
</option> </option>
))} ))}
</select> </select>
</label> </label>
) : (
<div>
<h5>{assignedServices[0].name}</h5>
</div>
)
) : ( ) : (
<div <div>
style={{ <h5>No Services Assigned</h5>
}}
>
{/* fier fitting */}
{assignedServices?.length === 1
?<h5>{ assignedServices[0].name}</h5>
: "No service available"}
</div> </div>
)} )}
</div> </div>
{/* <div className="dataTables_filter d-inline-flex align-items-center ms-2">
<input
type="search"
className="form-control form-control-sm me-4"
placeholder="Search by Name or Role"
aria-controls="DataTables_Table_0"
value={searchTerm}
onChange={handleSearch}
/>
</div> */}
</div> </div>
<div className="col-md-6 col-12 d-flex justify-content-end align-items-center"> <div className="col-md-6 col-12 d-flex justify-content-end align-items-center">
@ -393,7 +382,7 @@ const Teams = () => {
</div> </div>
</td> </td>
<td>{item.services || "N/A"}</td> <td>{item.serviceName || "N/A"}</td>
<td>{item.organizationName || "N/A"}</td> <td>{item.organizationName || "N/A"}</td>
<td> <td>

22
src/hooks/useProjects.js
View File

@ -41,22 +41,30 @@ export const useProjects = () => {
}; };
}; };
export const useEmployeesByProjectAllocated = (selectedProject) => { export const useEmployeesByProjectAllocated = (
projectId,
serviceId,
organizationId,
) => {
const { const {
data = [], data = [],
isLoading, isLoading,
refetch, refetch,
error, error,
} = useQuery({ } = useQuery({
queryKey: ["empListByProjectAllocated", selectedProject], queryKey: ["empListByProjectAllocated", projectId, serviceId,organizationId],
queryFn: async () => { queryFn: async () => {
const res = await ProjectRepository.getProjectAllocation(selectedProject); const res = await ProjectRepository.getProjectAllocation(
return res.data || res; projectId,
organizationId,
serviceId
);
return res?.data || res;
}, },
enabled: !!selectedProject, enabled: !!projectId,
onError: (error) => { onError: (error) => {
showToast( showToast(
error.message || "Error while Fetching project Allocated Employees", error.message || "Error while fetching project allocated employees",
"error" "error"
); );
}, },
@ -270,7 +278,7 @@ export const useProjectLevelEmployeePermission = (employeeId, projectId) => {
export const useProjectAssignedOrganizations =(projectId)=>{ export const useProjectAssignedOrganizations =(projectId)=>{
return useQuery({ return useQuery({
queryKey: ["projectAssignedServices", projectId], queryKey: ["projectAssignedOrganization", projectId],
queryFn: async () => { queryFn: async () => {
const resp = await ProjectRepository.getProjectAssignedOrganizations(projectId); const resp = await ProjectRepository.getProjectAssignedOrganizations(projectId);
return resp.data; return resp.data;

34
src/repositories/ProjectRepository.jsx
View File

@ -5,8 +5,20 @@ const ProjectRepository = {
getProjectByprojectId: (projetid) => getProjectByprojectId: (projetid) =>
api.get(`/api/project/details/${projetid}`), api.get(`/api/project/details/${projetid}`),
getProjectAllocation: (projetid) => getProjectAllocation: (projectId, organizationId, serviceId) => {
api.get(`api/project/allocation/${projetid}`), 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) => getEmployeesByProject: (projectId) =>
api.get(`/api/Project/employees/get/${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}`), getProjectLevelEmployeeList: (projectId) => api.get(`/api/Project/get/proejct-level/employees/${projectId}`),
getProjectLevelModules:()=>api.get(`/api/Project/get/proejct-level/modules`), getProjectLevelModules: () => api.get(`/api/Project/get/proejct-level/modules`),
getProjectLevelEmployeePermissions:(employeeId,projectId)=>api.get(`/api/Project/get/project-level-permission/employee/${employeeId}/project/${projectId}`), 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), updateProjectLevelEmployeePermission: (data) => api.post(`/api/Project/assign/project-level-permission`, data),
getAllProjectLevelPermission:(projectId)=>api.get(`/api/Project/get/all/project-level-permission/${projectId}`), getAllProjectLevelPermission: (projectId) => api.get(`/api/Project/get/all/project-level-permission/${projectId}`),
// Services // Services
getProjectAssignedServices:(projectId)=>api.get(`/api/Project/get/assigned/services/${projectId}`), getProjectAssignedServices: (projectId) => api.get(`/api/Project/get/assigned/services/${projectId}`),
getProjectAssignedOrganizations:(projectId)=>api.get(`/api/Project/get/assigned/organization/${projectId}`) getProjectAssignedOrganizations: (projectId) => api.get(`/api/Project/get/assigned/organization/${projectId}`)
}; };
export const TasksRepository = { export const TasksRepository = {