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

Move CLIN type and CLIN number onto same line

Browse Source
This commit is contained in:
leigh-mil 2019-06-11 11:24:38 -04:00
parent 4b0a4628aa
commit 61de7a5adf
3 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
styles/elements/_inputs.scss
View File

@ -157,7 +157,7 @@
.usa-input__choices { .usa-input__choices {
// checkbox & radio sets // checkbox & radio sets
legend { legend {
padding: 0 0 $gap 0; padding: 0 0 ($gap / 2) 0;
@include h4; @include h4;

10
styles/sections/_task_order.scss
View File

@ -131,6 +131,16 @@
} }
} }
.row.row__form-fields {
.col {
margin-left: $gap;
}
.col:first-child {
margin-left: 0;
}
}
.panel { .panel {
@include shadow-panel; @include shadow-panel;
} }

109
templates/task_orders/edit.html
View File

@ -61,8 +61,14 @@
v-bind:initial-loa-count="{{ fields.loas.data | length }}" v-bind:initial-loa-count="{{ fields.loas.data | length }}"
inline-template> inline-template>
<div> <div>
{{ OptionsInput(fields.jedi_clin_type) }} <div class="row row__form-fields">
{{ TextInput(fields.number) }} <div class="col">
{{ OptionsInput(fields.jedi_clin_type) }}
</div>
<div class="col">
{{ TextInput(fields.number) }}
</div>
</div>
<div>Line of accounting (43 characters)</div> <div>Line of accounting (43 characters)</div>
{% for loa in fields.loas %} {% for loa in fields.loas %}
@ -125,54 +131,59 @@
<hr v-if="clinIndex !== 0"> <hr v-if="clinIndex !== 0">
<clin-fields v-bind:initial-clin-index='clinIndex' inline-template> <clin-fields v-bind:initial-clin-index='clinIndex' inline-template>
<div> <div>
<div class="usa-input"> <div class="row row__form-fields">
<fieldset data-ally-disabled="true" class="usa-input__choices"> <div class="col">
<legend> <div class="usa-input">
<div class="usa-input__title"> <fieldset data-ally-disabled="true" class="usa-input__choices">
CLIN type <legend>
</div> <div class="usa-input__title">
</legend> CLIN type
<select :id="'clins-' + clinIndex + '-jedi_clin_type'" :name="'clins-' + clinIndex + '-jedi_clin_type'"> </div>
<option value="JEDI_CLIN_1">{{ "forms.task_order.clin_01_label" | translate }}</option> </legend>
<option value="JEDI_CLIN_2">{{ "forms.task_order.clin_02_label" | translate }}</option> <select :id="'clins-' + clinIndex + '-jedi_clin_type'" :name="'clins-' + clinIndex + '-jedi_clin_type'">
<option value="JEDI_CLIN_3">{{ "forms.task_order.clin_03_label" | translate }}</option> <option value="JEDI_CLIN_1">{{ "forms.task_order.clin_01_label" | translate }}</option>
<option value="JEDI_CLIN_4">{{ "forms.task_order.clin_04_label" | translate }}</option> <option value="JEDI_CLIN_2">{{ "forms.task_order.clin_02_label" | translate }}</option>
</select> <option value="JEDI_CLIN_3">{{ "forms.task_order.clin_03_label" | translate }}</option>
</fieldset> <option value="JEDI_CLIN_4">{{ "forms.task_order.clin_04_label" | translate }}</option>
</div> </select>
</fieldset>
<textinput :name="'clins-' + clinIndex + '-number'" inline-template> </div>
<div>
<label :for="name">
<span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
<span v-show='showValid'>{{ Icon('ok',classes="icon-validation") }}</span>
<div class="usa-input__title">CLIN</div>
</label>
<masked-input
v-on:input='onInput'
v-on:blur='onBlur'
v-on:change='onChange'
v-bind:value='value'
v-bind:mask='mask'
v-bind:pipe='pipe'
v-bind:keep-char-positions='keepCharPositions'
v-bind:aria-invalid='showError'
type='text'
:id='name'
ref='input'>
</masked-input>
<input type='hidden' v-bind:value='rawValue' :name='name' />
<template v-if='showError'>
<span class='usa-input__message' v-html='validationError'></span>
</template>
<template v-else>
<span class='usa-input__message'></span>
</template>
</div> </div>
</textinput> <div class="col">
<textinput :name="'clins-' + clinIndex + '-number'" inline-template>
<div class="usa-input">
<label :for="name">
<span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>
<span v-show='showValid'>{{ Icon('ok',classes="icon-validation") }}</span>
<div class="usa-input__title">CLIN</div>
</label>
<masked-input
v-on:input='onInput'
v-on:blur='onBlur'
v-on:change='onChange'
v-bind:value='value'
v-bind:mask='mask'
v-bind:pipe='pipe'
v-bind:keep-char-positions='keepCharPositions'
v-bind:aria-invalid='showError'
type='text'
:id='name'
ref='input'>
</masked-input>
<input type='hidden' v-bind:value='rawValue' :name='name' />
<template v-if='showError'>
<span class='usa-input__message' v-html='validationError'></span>
</template>
<template v-else>
<span class='usa-input__message'></span>
</template>
</div>
</textinput>
</div>
</div>
<div>Line of accounting (43 characters)</div> <div>Line of accounting (43 characters)</div>
{{ LOAInput() }} {{ LOAInput() }}