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

Move html out of clin fields macro and fix initial values in pop date range when there is no form data

Browse Source
This commit is contained in:
leigh-mil
2019-09-25 10:42:40 -04:00
parent eef15f311f
commit 5e1ce65662
6 changed files with 256 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/components/clin_fields.html
View File

@@ -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 }}
</div>
</div>
{% 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 %}
</div>

18
templates/components/pop_date_range.html
View File

@@ -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-date-range
initial-min-start-date="{{ mindate.strftime('%Y-%m-%d') }}"
initial-max-end-date="{{ maxdate.strftime('%Y-%m-%d') }}"
:clin-index="clinIndex"
initial-min-start-date="{{ mindate }}"
initial-max-end-date="{{ maxdate }}"
{% if index %}
v-bind:clin-index="{{ index }}"
{% else %}
v-bind:clin-index="clinIndex"
{% endif %}
{% if start_field %}
initial-start-date="{{ start_field.data }}"
{% endif %}
@@ -43,7 +47,7 @@
</p>
<div v-if='minError' class="usa-input-error-message">
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") }}.
</div>
<div v-if='maxError' class="usa-input-error-message">
PoP start date must be before end date.
@@ -84,7 +88,7 @@
<div class="usa-form-group usa-form-group-year">
<label>{{ 'components.date_selector.year' | translate }}</label>
<input
id="date-year"
name="date-year"
maxlength="4"
type="number"
v-model="year"
@@ -142,7 +146,7 @@
PoP end date must be after start date.
</div>
<div v-if='maxError' class="usa-input-error-message">
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") }}.
</div>
</legend>