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

Template fixes

Browse Source
This commit is contained in:
richard-dds 2018-11-01 10:36:16 -04:00
parent bb903ece9f
commit 05b09e7961
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/components/forms/requests_list.js
View File

@ -1,4 +1,3 @@
import Modal from '../../mixins/modal'
import LocalDatetime from '../../components/local_datetime' import LocalDatetime from '../../components/local_datetime'
import { formatDollars } from '../../lib/dollars' import { formatDollars } from '../../lib/dollars'
import { parse } from 'date-fns' import { parse } from 'date-fns'
@ -7,11 +6,8 @@ import { compose, partial, indexBy, prop, sortBy, reverse, pipe } from 'ramda'
export default { export default {
name: 'requests-list', name: 'requests-list',
mixins: [Modal],
components: { components: {
Modal, LocalDatetime,
LocalDatetime
}, },
props: { props: {
@ -88,9 +84,6 @@ export default {
} }
}, },
mounted: function () {
},
computed: { computed: {
filteredRequests: function () { filteredRequests: function () {
return pipe( return pipe(

9
templates/requests/index.html
View File

@ -6,8 +6,6 @@
{% from "components/icon.html" import Icon %} {% from "components/icon.html" import Icon %}
{% block content %} {% block content %}
<requests-list inline-template v-bind:requests='{{ requests | tojson }}' v-bind:is-extended='{{ extended_view | tojson }}' v-bind:statuses='{{ possible_statuses | tojson }}'>
<div>
{% call Modal(name='pendingFinancialVerification', dismissable=True) %} {% call Modal(name='pendingFinancialVerification', dismissable=True) %}
<h1>Request submitted!</h1> <h1>Request submitted!</h1>
@ -39,6 +37,9 @@
</div> </div>
{% endcall %} {% endcall %}
<requests-list inline-template v-bind:requests='{{ requests | tojson }}' v-bind:is-extended='{{ extended_view | tojson }}' v-bind:statuses='{{ possible_statuses | tojson }}'>
<div>
{% if num_action_required %} {% if num_action_required %}
{% set title -%} {% set title -%}
Action required on {{ num_action_required }} requests. Action required on {{ num_action_required }} requests.
@ -82,7 +83,7 @@
<div class='usa-input search-input'> <div class='usa-input search-input'>
<label for='requests-search'>Search requests by name</label> <label for='requests-search'>Search requests by name</label>
<input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by name"/> <input v-model='searchValue' type='search' id='requests-search' name='requests-search' placeholder="Search by name"/>
<button type="submit"> <button>
<span class="hide">Search</span> <span class="hide">Search</span>
</button> </button>
</div> </div>
@ -104,7 +105,7 @@
<tr> <tr>
<th @click.prevent="updateSortValue(column.attr)" v-for="column in getColumns()"scope="col"> <th @click.prevent="updateSortValue(column.attr)" v-for="column in getColumns()"scope="col">
!{ column.displayName } !{ column.displayName }
<span v-if="column.attr === sort.columnName && sort.isAscending" class="icon icon--caret_up" aria-idden="true"> <span v-if="column.attr === sort.columnName && sort.isAscending">
{{ Icon("caret_down") }} {{ Icon("caret_down") }}
</span> </span>
<span v-else-if="column.attr === sort.columnName && !sort.isAscending"> <span v-else-if="column.attr === sort.columnName && !sort.isAscending">