Remove watch from date selector component
This commit is contained in:
parent
2f3863b84d
commit
0c54b61579
@ -20,10 +20,6 @@ export default {
|
|||||||
mindate: { type: String },
|
mindate: { type: String },
|
||||||
maxdate: { type: String },
|
maxdate: { type: String },
|
||||||
nameTag: { type: String },
|
nameTag: { type: String },
|
||||||
watch: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
optional: {
|
optional: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
@ -201,7 +197,6 @@ export default {
|
|||||||
emitEvent('field-change', this, {
|
emitEvent('field-change', this, {
|
||||||
value: this.formattedDate,
|
value: this.formattedDate,
|
||||||
name: this.name,
|
name: this.name,
|
||||||
watch: this.watch,
|
|
||||||
valid: this.isDateValid,
|
valid: this.isDateValid,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -311,8 +311,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<pop-date-range
|
<pop-date-range
|
||||||
initial-min-start-date="2019-09-14"
|
initial-min-start-date="2019-09-14"
|
||||||
@ -340,7 +338,6 @@
|
|||||||
initialday=""
|
initialday=""
|
||||||
initialyear=""
|
initialyear=""
|
||||||
|
|
||||||
v-bind:watch='true'
|
|
||||||
:optional='false'
|
:optional='false'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
@ -401,8 +398,8 @@
|
|||||||
maxlength="4"
|
maxlength="4"
|
||||||
type="number"
|
type="number"
|
||||||
v-model="year"
|
v-model="year"
|
||||||
max=""
|
max="2022"
|
||||||
min=""
|
min="2019"
|
||||||
v-on:change="onInput"
|
v-on:change="onInput"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@ -440,7 +437,6 @@
|
|||||||
initialday=""
|
initialday=""
|
||||||
initialyear=""
|
initialyear=""
|
||||||
|
|
||||||
v-bind:watch='true'
|
|
||||||
:optional='false'
|
:optional='false'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
initialday=""
|
initialday=""
|
||||||
initialyear=""
|
initialyear=""
|
||||||
|
|
||||||
v-bind:watch='false'
|
|
||||||
:optional='true'
|
:optional='true'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
@ -86,8 +85,8 @@
|
|||||||
maxlength="4"
|
maxlength="4"
|
||||||
type="number"
|
type="number"
|
||||||
v-model="year"
|
v-model="year"
|
||||||
max=""
|
max="2022"
|
||||||
min=""
|
min="2019"
|
||||||
v-on:change="onInput"
|
v-on:change="onInput"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@ -125,7 +124,6 @@
|
|||||||
initialday=""
|
initialday=""
|
||||||
initialyear=""
|
initialyear=""
|
||||||
|
|
||||||
v-bind:watch='false'
|
|
||||||
:optional='true'
|
:optional='true'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
|
@ -203,7 +203,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-col">
|
<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 && isDateComplete, 'usa-input--error': !isDateValid && isDateComplete }">
|
<fieldset :name="name" class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid && isDateComplete, 'usa-input--error': !isDateValid && isDateComplete }">
|
||||||
<legend>
|
<legend>
|
||||||
<div class="usa-input__title">
|
<div class="usa-input__title">
|
||||||
@ -231,7 +231,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="usa-form-group usa-form-group-year">
|
<div class="usa-form-group usa-form-group-year">
|
||||||
<label>Year</label>
|
<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>
|
||||||
<div v-if="isDateComplete">
|
<div v-if="isDateComplete">
|
||||||
<div class="usa-form-group-date-ok" v-if="isDateValid">
|
<div class="usa-form-group-date-ok" v-if="isDateValid">
|
||||||
@ -251,7 +251,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="form-col">
|
<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 && isDateComplete, 'usa-input--error': !isDateValid && isDateComplete }">
|
<fieldset :name="name" class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid && isDateComplete, 'usa-input--error': !isDateValid && isDateComplete }">
|
||||||
<legend>
|
<legend>
|
||||||
<div class="usa-input__title">
|
<div class="usa-input__title">
|
||||||
|
@ -129,9 +129,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if fields %}
|
{% 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 %}
|
{% else %}
|
||||||
{{ PopDateRange(watch=True, optional=False, mindate=contract_start, maxdate=contract_end) }}
|
{{ PopDateRange(optional=False, mindate=contract_start, maxdate=contract_end) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
description=field.description,
|
description=field.description,
|
||||||
mindate=None,
|
mindate=None,
|
||||||
maxdate=None,
|
maxdate=None,
|
||||||
watch=False,
|
|
||||||
optional=True) -%}
|
optional=True) -%}
|
||||||
|
|
||||||
<date-selector
|
<date-selector
|
||||||
@ -17,7 +16,6 @@
|
|||||||
initialmonth="{{ field.data.month }}"
|
initialmonth="{{ field.data.month }}"
|
||||||
initialday="{{ field.data.day }}"
|
initialday="{{ field.data.day }}"
|
||||||
initialyear="{{ field.data.year }}"
|
initialyear="{{ field.data.year }}"
|
||||||
v-bind:watch='{{ watch | string | lower }}'
|
|
||||||
:optional='{{ optional | string | lower }}'
|
:optional='{{ optional | string | lower }}'
|
||||||
inline-template>
|
inline-template>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% from 'components/alert.html' import Alert %}
|
{% from 'components/alert.html' import Alert %}
|
||||||
{% from 'components/icon.html' import Icon %}
|
{% 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
|
<pop-date-range
|
||||||
initial-min-start-date="{{ mindate }}"
|
initial-min-start-date="{{ mindate }}"
|
||||||
initial-max-end-date="{{ maxdate }}"
|
initial-max-end-date="{{ maxdate }}"
|
||||||
@ -32,7 +32,6 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
:name-tag="'clins-' + clinIndex + '-start_date'"
|
:name-tag="'clins-' + clinIndex + '-start_date'"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
v-bind:watch='{{ watch | string | lower }}'
|
|
||||||
:optional='{{ optional | string | lower }}'
|
:optional='{{ optional | string | lower }}'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
@ -127,7 +126,6 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
:name-tag="'clins-' + clinIndex + '-end_date'"
|
:name-tag="'clins-' + clinIndex + '-end_date'"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
v-bind:watch='{{ watch | string | lower }}'
|
|
||||||
:optional='{{ optional | string | lower }}'
|
:optional='{{ optional | string | lower }}'
|
||||||
v-on:date-change='handleDateChange'
|
v-on:date-change='handleDateChange'
|
||||||
inline-template>
|
inline-template>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user