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

Merge pull request #170 from dod-ccpo/requests-columns-159274521

Browse Source 
Requests index view 159274521
This commit is contained in:
dandds 2018-08-14 15:28:48 -04:00 committed by GitHub
commit 1d3c74a873
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
atst/routes/requests/index.py
View File

@ -10,6 +10,7 @@ def map_request(request):
time_created = pendulum.instance(request.time_created) time_created = pendulum.instance(request.time_created)
is_new = time_created.add(days=1) > pendulum.now() is_new = time_created.add(days=1) > pendulum.now()
app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0) app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0)
annual_usage = request.body.get("details_of_use", {}).get("dollar_value", 0)
update_url = url_for( update_url = url_for(
"requests.requests_form_update", screen=1, request_id=request.id "requests.requests_form_update", screen=1, request_id=request.id
) )
@ -22,6 +23,7 @@ def map_request(request):
"app_count": app_count, "app_count": app_count,
"date": time_created.format("M/DD/YYYY"), "date": time_created.format("M/DD/YYYY"),
"full_name": request.creator.full_name, "full_name": request.creator.full_name,
"annual_usage": annual_usage,
"edit_link": verify_url if Requests.is_pending_financial_verification( "edit_link": verify_url if Requests.is_pending_financial_verification(
request request
) else update_url, ) else update_url,
@ -47,4 +49,5 @@ def requests_index():
requests=mapped_requests, requests=mapped_requests,
pending_financial_verification=pending_fv, pending_financial_verification=pending_fv,
pending_ccpo_approval=pending_ccpo, pending_ccpo_approval=pending_ccpo,
extended_view=is_ccpo
) )

91
templates/requests.html
View File

@ -48,53 +48,59 @@
{% endif %} {% endif %}
<div class="row kpi"> {% if extended_view %}
<div class="kpi__item col col--grow"> <div class="row kpi">
<div class="kpi__item__value">3</div> <div class="kpi__item col col--grow">
<div class="kpi__item__description">Pending Requests</div> <div class="kpi__item__value">3</div>
<div class="kpi__item__description">Pending Requests</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">2,456</div>
<div class="kpi__item__description">Completed Requests This Year</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">234</div>
<div class="kpi__item__description">Denied Requests</div>
</div>
</div> </div>
<div class="kpi__item col col--grow"> {% endif %}
<div class="kpi__item__value">2,456</div>
<div class="kpi__item__description">Completed Requests This Year</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">234</div>
<div class="kpi__item__description">Denied Requests</div>
</div>
</div>
<div class="col col--grow"> <div class="col col--grow">
<form class='search-bar'> {% if extended_view %}
<div class='usa-input search-input'> <form class='search-bar'>
<label for='requests-search'>Search requests by Order ID</label> <div class='usa-input search-input'>
<input type='search' id='requests-search' name='requests-search' placeholder="Search by Order ID"/> <label for='requests-search'>Search requests by Order ID</label>
<button type="submit"> <input type='search' id='requests-search' name='requests-search' placeholder="Search by Order ID"/>
<span class="hide">Search</span> <button type="submit">
</button> <span class="hide">Search</span>
</div> </button>
</div>
<div class='usa-input'> <div class='usa-input'>
<label for='filter-status'>Filter requests by status</label> <label for='filter-status'>Filter requests by status</label>
<select id="filter-status" name="filter-status"> <select id="filter-status" name="filter-status">
<option value="" selected disabled>Filter by status</option> <option value="" selected disabled>Filter by status</option>
<option value="">Active</option> <option value="">Active</option>
<option value="">Pending</option> <option value="">Pending</option>
<option value="">Denied</option> <option value="">Denied</option>
</select> </select>
</div> </div>
</form> </form>
{% endif %}
<div class='responsive-table-wrapper'> <div class='responsive-table-wrapper'>
<table> <table>
<thead> <thead>
<tr> <tr>
<th scope="col">Order ID</th> <th scope="col">JEDI Cloud Request ID</th>
<th scope="col">Request Date</th> <th scope="col">Date Request Initiated / Created</th>
<th scope="col">Requester</th> {% if extended_view %}
<th scope="col">Total Apps</th> <th scope="col">Requester</th>
<th scope="col">Status</th> <th scope="col">Reason Flagged</th>
<th scope="col" class="table-cell--shrink">Actions</th> {% endif %}
<th scope="col">Projected Annual Usage ($)</th>
<th scope="col">Request Status</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -106,13 +112,12 @@
</th> </th>
{% endif %} {% endif %}
<td>{{ r['date'] }}</td> <td>{{ r['date'] }}</td>
<td>{{ r['full_name'] }}</td> {% if extended_view %}
<td>{{ r['app_count'] }}</td> <td>{{ r['full_name'] }}</td>
<td></td>
{% endif %}
<td>${{ r['annual_usage'] }}</td>
<td>{{ r['status'] }}</td> <td>{{ r['status'] }}</td>
<td class="table-cell--shrink">
<a href="" class='icon-link'>Download</a>
<a href="/request/approval" class='icon-link'>Approval</a>
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>