Compare commits

..

No commits in common. "25de45b31bfd1ce7b59152bba1b3690236dca4cc" and "0746e5c34947012837332d2a6849adda5540cb7e" have entirely different histories.

3 changed files with 19 additions and 60 deletions

View File

@ -55,7 +55,7 @@ const InfraPlanning = () => {
if (isFetched && (!projectInfra || projectInfra.length === 0)) { if (isFetched && (!projectInfra || projectInfra.length === 0)) {
return ( return (
<div className="text-center"> <div className="card text-center">
<p className="my-3">No Result Found</p> <p className="my-3">No Result Found</p>
</div> </div>
); );
@ -63,9 +63,11 @@ 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

@ -162,7 +162,7 @@ const ProjectInfra = ({ data, onDataChange, eachSiteEngineer }) => {
<div className="row "> <div className="row ">
{isLoading && <p>Loading....</p>} {isLoading && <p>Loading....</p>}
{projectInfra && projectInfra?.length > 0 && ( {projectInfra && projectInfra?.length > 0 && (
<InfraTable <InfraTable
buildings={projectInfra} buildings={projectInfra}
projectId={projectId} projectId={projectId}
// handleFloor={submitData} // handleFloor={submitData}

View File

@ -1,31 +1,22 @@
import React, { useEffect, useState } from "react"; import React,{useEffect,useRef} from "react";
import Breadcrumb from "../../components/common/Breadcrumb"; import Breadcrumb from "../../components/common/Breadcrumb";
import InfraPlanning from "../../components/Activities/InfraPlanning"; import InfraPlanning from "../../components/Activities/InfraPlanning";
import { useProjectName } from "../../hooks/useProjects"; import { useProjectName } from "../../hooks/useProjects";
import { useDispatch } from "react-redux"; import { useDispatch, useSelector } 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";
const TaskPlannng = () => { const TaskPlannng = () => {
const selectedProject = useSelectedProject(); const selectedProject = useSelectedProject();
const dispatch = useDispatch(); const dispatch = useDispatch();
const { projectNames = [], loading: projectLoading } = useProjectName(); const { projectNames = [], loading: projectLoading } = useProjectName();
// Service dropdown state useEffect(() => {
const { data: assignedServices, isLoading: servicesLoading } = if (!selectedProject) {
useProjectAssignedServices(selectedProject); dispatch(setProjectId(projectNames[0]?.id));
const [selectedService, setSelectedService] = useState(""); }
}, [projectNames, selectedProject?.id, dispatch]);
useEffect(() => {
if (!selectedProject && projectNames?.length > 0) {
dispatch(setProjectId(projectNames[0]?.id));
}
}, [projectNames, selectedProject, dispatch]);
const handleServiceChange = (e) => {
setSelectedService(e.target.value);
};
return ( return (
<div className="container-fluid"> <div className="container-fluid">
@ -35,45 +26,11 @@ const TaskPlannng = () => {
{ label: "Daily Task Planning" }, { label: "Daily Task Planning" },
]} ]}
/> />
{selectedProject ? (
<div className="card"> <InfraPlanning />
<div className="card-body"> ) : (
{/* Service Dropdown */} <div className="text-center">Please Select Project</div>
<div className="mb-1 ms-2"> )}
{assignedServices?.length > 1 ? (
<select
id="serviceSelect"
className="form-select"
value={selectedService}
onChange={handleServiceChange}
style={{ fontSize: "0.875rem", height: "35px", width: "190px" }}
>
{assignedServices.map((service) => (
<option key={service.id} value={service.id}>
{service.name}
</option>
))}
</select>
) : (
<div
className="text-start"
>
{assignedServices?.length === 1
? <h5>{ assignedServices[0].name}</h5>
: "No service available"}
</div>
)}
</div>
{/* Infra Planning Component */}
{selectedProject ? (
<InfraPlanning selectedService={selectedService} />
) : (
<div className="text-center">Please Select Project</div>
)}
</div>
</div>
</div> </div>
); );
}; };