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

Merge pull request #265 from dod-ccpo/all-requests-#158494566

Browse Source 
Update CCPO requests list #158494566
This commit is contained in:
dandds
2018-09-11 08:50:32 -04:00
committed by GitHub
parent 58af47d856 1f64344ca3
commit 5a7ca5e887
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/requests/index.html
View File

@@ -61,7 +61,7 @@
<div class="row kpi">
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_inprogress }}</div>
<div class="kpi__item__description">In Progress</div>
<div class="kpi__item__description">Requests in progress</div>
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_pending }}</div>
@@ -69,7 +69,7 @@
</div>
<div class="kpi__item col col--grow">
<div class="kpi__item__value">{{ kpi_completed }}</div>
<div class="kpi__item__description">Completed (Overall)</div>
<div class="kpi__item__description">Approved Requests</div>
</div>
</div>
{% endif %}
@@ -105,26 +105,29 @@
<th scope="col">JEDI Cloud Request ID</th>
<th scope="col">Date Request Submitted</th>
{% if extended_view %}
<th scope="col">Date Request Last Edited</th>
<th scope="col">Requester</th>
<th scope="col">Reason Flagged</th>
{% endif %}
<th scope="col">Projected Annual Usage ($)</th>
<th scope="col">Request Status</th>
{% if extended_view %}
<th scope="col">DOD Component</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for r in requests %}
<tr>
<th scope="row">
<a class='icon-link icon-link--large' href="{{ r['edit_link'] }}">{{ r['order_id'] }}</a>
<a class='icon-link icon-link--large' href="{{ r.edit_link }}">{{ r.order_id }}</a>
{% if r.action_required %}<span class="label label--info">Action Required</span>{% endif %}
</th>
<td>{{ r.last_submission_timestamp }}</td>
<td>{{ r.last_submission_timestamp | formattedDate }}</td>
{% if extended_view %}
<td>{{ r['full_name'] }}</td>
<td></td>
<td>{{ r.last_edited_timestamp | formattedDate }}</td>
<td>{{ r.full_name }}</td>
{% endif %}
<td>{{ r['annual_usage'] | dollars }}</td>
<td>{{ r.annual_usage | dollars }}</td>
<td>
{% if r.status == 'Approved' %}
<a href="{{ url_for('workspaces.workspace_projects', workspace_id=r.workspace_id) }}">
@@ -134,6 +137,9 @@
{{ r.status }}
{% endif %}
</td>
{% if extended_view %}
<td>{{ r.dod_component }}</td>
{% endif %}
</tr>
{% endfor %}
</tbody>