From 95ba471e1f26bfaf0bd52510cb465a807cbc4b26 Mon Sep 17 00:00:00 2001 From: Mikola Date: Thu, 12 Oct 2023 12:50:17 +0300 Subject: [PATCH] calendar range days --- .../ProfileCalendar/ProfileCalendar.jsx | 4 +- .../ProfileCalendarComponent.jsx | 42 ++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/components/ProfileCalendar/ProfileCalendar.jsx b/src/components/ProfileCalendar/ProfileCalendar.jsx index 21ad0f2d..454ce05e 100644 --- a/src/components/ProfileCalendar/ProfileCalendar.jsx +++ b/src/components/ProfileCalendar/ProfileCalendar.jsx @@ -43,8 +43,8 @@ export const ProfileCalendar = () => { setValue(value); } - function setStartDateRange (date) { - setStartDate(date) + function setStartDateRange(date) { + setStartDate(date); } function toggleStartRangeDays() { diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 52710d80..07676f45 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -39,7 +39,7 @@ export const ProfileCalendarComponent = React.memo( startRangeDays, toggleRangeDays, startDate, - setStartDateRange + setStartDateRange, }) => { const dispatch = useDispatch(); @@ -60,7 +60,7 @@ export const ProfileCalendarComponent = React.memo( })); }); if (endDate) { - resetRangeDays() + resetRangeDays(); } }, [value]); @@ -117,11 +117,14 @@ export const ProfileCalendarComponent = React.memo( } function reportsByDate(endDay) { - const requestDates = startDate < endDay ? `fromDate=${getCorrectYYMMDD( - startDate._d - )}&toDate=${getCorrectYYMMDD(endDay._d)}` : `fromDate=${getCorrectYYMMDD( - endDay._d - )}&toDate=${getCorrectYYMMDD(startDate._d)}`; + const requestDates = + startDate < endDay + ? `fromDate=${getCorrectYYMMDD( + startDate._d + )}&toDate=${getCorrectYYMMDD(endDay._d)}` + : `fromDate=${getCorrectYYMMDD(endDay._d)}&toDate=${getCorrectYYMMDD( + startDate._d + )}`; apiRequest( `/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem( "cardId" @@ -153,24 +156,22 @@ export const ProfileCalendarComponent = React.memo( for (let curDay in selectedRangeDays) { if (day > startDate) { if ( - day > startDate && - new Date(curDay) > startDate && - new Date(curDay) < day + day > startDate && + new Date(curDay) > startDate && + new Date(curDay) < day ) { selectRange[curDay] = true; - } - else { + } else { selectRange[curDay] = false; } } else { if ( - day < startDate && - new Date(curDay) < startDate && - new Date(curDay) > day + day < startDate && + new Date(curDay) < startDate && + new Date(curDay) > day ) { selectRange[curDay] = true; - } - else { + } else { selectRange[curDay] = false; } } @@ -266,7 +267,8 @@ export const ProfileCalendarComponent = React.memo( className={ startRangeDays ? `selectDays ${ - String(startDate?._d) === String(day._d) || endDate === day + String(startDate?._d) === String(day._d) || + endDate === day ? "selectedDay" : "" } ${endDate ? "disable" : ""} ${ @@ -299,7 +301,9 @@ export const ProfileCalendarComponent = React.memo( }} > {endDate - ? startDate < endDate ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` + ? startDate < endDate + ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` + : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : "Выбрать диапазон"}