diff --git a/js/test_templates/pop_date_range.html b/js/test_templates/pop_date_range.html index 3b88eb63..1eabb4ea 100644 --- a/js/test_templates/pop_date_range.html +++ b/js/test_templates/pop_date_range.html @@ -2,15 +2,15 @@
@@ -21,12 +21,12 @@ :maxdate="maxStartProp" :minrange='initialMinStartDate' :maxrange='initialMaxEndDate' - + name-tag='start_date' initialmonth="" initialday="" initialyear="" - + :optional='true' v-on:date-change='handleDateChange' inline-template> @@ -42,6 +42,7 @@

+ {{ ""}} PoP start date must be before or on September 14, 2022.
@@ -99,17 +100,17 @@
- + - +
- + - +
@@ -125,12 +126,12 @@ :maxdate="initialMaxEndDate" :minrange='initialMinStartDate' :maxrange='initialMaxEndDate' - + name-tag='end_date' initialmonth="" initialday="" initialyear="" - + :optional='true' v-on:date-change='handleDateChange' inline-template> @@ -140,26 +141,26 @@
End Date
- - - + + + @@ -222,17 +223,17 @@
- + - +
- + - +
diff --git a/templates/components/pop_date_range.html b/templates/components/pop_date_range.html index 4f4901eb..0eea2271 100644 --- a/templates/components/pop_date_range.html +++ b/templates/components/pop_date_range.html @@ -2,6 +2,8 @@ {% from 'components/icon.html' import Icon %} {% macro PopDateRange(start_field=None, end_field=None, mindate=mindate, maxdate=maxdate, optional=True, index=None) %} + {% set formatted_end = maxdate | formattedDate(formatter="%B %d, %Y") %} + {% set formatted_start = mindate | formattedDate(formatter="%B %d, %Y") %}
- PoP start date must be before or on {{ maxdate | formattedDate(formatter="%B %d, %Y") }}. + {{ "forms.task_order.pop_errors.start_past_contract" | translate({"date": formatted_end}) }}
- PoP start date must be on or after {{ mindate | formattedDate(formatter="%B %d, %Y") }}. + {{ "forms.task_order.pop_errors.start_pre_contract" | translate({"date": formatted_start}) }}
- PoP start date must be before end date. + {{ "forms.task_order.pop_errors.date_order" | translate }}
@@ -142,21 +144,20 @@
{{ 'task_orders.form.pop_end' | translate }}
- {% set formatted_end_date = maxdate | formattedDate(formatter="%B %d, %Y") %} - {{ Alert(message="task_orders.form.pop_end_alert" | translate({'end_date': formatted_end_date })) }} + {{ Alert(message="task_orders.form.pop_end_alert" | translate({'end_date': formatted_end })) }}

{{ 'task_orders.form.pop_example' | translate }}

- PoP end date must be on or after {{ mindate | formattedDate(formatter="%B %d, %Y") }}. + {{ "forms.task_order.pop_errors.end_pre_contract" | translate({"date": formatted_start}) }}
- PoP end date must be after start date. + {{ "forms.task_order.pop_errors.date_order" | translate }}
- PoP end date must be before or on {{ formatted_end_date }}. + {{ "forms.task_order.pop_errors.end_past_contract" | translate({"date": formatted_end}) }}