diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx index 438069cc..33352ba5 100644 --- a/src/components/common/DateRangePicker.jsx +++ b/src/components/common/DateRangePicker.jsx @@ -1,13 +1,12 @@ import React, { useEffect, useRef } from "react"; - -const DateRangePicker = ({ onRangeChange }) => { +const DateRangePicker = ({ onRangeChange, DateDifference = 15 }) => { const inputRef = useRef(null); useEffect(() => { const today = new Date(); const fifteenDaysAgo = new Date(); - fifteenDaysAgo.setDate(today.getDate() - 15); + fifteenDaysAgo.setDate(today.getDate() - DateDifference); const fp = flatpickr(inputRef.current, { mode: "range", @@ -20,12 +19,12 @@ const DateRangePicker = ({ onRangeChange }) => { onRangeChange?.({ startDate, endDate }); }, }); - + onRangeChange?.({ // startDate: fifteenDaysAgo.toISOString().split("T")[0], // endDate: today.toISOString().split("T")[0], - startDate: fifteenDaysAgo.toLocaleDateString('en-CA'), - endDate: today.toLocaleDateString('en-CA'), + startDate: fifteenDaysAgo.toLocaleDateString("en-CA"), + endDate: today.toLocaleDateString("en-CA"), }); return () => { diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index f987c2b3..08e68c3e 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -27,27 +27,21 @@ const DailyTask = () => { error: projects_Error, } = useProjects(); - - const [initialized, setInitialized] = useState(false); // Sync projectId (either from URL or pick first accessible one) useEffect(() => { if (!project_lodaing && projects.length > 0 && !initialized) { - - if (projectId) { dispatch(setProjectId(projectId)); } else if (!selectedProject) { - dispatch(setProjectId(projects[0].id)); + dispatch(setProjectId(projects[0].id)); } - + setInitialized(true); } }, [project_lodaing, projects, projectId, selectedProject, initialized]); - - const dispatch = useDispatch(selectedProject); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); @@ -56,15 +50,17 @@ const DailyTask = () => { loading: task_loading, error: task_error, refetch, - } = useTaskList( initialized ? selectedProject : null, + } = useTaskList( + initialized ? selectedProject : null, initialized ? dateRange.startDate : null, - initialized ? dateRange.endDate : null); + initialized ? dateRange.endDate : null + ); const [TaskLists, setTaskLists] = useState([]); useEffect(() => { setTaskLists(TaskList); - }, [TaskList,selectedProject]); + }, [TaskList, selectedProject]); const [selectedTask, selectTask] = useState(null); const [comments, setComment] = useState(null); @@ -81,7 +77,7 @@ const DailyTask = () => { selectTask(task); openModal(); }; - + return ( <>
{
- +
@@ -155,7 +151,6 @@ const DailyTask = () => { - @@ -168,7 +163,7 @@ const DailyTask = () => { {TaskLists?.length === 0 && !task_loading && ( )} @@ -180,13 +175,11 @@ const DailyTask = () => { )} - {TaskLists.map((task, index) => { return ( -
Activity Planned Compeleted
- No Task Found + No Task Found
{task.workItem.activityMaster.activityName || "No Activity Name"}