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

React Query Integration for Server State Sync in Clinet #245

Merged
admin merged 60 commits from react-query into main 2025-07-11 11:32:19 +00:00
Conversation 0 Commits 60 Files Changed 66 +7 -37
1 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25b2f6973c - Show all commits

44
src/pages/Activities/DailyTask.jsx
View File

@ -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 && <GlobalModel isOpen={isModalOpen} size="md" closeModal={handlecloseModal} >
@ -335,9 +307,7 @@ const DailyTask = () => {
</div>
</td>
<td>
{task.plannedTask || "NA"} /
{task.workItem.plannedWork -
task.workItem.completedWork}
{formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)}
</td>
<td>{task.completedTask}</td>
<td>