diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index f2d797a7..a8230e95 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -1,22 +1,29 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from "react";
+
const DateRangePicker = ({ onRangeChange }) => {
const inputRef = useRef(null);
useEffect(() => {
+
+ const today = new Date();
+ const fifteenDaysAgo = new Date();
+ fifteenDaysAgo.setDate(today.getDate() - 15);
+
+
const fp = flatpickr(inputRef.current, {
- mode: "range",
- dateFormat: "Y-m-d",
- static: true,
- clickOpens: true,
- onChange: (selectedDates, dateStr) => {
- const [startDate, endDate] = dateStr.split(" to ");
- onRangeChange?.({ startDate, endDate });
- }
- });
+ mode: "range",
+ dateFormat: "Y-m-d",
+ defaultDate: [fifteenDaysAgo, today], // ✅ set default range
+ static: true,
+ clickOpens: true,
+ onChange: (selectedDates, dateStr) => {
+ const [startDate, endDate] = dateStr.split(" to ");
+ onRangeChange?.({ startDate, endDate });
+ },
+ });
return () => {
- // Cleanup Flatpickr instance
fp.destroy();
};
}, [onRangeChange]);
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index ffd18230..07bf21ee 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -91,7 +91,7 @@ const DailyTask = () => {