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

use getOptionLabel filter for DOD component fields

Browse Source
This commit is contained in:
Andrew Croce 2018-08-20 13:38:04 -04:00
parent 55bf70ddf7
commit c9bc36bef3
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
templates/requests/screen-4.html
View File

@ -8,16 +8,6 @@
{% from "components/text_input.html" import TextInput %} {% from "components/text_input.html" import TextInput %}
{% from "components/icon.html" import Icon %} {% from "components/icon.html" import Icon %}
{% set dod_component_choices = {
"null": "Select an option",
"us_air_force": "US Air Force",
"us_army": "US Army",
"us_navy": "US Navy",
"us_marine_corps": "US Marine Corps",
"joint_chiefs_of_staff": "Joint Chiefs of Staff"
} %}
{% set organization_providing_assistance_choices = { {% set organization_providing_assistance_choices = {
"in_house_staff": "In-house staff", "in_house_staff": "In-house staff",
"contractor": "Contractor", "contractor": "Contractor",
@ -59,7 +49,7 @@
<dt>DoD Component</dt> <dt>DoD Component</dt>
<dd> <dd>
{% if data['details_of_use']['dod_component'] %} {% if data['details_of_use']['dod_component'] %}
{{ dod_component_choices[data['details_of_use']['dod_component']] }} {{ data['details_of_use']['dod_component'] | getOptionLabel(service_branches) }}
{% else %} {% else %}
{{ RequiredLabel() }} {{ RequiredLabel() }}
{% endif %} {% endif %}
@ -195,7 +185,7 @@
</dd> </dd>
</div> </div>
{% endif %} {% endif %}
<div> <div>
<dt>Total Spend</dt> <dt>Total Spend</dt>
<dd> <dd>
@ -251,7 +241,13 @@
<div> <div>
<dt>Service Branch or Agency</dt> <dt>Service Branch or Agency</dt>
<dd>{{ data['information_about_you']['service_branch'] or RequiredLabel() }}</dd> <dd>
{% if data['information_about_you']['service_branch'] %}
{{ data['information_about_you']['service_branch'] | getOptionLabel(service_branches) }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
</dd>
</div> </div>
<div> <div>