From cce6546a62150f98720dc4113d7f2f45db1d1dc9 Mon Sep 17 00:00:00 2001
From: Kyle Krueger <kyle.s.krueger@gmail.com>
Date: Tue, 5 Nov 2019 15:15:11 +0100
Subject: [PATCH] Feature/last x days parameter (#4333)

* Add last 14, 30, 60, and 90 days to DRP.js

Date Range Parameter (DRP)

* Add last 14, 30, 60, and 60 day params to DRP.jsx

DateRangeParameters (DRP)
---
 .../dynamic-parameters/DateRangeParameter.jsx    | 12 ++++++++++++
 .../services/parameters/DateRangeParameter.js    | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/client/app/components/dynamic-parameters/DateRangeParameter.jsx b/client/app/components/dynamic-parameters/DateRangeParameter.jsx
index 8c6a86d865..a61684ab89 100644
--- a/client/app/components/dynamic-parameters/DateRangeParameter.jsx
+++ b/client/app/components/dynamic-parameters/DateRangeParameter.jsx
@@ -34,6 +34,18 @@ const DYNAMIC_DATE_OPTIONS = [
   { name: 'Last 7 days',
     value: getDynamicDateRangeFromString('d_last_7_days'),
     label: () => getDynamicDateRangeFromString('d_last_7_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 14 days',
+    value: getDynamicDateRangeFromString('d_last_14_days'),
+    label: () => getDynamicDateRangeFromString('d_last_14_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 30 days',
+    value: getDynamicDateRangeFromString('d_last_30_days'),
+    label: () => getDynamicDateRangeFromString('d_last_30_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 60 days',
+    value: getDynamicDateRangeFromString('d_last_60_days'),
+    label: () => getDynamicDateRangeFromString('d_last_60_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 90 days',
+    value: getDynamicDateRangeFromString('d_last_90_days'),
+    label: () => getDynamicDateRangeFromString('d_last_90_days').value()[0].format('MMM D') + ' - Today' },
 ];
 
 const DYNAMIC_DATETIME_OPTIONS = [
diff --git a/client/app/services/parameters/DateRangeParameter.js b/client/app/services/parameters/DateRangeParameter.js
index dce8900283..72b4f799bb 100644
--- a/client/app/services/parameters/DateRangeParameter.js
+++ b/client/app/services/parameters/DateRangeParameter.js
@@ -48,6 +48,22 @@ const DYNAMIC_DATE_RANGES = {
     name: 'Last 7 days',
     value: () => [moment().subtract(7, 'days'), moment()],
   },
+  last_14_days: {
+    name: 'Last 14 days',
+    value: () => [moment().subtract(14, 'days'), moment()],
+  },
+  last_30_days: {
+    name: 'Last 30 days',
+    value: () => [moment().subtract(30, 'days'), moment()],
+  },
+  last_60_days: {
+    name: 'Last 60 days',
+    value: () => [moment().subtract(60, 'days'), moment()],
+  },
+  last_90_days: {
+    name: 'Last 90 days',
+    value: () => [moment().subtract(90, 'days'), moment()],
+  },
 };
 
 export const DynamicDateRangeType = PropTypes.oneOf(values(DYNAMIC_DATE_RANGES));