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

Update page layout

Browse Source
This commit is contained in:
leigh-mil 2019-07-19 11:31:32 -04:00
parent 14673ff541
commit a2decf0509
3 changed files with 68 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
styles/sections/_task_order.scss
View File

@ -53,19 +53,14 @@
margin-top: $gap * 2; margin-top: $gap * 2;
} }
.task-order__details {
max-width: 65%;
}
.totals-box { .totals-box {
padding: $gap * 4; padding: $gap * 4;
padding-top: $gap * 2; padding-top: $gap * 2;
flex-grow: unset; flex-grow: unset;
margin-left: $gap * 6; margin-left: $gap * 6;
margin-top: $gap * 3;
width: 35%;
display: table; display: table;
background-color: $color-gray-lightest; background-color: $color-gray-lightest;
min-width: 350px;
} }
&.task_order__form { &.task_order__form {

2
templates/components/totals_box.html
View File

@ -1,6 +1,6 @@
{% macro TotalsBox(task_order=None, obligated_funds=0, contract_amount=0) -%} {% macro TotalsBox(task_order=None, obligated_funds=0, contract_amount=0) -%}
<div class="col totals-box"> <div class="totals-box">
{% if task_order %} {% if task_order %}
{% set obligated_funds = task_order.total_obligated_funds %} {% set obligated_funds = task_order.total_obligated_funds %}
{% set contract_amount = task_order.total_contract_amount %} {% set contract_amount = task_order.total_contract_amount %}

135
templates/fragments/task_order_review.html
View File

@ -4,82 +4,79 @@
<div class="task-order"> <div class="task-order">
{{ SemiCollapsibleText() }} <div class="form-row">
<div class="form-col">
<hr> <div class="h1">
{{ "task_orders.review.review_your_task_order" | translate }}
<div class="h1">
{{ "task_orders.review.review_your_task_order" | translate }}
</div>
<p>
{{ "task_orders.review.check_paragraph" | translate }}
</p>
<div class="row">
<div class="col task-order__details">
<div class="h4">
{{ "task_orders.review.task_order_number" | translate }}
</div>
<div>{{task_order.number}}</div>
<hr>
<div class="h3">
{{ "task_orders.review.funding_summary" | translate }}
</div> </div>
{% for clin in task_order.clins %} <div class="col task-order__details">
<div> <div class="h4">
{{ "{}".format(clin.jedi_clin_type) | translate}} {{ "task_orders.review.task_order_number" | translate }}
</div> </div>
<table class="fixed-table-wrapper"> <div>{{task_order.number}}</div>
<thead>
<tr>
<th>{{ "task_orders.review.clins.amount" | translate }}</th>
<th>{{ "task_orders.review.clins.obligated" | translate }}</th>
<th>{{ "task_orders.review.clins.pop_start" | translate }}</th>
<th>{{ "task_orders.review.clins.pop_end" | translate }}</th>
<th>{{ "task_orders.review.clins.loa" | translate }}</th>
</tr>
</thead>
<tbody> <hr>
<tr>
<td>{{ clin.obligated_amount | dollars }}</td>
<td>
{% if clin.is_obligated() %}
{{ "common.yes" | translate }}
{% else %}
{{ "common.no" | translate }}
{% endif %}
</td>
<td>{{ clin.start_date | formattedDate }}</td>
<td>{{ clin.end_date | formattedDate }}</td>
<td>
{% for loa in clin.loas %}
<span title='{{ loa }}'>
{{ loa }}
</span>
<br />
{% endfor %}
</td>
</tr>
</tbody>
</table>
{% endfor %}
<hr> <div class="h3">
{{ "task_orders.review.funding_summary" | translate }}
</div>
<div class="h3"> {% for clin in task_order.clins %}
{{ "task_orders.review.supporting_document.title" | translate }} <div>
</div> {{ "{}".format(clin.jedi_clin_type) | translate}}
<div class="h4"> </div>
<a class="icon-link icon-link--download" href="{{ url_for('task_orders.download_task_order_pdf', task_order_id=task_order.id) }}"> <table class="fixed-table-wrapper">
{{ Icon('check-circle-solid') }} <thead>
{{ task_order.pdf.filename }} <tr>
</a> <th>{{ "task_orders.review.clins.amount" | translate }}</th>
<th>{{ "task_orders.review.clins.obligated" | translate }}</th>
<th>{{ "task_orders.review.clins.pop_start" | translate }}</th>
<th>{{ "task_orders.review.clins.pop_end" | translate }}</th>
<th>{{ "task_orders.review.clins.loa" | translate }}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{ clin.obligated_amount | dollars }}</td>
<td>
{% if clin.is_obligated() %}
{{ "common.yes" | translate }}
{% else %}
{{ "common.no" | translate }}
{% endif %}
</td>
<td>{{ clin.start_date | formattedDate }}</td>
<td>{{ clin.end_date | formattedDate }}</td>
<td>
{% for loa in clin.loas %}
<span title='{{ loa }}'>
{{ loa }}
</span>
<br />
{% endfor %}
</td>
</tr>
</tbody>
</table>
{% endfor %}
<hr>
<div class="h3">
{{ "task_orders.review.supporting_document.title" | translate }}
</div>
<div class="h4">
<a class="icon-link icon-link--download" href="{{ url_for('task_orders.download_task_order_pdf', task_order_id=task_order.id) }}">
{{ Icon('check-circle-solid') }}
{{ task_order.pdf.filename }}
</a>
</div>
</div> </div>
</div> </div>
{{ TotalsBox(task_order=task_order) }} <div class="form-col">
{{ TotalsBox(task_order=task_order) }}
</div>
</div> </div>
</div> </div>