diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 5ce0712e..76bc76d6 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -20,14 +20,7 @@ const DailyTask = () => { const selectedProject = useSelector( (store) => store.localVariables.projectId ); - // const { - // projects, - // loading: project_loading, - // error: projects_Error, - // } = useProjects(); - // const [initialized, setInitialized] = useState(false); - // const dispatch = useDispatch(); const [filters, setFilters] = useState({ selectedBuilding: "", @@ -35,23 +28,7 @@ const DailyTask = () => { selectedActivities: [], }); - // useEffect(() => { - // if (!project_loading && projects.length > 0 && !initialized) { - // if (projectIdFromUrl) { - // dispatch(setProjectId(projectIdFromUrl)); - // } else if (selectedProject === 1 || selectedProject === undefined) { - // dispatch(setProjectId(projects[0].id)); - // } - // setInitialized(true); - // } - // }, [ - // project_loading, - // projects, - // projectIdFromUrl, - // selectedProject, - // initialized, - // dispatch, - // ]); + const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); @@ -153,16 +130,6 @@ const DailyTask = () => { setIsModalOpen( false ) // refetch(); } - // const handleProjectChange = (e) => { - // const newProjectId = e.target.value; - // dispatch(setProjectId(newProjectId)); - // setTaskLists([]); - // setFilters({ - // selectedBuilding: "", - // selectedFloors: [], - // selectedActivities: [], - // }); - // }; const handleCloseAction = (IsSubTask) => { if (IsSubTask) { @@ -179,6 +146,11 @@ const DailyTask = () => { // refetch(); }; + + const formatNumber = (num) => { + if (num == null || isNaN(num)) return "NA"; + return Number.isInteger(num) ? num : num.toFixed(2); +}; return ( <> {isModalOpen && @@ -335,9 +307,7 @@ const DailyTask = () => { - {task.plannedTask || "NA"} / - {task.workItem.plannedWork - - task.workItem.completedWork} + {formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)} {task.completedTask}