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.

Sign up for GitHub

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

1308 fe preventing dates longer than 3 months #1342

Merged
merged 7 commits into from
Sep 12, 2022
Merged

1308 fe preventing dates longer than 3 months #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
abda2e0
added caching decorator
jekijo Aug 19, 2022
0e55481
added caching decorator
jekijo Aug 20, 2022
a5043cd
limited date ranges to 3 months
jekijo Aug 23, 2022
1c43b79
added past and future date restrictions
jekijo Aug 24, 2022
7cd5897
formatting
jekijo Sep 8, 2022
2f2776f
removed caching decorator
jekijo Sep 9, 2022
bbf8fd6
format
jekijo Sep 9, 2022
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
16 changes: 3 additions & 13 deletions client/components/DateSelector/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import { DateUtils } from 'react-day-picker';
const today = new Date();

const oneMonthBack = DateUtils.addMonths(today, -1);
const sixMonthsBack = DateUtils.addMonths(today, -6);
const twelveMonthsBack = DateUtils.addMonths(today, -12);
const startOfThisYear = new Date(`1/1/${today.getFullYear()}`);
const threeMonthsBack = DateUtils.addMonths(today, -3);
const oneWeekBack = new Date(new Date().setDate(today.getDate() - 7));

const options = [
Expand All @@ -18,16 +16,8 @@ const options = [
dates: [oneMonthBack, today],
},
{
text: 'Last 6 months',
dates: [sixMonthsBack, today],
},
{
text: 'Last 12 months',
dates: [twelveMonthsBack, today],
},
{
text: 'Year to Date',
dates: [startOfThisYear, today],
text: 'Last 3 Months',
dates: [threeMonthsBack, today],
},
];

Expand Down
3 changes: 3 additions & 0 deletions client/components/common/ReactDayPicker/ReactDayPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ function ReactDayPicker({

const from = moment(startDate).toDate();
const enteredToDate = moment(enteredTo).toDate();
const today = new Date();
const lastThreeMonths = new Date(today.getFullYear(), today.getMonth() - 3, today.getDate());

return (
<>
<Styles range={range} />
<DayPicker
className="Range"
disabledDays={{ before: lastThreeMonths, after: today }}
numberOfMonths={1}
fromMonth={from}
selectedDays={[from, { from, to: enteredToDate }]}
Expand Down