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

Remove watch from date selector component

Browse Source
This commit is contained in:
leigh-mil 2019-09-26 16:19:30 -04:00
parent 2f3863b84d
commit 0c54b61579
7 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/components/date_selector.js
View File

@ -20,10 +20,6 @@ export default {
mindate: { type: String },
maxdate: { type: String },
nameTag: { type: String },
watch: {
type: Boolean,
default: false,
},
optional: {
type: Boolean,
default: true,
@ -201,7 +197,6 @@ export default {
emitEvent('field-change', this, {
value: this.formattedDate,
name: this.name,
watch: this.watch,
valid: this.isDateValid,
})

8
js/test_templates/clin_fields.html
View File

@ -311,8 +311,6 @@
</div>
</div>
<pop-date-range
initial-min-start-date="2019-09-14"
@ -340,7 +338,6 @@
initialday=""
initialyear=""
v-bind:watch='true'
:optional='false'
v-on:date-change='handleDateChange'
inline-template>
@ -401,8 +398,8 @@
maxlength="4"
type="number"
v-model="year"
max=""
min=""
max="2022"
min="2019"
v-on:change="onInput"
/>
@ -440,7 +437,6 @@
initialday=""
initialyear=""
v-bind:watch='true'
:optional='false'
v-on:date-change='handleDateChange'
inline-template>

6
js/test_templates/pop_date_range.html
View File

@ -25,7 +25,6 @@
initialday=""
initialyear=""
v-bind:watch='false'
:optional='true'
v-on:date-change='handleDateChange'
inline-template>
@ -86,8 +85,8 @@
maxlength="4"
type="number"
v-model="year"
max=""
min=""
max="2022"
min="2019"
v-on:change="onInput"
/>
@ -125,7 +124,6 @@
initialday=""
initialyear=""
v-bind:watch='false'
:optional='true'
v-on:date-change='handleDateChange'
inline-template>

6
js/test_templates/to_form.html
View File

@ -203,7 +203,7 @@
<div>
<div class="form-row">
<div class="form-col">
<date-selector :maxdate="maxStartProp" :mindate="initialMinStartDate" :name-tag="'clins-' + clinIndex + '-start_date'" :optional="false" inline-template="" v-bind:watch="true" v-on:date-change="handleDateChange">
<date-selector :maxdate="maxStartProp" :mindate="initialMinStartDate" :name-tag="'clins-' + clinIndex + '-start_date'" :optional="false" inline-template="" v-on:date-change="handleDateChange">
<fieldset :name="name" class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid &amp;&amp; isDateComplete, 'usa-input--error': !isDateValid &amp;&amp; isDateComplete }">
<legend>
<div class="usa-input__title">
@ -231,7 +231,7 @@
</div>
<div class="usa-form-group usa-form-group-year">
<label>Year</label>
<input max="" maxlength="4" min="" name="date-year" type="number" v-model="year" v-on:change="onInput"/>
<input max="2022" maxlength="4" min="2019" name="date-year" type="number" v-model="year" v-on:change="onInput"/>
</div>
<div v-if="isDateComplete">
<div class="usa-form-group-date-ok" v-if="isDateValid">
@ -251,7 +251,7 @@
</div>
<div class="form-row">
<div class="form-col">
<date-selector :maxdate="initialMaxEndDate" :mindate="minEndProp" :name-tag="'clins-' + clinIndex + '-end_date'" :optional="false" inline-template="" v-bind:watch="true" v-on:date-change="handleDateChange">
<date-selector :maxdate="initialMaxEndDate" :mindate="minEndProp" :name-tag="'clins-' + clinIndex + '-end_date'" :optional="false" inline-template="" v-on:date-change="handleDateChange">
<fieldset :name="name" class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid &amp;&amp; isDateComplete, 'usa-input--error': !isDateValid &amp;&amp; isDateComplete }">
<legend>
<div class="usa-input__title">

4
templates/components/clin_fields.html
View File

@ -129,9 +129,9 @@
</div>
</div>
{% if fields %}
{{ PopDateRange(start_field=fields.start_date, end_field=fields.end_date, watch=True, optional=False, mindate=contract_start, maxdate=contract_end) }}
{{ PopDateRange(start_field=fields.start_date, end_field=fields.end_date, optional=False, mindate=contract_start, maxdate=contract_end) }}
{% else %}
{{ PopDateRange(watch=True, optional=False, mindate=contract_start, maxdate=contract_end) }}
{{ PopDateRange(optional=False, mindate=contract_start, maxdate=contract_end) }}
{% endif %}
</div>

2
templates/components/date_picker.html
View File

@ -7,7 +7,6 @@
description=field.description,
mindate=None,
maxdate=None,
watch=False,
optional=True) -%}
<date-selector
@ -17,7 +16,6 @@
initialmonth="{{ field.data.month }}"
initialday="{{ field.data.day }}"
initialyear="{{ field.data.year }}"
v-bind:watch='{{ watch | string | lower }}'
:optional='{{ optional | string | lower }}'
inline-template>

4
templates/components/pop_date_range.html
View File

@ -1,7 +1,7 @@
{% 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, index=None) %}
{% macro PopDateRange(start_field=None, end_field=None, mindate=mindate, maxdate=maxdate, optional=True, index=None) %}
<pop-date-range
initial-min-start-date="{{ mindate }}"
initial-max-end-date="{{ maxdate }}"
@ -32,7 +32,6 @@
{% else %}
:name-tag="'clins-' + clinIndex + '-start_date'"
{% endif %}
v-bind:watch='{{ watch | string | lower }}'
:optional='{{ optional | string | lower }}'
v-on:date-change='handleDateChange'
inline-template>
@ -127,7 +126,6 @@
{% else %}
:name-tag="'clins-' + clinIndex + '-end_date'"
{% endif %}
v-bind:watch='{{ watch | string | lower }}'
:optional='{{ optional | string | lower }}'
v-on:date-change='handleDateChange'
inline-template>