Hide Project Dropdown When Only One Project Is Assigned to Employee #202
@ -17,8 +17,7 @@ import {refreshData, setProjectId} from "../../slices/localVariablesSlice";
|
|||||||
import InfraTable from "../Project/Infrastructure/InfraTable";
|
import InfraTable from "../Project/Infrastructure/InfraTable";
|
||||||
|
|
||||||
|
|
||||||
const InfraPlanning = () =>
|
const InfraPlanning = () => {
|
||||||
{
|
|
||||||
const { profile: LoggedUser } = useProfile()
|
const { profile: LoggedUser } = useProfile()
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
const { projects, loading: project_listLoader, error: projects_error } = useProjects()
|
const { projects, loading: project_listLoader, error: projects_error } = useProjects()
|
||||||
@ -28,15 +27,12 @@ const InfraPlanning = () =>
|
|||||||
const { projects_Details, loading: project_deatilsLoader, error: project_error, refetch } = useProjectDetails(selectedProject)
|
const { projects_Details, loading: project_deatilsLoader, error: project_error, refetch } = useProjectDetails(selectedProject)
|
||||||
const reloadedData = useSelector((store) => store.localVariables.reload)
|
const reloadedData = useSelector((store) => store.localVariables.reload)
|
||||||
|
|
||||||
useEffect( () =>
|
useEffect(() => {
|
||||||
{
|
|
||||||
dispatch(setProjectId(projects[0]?.id))
|
dispatch(setProjectId(projects[0]?.id))
|
||||||
}, [projects])
|
}, [projects])
|
||||||
|
|
||||||
useEffect( () =>
|
useEffect(() => {
|
||||||
{
|
if (reloadedData) {
|
||||||
if (reloadedData)
|
|
||||||
{
|
|
||||||
refetch()
|
refetch()
|
||||||
dispatch(refreshData(false))
|
dispatch(refreshData(false))
|
||||||
}
|
}
|
||||||
@ -50,19 +46,44 @@ const InfraPlanning = () =>
|
|||||||
<div className="align-items-center">
|
<div className="align-items-center">
|
||||||
<div className="row ">
|
<div className="row ">
|
||||||
<div className="col-sm-3 col-8 text-start mb-1">
|
<div className="col-sm-3 col-8 text-start mb-1">
|
||||||
<select name="DataTables_Table_0_length"
|
{project_listLoader ? (
|
||||||
aria-controls="DataTables_Table_0"
|
<select
|
||||||
|
name="project_select"
|
||||||
className="form-select form-select-sm"
|
className="form-select form-select-sm"
|
||||||
value={selectedProject}
|
value=""
|
||||||
onChange={(e)=>dispatch(setProjectId(e.target.value))}
|
disabled
|
||||||
aria-label=""
|
|
||||||
>
|
>
|
||||||
{(project_listLoader || projects.length < 0) && <option value="Loading..." disabled>Loading...</option> }
|
<option value="">Loading Projects...</option>
|
||||||
|
</select>
|
||||||
{!project_listLoader && projects?.map((project)=>(
|
) : projects.length === 0 ? (
|
||||||
<option key={project.id} value={project.id}>{project.name}</option>
|
<input
|
||||||
|
type="text"
|
||||||
|
className="form-control form-control-sm text-danger"
|
||||||
|
value="No projects assigned."
|
||||||
|
readOnly
|
||||||
|
/>
|
||||||
|
) : projects.length === 1 ? (
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
className="form-control form-control-sm"
|
||||||
|
value={projects[0].name}
|
||||||
|
readOnly
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<select
|
||||||
|
name="project_select"
|
||||||
|
className="form-select form-select-sm"
|
||||||
|
value={selectedProject || ""}
|
||||||
|
onChange={(e) => dispatch(setProjectId(e.target.value))}
|
||||||
|
>
|
||||||
|
{projects.map((project) => (
|
||||||
|
<option value={project.id} key={project.id}>
|
||||||
|
{project.name}
|
||||||
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
|
)}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -240,18 +240,16 @@ const DailyTask = () => {
|
|||||||
DateDifference="6"
|
DateDifference="6"
|
||||||
dateFormat="DD-MM-YYYY"
|
dateFormat="DD-MM-YYYY"
|
||||||
/>
|
/>
|
||||||
{/* FilterIcon component now manages its own filter states and logic */}
|
|
||||||
<FilterIcon
|
<FilterIcon
|
||||||
taskListData={TaskList} // Pass the raw TaskList to FilterIcon
|
taskListData={TaskList}
|
||||||
onApplyFilters={setFilters} // Callback to receive the filtered states from FilterIcon
|
onApplyFilters={setFilters}
|
||||||
currentSelectedBuilding={filters.selectedBuilding}
|
currentSelectedBuilding={filters.selectedBuilding}
|
||||||
currentSelectedFloors={filters.selectedFloors}
|
currentSelectedFloors={filters.selectedFloors}
|
||||||
currentSelectedActivities={filters.selectedActivities}
|
currentSelectedActivities={filters.selectedActivities}
|
||||||
// You can pass the project_loading state here if you want to disable filter during project load
|
|
||||||
// isProjectLoading={project_loading}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="col-md-4 col-12 text-center mb-2 mb-md-0">
|
<div className="col-md-4 col-12 text-center mb-2 mb-md-0">
|
||||||
|
{project_loading ? (
|
||||||
<select
|
<select
|
||||||
name="project_select"
|
name="project_select"
|
||||||
aria-controls="DataTables_Table_0"
|
aria-controls="DataTables_Table_0"
|
||||||
@ -259,21 +257,44 @@ const DailyTask = () => {
|
|||||||
value={selectedProject || ""}
|
value={selectedProject || ""}
|
||||||
onChange={handleProjectChange}
|
onChange={handleProjectChange}
|
||||||
aria-label="Select Project"
|
aria-label="Select Project"
|
||||||
disabled={project_loading} // Disable dropdown while projects are loading
|
disabled={true}
|
||||||
>
|
>
|
||||||
{project_loading && (
|
|
||||||
<option value="" disabled>
|
<option value="" disabled>
|
||||||
Loading Projects...
|
Loading Projects...
|
||||||
</option>
|
</option>
|
||||||
)}
|
</select>
|
||||||
{!project_loading &&
|
) : projects.length === 0 ? (
|
||||||
projects &&
|
<input
|
||||||
projects?.map((project) => (
|
type="text"
|
||||||
|
className="form-control form-control-sm "
|
||||||
|
value="No projects assigned."
|
||||||
|
readOnly
|
||||||
|
aria-label="No projects assigned"
|
||||||
|
/>
|
||||||
|
) : projects.length === 1 ? (
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
className="form-control form-control-sm"
|
||||||
|
value={projects[0].name}
|
||||||
|
readOnly
|
||||||
|
aria-label="Assigned Project"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<select
|
||||||
|
name="project_select"
|
||||||
|
aria-controls="DataTables_Table_0"
|
||||||
|
className="form-select form-select-sm"
|
||||||
|
value={selectedProject || ""}
|
||||||
|
onChange={handleProjectChange}
|
||||||
|
aria-label="Select Project"
|
||||||
|
>
|
||||||
|
{projects?.map((project) => (
|
||||||
<option value={project.id} key={project.id}>
|
<option value={project.id} key={project.id}>
|
||||||
{project.name}
|
{project.name}
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="table-responsive text-nowrap mt-3">
|
<div className="table-responsive text-nowrap mt-3">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user