Merge pull request #1128 from alphagov/2116-2-week-date

2116: Add option to auto populate reminder date with 2-weeks from today

Author: ahernp

accessibility_monitoring_platform/apps/common/templates/common/amp_date_widget_template.html

@@ -29,6 +29,14 @@
             Populate date with one week from today
         </span>
     </p>
+    <p class="govuk-body-m amp-margin-top-0 amp-margin-bottom-0">
+        <span class="amp-control amp-populate-date-2-weeks" tabIndex="0"
+            dayFieldId="{{ widget.subwidgets.0.attrs.id }}"
+            monthFieldId="{{ widget.subwidgets.1.attrs.id }}"
+            yearFieldId="{{ widget.subwidgets.2.attrs.id }}">
+            Populate date with two weeks from today
+        </span>
+    </p>
     <p class="govuk-body-m amp-margin-top-0 amp-margin-bottom-0">
         <span class="amp-control amp-populate-date-4-weeks" tabIndex="0"
             dayFieldId="{{ widget.subwidgets.0.attrs.id }}"

accessibility_monitoring_platform/apps/common/tests/test_forms.py

@@ -138,6 +138,8 @@ def test_amp_date_widget_html_includes_populate_future_dates_controls():
     assert "amp-populate-date-today" not in html
     assert "Populate date with one week from today" in html
     assert "amp-populate-date-1-week" in html
+    assert "Populate date with two weeks from today" in html
+    assert "amp-populate-date-2-weeks" in html
     assert "Populate date with four weeks from today" in html
     assert "amp-populate-date-4-weeks" in html
     assert "Populate date with 12 weeks from today" in html

common/static/js/populate_date.js

@@ -2,6 +2,7 @@
 Populate date field with today.
 */
 const oneWeekInDays = 7
+const twoWeeksInDays = oneWeekInDays * 2
 const fourWeeksInDays = oneWeekInDays * 4
 const twelveWeeksInDays = oneWeekInDays * 12
 
@@ -46,6 +47,13 @@ Array.from(populateDateWithOneWeekElements).forEach(function (populateDateElemen
   addPopulateDateListeners(populateDateElement, daysOffset)
 })
 
+const populateDateWithTwoWeeksElements = document.getElementsByClassName('amp-populate-date-2-weeks')
+
+Array.from(populateDateWithTwoWeeksElements).forEach(function (populateDateElement) {
+  const daysOffset = twoWeeksInDays
+  addPopulateDateListeners(populateDateElement, daysOffset)
+})
+
 const populateDateWithFourWeeksElements = document.getElementsByClassName('amp-populate-date-4-weeks')
 
 Array.from(populateDateWithFourWeeksElements).forEach(function (populateDateElement) {