diff --git a/.secrets.baseline b/.secrets.baseline index e40d679e..3acc6dd6 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -199,5 +199,5 @@ } ] }, - "version": "0.12.5" + "version": "0.12.6" } diff --git a/js/components/pop_date_range.js b/js/components/pop_date_range.js index 2ec369f6..654ad4ed 100644 --- a/js/components/pop_date_range.js +++ b/js/components/pop_date_range.js @@ -15,14 +15,20 @@ export default { props: { initialMinStartDate: String, initialMaxEndDate: String, - initialStartDate: String, - initialEndDate: String, + initialStartDate: { + type: String, + default: null, + }, + initialEndDate: { + type: String, + default: null, + }, clinIndex: Number, }, data: function() { - var start = new Date(this.initialStartDate) - var end = new Date(this.initialEndDate) + var start = !!this.initialStartDate ? new Date(this.initialStartDate) : null + var end = !!this.initialEndDate ? new Date(this.initialEndDate) : null var contractStart = new Date(this.initialMinStartDate) var contractEnd = new Date(this.initialMaxEndDate) @@ -60,7 +66,7 @@ export default { }, calcMaxStartDate: function(date, end = this.contractEnd) { - if (date < end) { + if (!!date && date < end) { return date } else { return end @@ -68,7 +74,7 @@ export default { }, calcMinEndDate: function(date, start = this.contractStart) { - if (date > start) { + if (!!date && date > start) { return date } else { return start diff --git a/js/test_templates/clin_fields.html b/js/test_templates/clin_fields.html index e59aaa83..debfcad5 100644 --- a/js/test_templates/clin_fields.html +++ b/js/test_templates/clin_fields.html @@ -312,120 +312,143 @@ -
-
- - -
- -
- Start Date -
- + + - -

- For example: 07 04 1776 -

- - - -
- - -
- - -
- -
- - -
- -
- - +
+
+ + v-bind:watch='true' + :optional='false' + inline-template> -
+
+ +
+ Start Date +
-
-
- +

+ For example: 07 04 1776 +

+ +
+ PoP start date must be on or after September 14, 2019. +
+
+ PoP start date must be before end date. +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+
+ -
-
- +
+
+ -
+
+
+
+
+
-
- -
-
-
-
- -
- -
- End Date -
+
+
+ + +
+ +
+ End Date +
- - @@ -436,7 +459,7 @@

- A CLIN's period of performance must end before September 14, 2022. + A CLIN's period of performance must end before .

@@ -447,87 +470,85 @@
- - - -

- For example: 07 04 1776 -

- - +

+ For example: 07 04 1776 +

-
- +
+ PoP end date must be after start date. +
+
+ PoP end date must be on or after September 14, 2022. +
+ -
- - -
+
+ -
- - -
+
+ + +
-
- - +
+ + +
-
+
+ + +
-
-
- +
+
+ -
-
- +
+
+ -
+
+
+
+
+
- - - - + + + -
-
-

-
-
diff --git a/js/test_templates/to_form.html b/js/test_templates/to_form.html index 817f7c5d..e2e30b07 100644 --- a/js/test_templates/to_form.html +++ b/js/test_templates/to_form.html @@ -199,17 +199,25 @@ Period of Performance
+ +
- -
+ +
- Start Date -
+ Start Date +

- For example: 07 04 1776 -

+ For example: 07 04 1776 +

+
+ PoP start date must be on or after September 14, 2019. +
+
+ PoP start date must be before end date. +
@@ -223,11 +231,19 @@
- +
+
+
+ +
+
@@ -235,22 +251,28 @@
- -
+ +
- End Date -
+ End Date +

- For example: 07 04 1776 -

+ For example: 07 04 1776 +

+
+ PoP end date must be after start date. +
+
+ PoP end date must be on or after September 14, 2022. +
@@ -266,19 +288,24 @@
+
+
+ +
+
-
-
-

-
+
diff --git a/templates/components/clin_fields.html b/templates/components/clin_fields.html index 88b1b478..6c91d7fe 100644 --- a/templates/components/clin_fields.html +++ b/templates/components/clin_fields.html @@ -1,6 +1,5 @@ {% from "components/clin_dollar_amount.html" import CLINDollarAmount %} {% from 'components/alert.html' import Alert %} -{% from 'components/date_picker.html' import DatePicker %} {% from 'components/icon.html' import Icon %} {% from 'components/options_input.html' import OptionsInput %} {% from 'components/text_input.html' import TextInput %} @@ -129,11 +128,12 @@ {{ 'task_orders.form.pop' | translate }}
- {% set contract_end_formatted = contract_end | dateFromString(formatter="%Y-%m-%d") | formattedDate(formatter="%B %d, %Y") %} + {% set contract_start_formatted = contract_start | dateFromString(formatter="%Y-%m-%d") %} + {% set contract_end_formatted = contract_end | dateFromString(formatter="%Y-%m-%d") %} {% if fields %} - {{ PopDateRange(start_field=fields.start_date, end_field=fields.end_date, watch=True, optional=False, mindate=contract_start | dateFromString(formatter="%Y-%m-%d"), maxdate=contract_end | dateFromString(formatter="%Y-%m-%d")) }} + {{ PopDateRange(start_field=fields.start_date, end_field=fields.end_date, watch=True, optional=False, mindate=contract_start, maxdate=contract_end) }} {% else %} - {{ PopDateRange(watch=True, optional=False, mindate=contract_start | dateFromString(formatter="%Y-%m-%d"), maxdate=contract_end | dateFromString(formatter="%Y-%m-%d")) }} + {{ PopDateRange(watch=True, optional=False, mindate=contract_start, maxdate=contract_end) }} {% endif %} diff --git a/templates/components/pop_date_range.html b/templates/components/pop_date_range.html index a7f18ba3..a0a69a13 100644 --- a/templates/components/pop_date_range.html +++ b/templates/components/pop_date_range.html @@ -1,11 +1,15 @@ {% from 'components/alert.html' import Alert %} {% from 'components/icon.html' import Icon %} -{% macro PopDateRange(start_field=None, end_field=None, mindate=mindate, maxdate=maxdate, watch=False, optional=True) %} +{% macro PopDateRange(start_field=None, end_field=None, mindate=mindate, maxdate=maxdate, watch=False, optional=True, index=None) %}
- PoP start date must be on or after {{ mindate | formattedDate(formatter="%B %d, %Y") }}. + PoP start date must be on or after {{ mindate | dateFromString(formatter="%Y-%m-%d") | formattedDate(formatter="%B %d, %Y") }}.
PoP start date must be before end date. @@ -84,7 +88,7 @@
- PoP end date must be on or after {{ maxdate | formattedDate(formatter="%B %d, %Y") }}. + PoP end date must be on or after {{ maxdate | dateFromString(formatter="%Y-%m-%d") | formattedDate(formatter="%B %d, %Y") }}.