Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: incorrect date range if end date picked first #1439

Merged
merged 1 commit into from
Feb 3, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion client/components/common/ReactDayPicker/ReactDayPicker.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@ function ReactDayPicker({
// first day in their date range if from and to are set, or if they're both
// unset. Otherwise, they are selecting the last day.
if (!(startDate && endDate)) {
setToDay(day);
// If the user picks the first date then picks the second date that is before the first date
// Reassign the From and To Day
if (moment(day).format(INTERNAL_DATE_SPEC) < startDate) {
const tempDate = startDate;
setToDay(moment(tempDate).toDate());
setFromDay(day);
updateEndDate(tempDate);
setEnteredTo(moment(tempDate).toDate());
} else {
setToDay(day);
}
return;
}
setFromDay(day);
Expand Down