From 359edea97c647f0461403442e3f35a33b128fd77 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 23 Feb 2021 16:40:40 -0800 Subject: [PATCH] Added date picker ranges to time ticket selector IO-532 --- .../report-center-modal.component.jsx | 32 ++----------------- .../time-tickets-dates-selector.component.jsx | 2 ++ client/src/utils/DatePickerRanges.js | 26 +++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 client/src/utils/DatePickerRanges.js diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx index 294fcc9db..95a00c66e 100644 --- a/client/src/components/report-center-modal/report-center-modal.component.jsx +++ b/client/src/components/report-center-modal/report-center-modal.component.jsx @@ -10,6 +10,7 @@ import { selectReportCenter } from "../../redux/modals/modals.selectors"; import { GenerateDocument } from "../../utils/RenderTemplate"; import { TemplateList } from "../../utils/TemplateConstants"; import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component"; +import DatePIckerRanges from "../../utils/DatePickerRanges"; const mapStateToProps = createStructuredSelector({ reportCenterModal: selectReportCenter, @@ -119,36 +120,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) { > diff --git a/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx b/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx index 65fe93ae9..8aa7f3e7f 100644 --- a/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx +++ b/client/src/components/ticket-tickets-dates-selector/time-tickets-dates-selector.component.jsx @@ -1,3 +1,4 @@ +import DatePickerRanges from "../../utils/DatePickerRanges"; import { DatePicker } from "antd"; import moment from "moment"; import queryString from "query-string"; @@ -38,6 +39,7 @@ export default function TimeTicketsDatesSelector() { start ? moment(start) : moment().startOf("week").subtract(7, "days"), end ? moment(end) : moment().endOf("week"), ]} + ranges={DatePickerRanges} onCalendarChange={handleChange} /> diff --git a/client/src/utils/DatePickerRanges.js b/client/src/utils/DatePickerRanges.js new file mode 100644 index 000000000..d2c377a81 --- /dev/null +++ b/client/src/utils/DatePickerRanges.js @@ -0,0 +1,26 @@ +import moment from "moment"; +const range = { + Today: [moment(), moment()], + "Last 14 days": [moment().subtract(14, "days"), moment()], + "Last 7 days": [moment().subtract(7, "days"), moment()], + "Next 7 days": [moment(), moment().add(7, "days")], + "Next 14 days": [moment(), moment().add(14, "days")], + "Last Month": [ + moment().startOf("month").subtract(1, "month"), + moment().startOf("month").subtract(1, "month").endOf("month"), + ], + "This Month": [moment().startOf("month"), moment().endOf("month")], + "Next Month": [ + moment().startOf("month").add(1, "month"), + moment().startOf("month").add(1, "month").endOf("month"), + ], + "Last Quarter": [ + moment().startOf("quarter").subtract(1, "quarters"), + moment().startOf("quarter").subtract(1, "day"), + ], + "This Quarter": [ + moment().startOf("quarter"), + moment().startOf("quarter").add(1, "quarter").subtract(1, "day"), + ], +}; +export default range;