pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1106 from dod-ccpo/clin-errors-contract-dates

Browse Source 
PoP Range error message
This commit is contained in:
leigh-mil
2019-10-08 15:39:34 -04:00
committed by GitHub
parent 0870959477 7f0a25ea17
commit bb6d656def
9 changed files with 167 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
templates/components/pop_date_range.html
View File

@@ -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-date-range
initial-min-start-date="{{ mindate }}"
initial-max-end-date="{{ maxdate }}"
@@ -24,6 +26,8 @@
<date-selector
:mindate="initialMinStartDate"
:maxdate="maxStartProp"
:minrange='initialMinStartDate'
:maxrange='initialMaxEndDate'
{% if start_field %}
name-tag='{{ start_field.name }}'
initialmonth="{{ start_field.data.month }}"
@@ -46,11 +50,14 @@
{{ "task_orders.form.pop_example" | translate | safe }}
</p>
<div v-if='minError' class="usa-input-error-message">
PoP start date must be on or after {{ mindate | formattedDate(formatter="%B %d, %Y") }}.
<div v-if='outsideRange && !minError' class="usa-input-error-message">
{{ "forms.task_order.pop_errors.start_past_contract" | translate({"date": formatted_end}) }}
</div>
<div v-if='maxError' class="usa-input-error-message">
PoP start date must be before end date.
<div v-if='minError' class="usa-input-error-message">
{{ "forms.task_order.pop_errors.start_pre_contract" | translate({"date": formatted_start}) }}
</div>
<div v-if='maxError && !outsideRange' class="usa-input-error-message">
{{ "forms.task_order.pop_errors.date_order" | translate }}
</div>
</legend>
@@ -118,6 +125,8 @@
<date-selector
:mindate="minEndProp"
:maxdate="initialMaxEndDate"
:minrange='initialMinStartDate'
:maxrange='initialMaxEndDate'
{% if end_field %}
name-tag='{{ end_field.name }}'
initialmonth="{{ end_field.data.month }}"
@@ -135,18 +144,20 @@
<div class="usa-input__title">
{{ 'task_orders.form.pop_end' | translate }}
</div>
{% 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 })) }}
<p class='usa-input__help'>
{{ 'task_orders.form.pop_example' | translate }}
</p>
<div v-if='minError' class="usa-input-error-message">
PoP end date must be after start date.
<div v-if='outsideRange && !maxError' class="usa-input-error-message">
{{ "forms.task_order.pop_errors.end_pre_contract" | translate({"date": formatted_start}) }}
</div>
<div v-if='minError && !outsideRange' class="usa-input-error-message">
{{ "forms.task_order.pop_errors.date_order" | translate }}
</div>
<div v-if='maxError' class="usa-input-error-message">
PoP end date must be on or after {{ formatted_end_date }}.
{{ "forms.task_order.pop_errors.end_past_contract" | translate({"date": formatted_end}) }}
</div>
</legend>