Organization_Management : Organization Hierarchy #443

Merged
pramod.mahajan merged 180 commits from Organization_Management into main 2025-09-30 09:07:31 +00:00
3 changed files with 49 additions and 27 deletions
Showing only changes of commit 9223f7a176 - Show all commits

View File

@ -55,7 +55,7 @@ const InfraPlanning = () => {
if (isFetched && (!projectInfra || projectInfra.length === 0)) { if (isFetched && (!projectInfra || projectInfra.length === 0)) {
return ( return (
<div className="card text-center"> <div className="text-center">
<p className="my-3">No Result Found</p> <p className="my-3">No Result Found</p>
</div> </div>
); );
@ -63,14 +63,12 @@ const InfraPlanning = () => {
return ( return (
<div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4"> <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
<div className="card">
<div className="card-body" style={{ padding: "0.5rem" }}> <div className="card-body" style={{ padding: "0.5rem" }}>
<div className="row"> <div className="row">
<InfraTable buildings={projectInfra} projectId={selectedProject} /> <InfraTable buildings={projectInfra} projectId={selectedProject} />
</div> </div>
</div> </div>
</div> </div>
</div>
); );
}; };

View File

@ -6,6 +6,7 @@ import { useDispatch } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice"; import { setProjectId } from "../../slices/localVariablesSlice";
import { useSelectedProject } from "../../slices/apiDataManager"; import { useSelectedProject } from "../../slices/apiDataManager";
import { useProjectAssignedServices } from "../../hooks/useProjects"; import { useProjectAssignedServices } from "../../hooks/useProjects";
const TaskPlannng = () => { const TaskPlannng = () => {
const selectedProject = useSelectedProject(); const selectedProject = useSelectedProject();
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -35,8 +36,11 @@ const TaskPlannng = () => {
]} ]}
/> />
{/* 🔹 Service Dropdown */} <div className="card">
<div className="mb-3"> <div className="card-body">
{/* Service Dropdown */}
<div className="mb-3 ms-2">
{assignedServices?.length > 1 ? (
<select <select
id="serviceSelect" id="serviceSelect"
className="form-select" className="form-select"
@ -44,22 +48,42 @@ const TaskPlannng = () => {
onChange={handleServiceChange} onChange={handleServiceChange}
style={{ fontSize: "0.875rem", height: "35px", width: "190px" }} style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
> >
{servicesLoading && <option>Loading...</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>
) : (
<div
style={{
fontSize: "0.875rem",
height: "35px",
width: "190px",
border: "1px solid #ced4da",
borderRadius: "0.25rem",
padding: "4px 8px",
display: "flex",
alignItems: "center",
}}
>
{assignedServices?.length === 1
? assignedServices[0].name
: "No service available"}
</div>
)}
</div> </div>
{/* 🔹 InfraPlanning only when project is selected */}
{/* Infra Planning Component */}
{selectedProject ? ( {selectedProject ? (
<InfraPlanning selectedService={selectedService} /> <InfraPlanning selectedService={selectedService} />
) : ( ) : (
<div className="text-center">Please Select Project</div> <div className="text-center">Please Select Project</div>
)} )}
</div> </div>
</div>
</div>
); );
}; };