From c83161d5abf1e7a311ec03e854d56215269b2e92 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Mon, 14 Apr 2025 17:23:36 +0530 Subject: [PATCH 1/2] Breadcrumb changed --- src/pages/Activities/DailyTask.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = () => {
From 777b8d8d0b442fd43bcf33e71cccc67c7c416a0f Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Mon, 14 Apr 2025 17:30:29 +0530 Subject: [PATCH 2/2] set up deafult dates --- src/components/common/DateRangePicker.jsx | 29 ++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) 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]);