Reorganize task order review template
- update copy in translations - Move TO totals out of sidebar - Group CLINs into 1 table with altered columns, instead of a separate table for each - edit CSS on CLIN table
This commit is contained in:
parent
003b562a93
commit
e2bd6bd823
@ -35,6 +35,10 @@ class CLIN(Base, mixins.TimestampsMixin):
|
||||
JEDICLINType.JEDI_CLIN_3,
|
||||
]
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
return "Base" if self.number[0] == "0" else "Option"
|
||||
|
||||
@property
|
||||
def is_completed(self):
|
||||
return all(
|
||||
|
@ -24,29 +24,21 @@
|
||||
margin-top: $gap * 4;
|
||||
width: 900px;
|
||||
|
||||
&__amount {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
hr {
|
||||
border: 0;
|
||||
border-bottom: 1px solid $color-gray-lighter;
|
||||
margin-top: $gap * 4;
|
||||
margin-bottom: $gap * 4;
|
||||
}
|
||||
|
||||
table {
|
||||
margin-top: 1rem;
|
||||
table-layout: fixed;
|
||||
|
||||
th {
|
||||
white-space: nowrap;
|
||||
word-wrap: normal;
|
||||
padding: 0.8rem;
|
||||
|
||||
&.task-order__clin-amount {
|
||||
width: 25%;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
padding: 0.8rem;
|
||||
}
|
||||
}
|
||||
|
||||
@ -73,12 +65,8 @@
|
||||
}
|
||||
|
||||
.totals-box {
|
||||
padding: $gap * 4;
|
||||
padding-top: $gap * 2;
|
||||
flex-grow: unset;
|
||||
margin-left: $gap * 6;
|
||||
display: table;
|
||||
background-color: $color-gray-lightest;
|
||||
min-width: 350px;
|
||||
}
|
||||
}
|
||||
|
@ -9,9 +9,9 @@
|
||||
<div class="h4">{{ 'components.totals_box.obligated_funds' | translate }}</div>
|
||||
<div class="h3">{{ obligated_funds | dollars }}</div>
|
||||
<p>{{ 'components.totals_box.obligated_text' | translate }}</p>
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
<hr>
|
||||
|
||||
<div class="h4">{{ 'components.totals_box.total_amount' | translate }}</div>
|
||||
<div class="h3">{{ contract_amount | dollars }}</div>
|
||||
<p>{{ 'components.totals_box.total_text' | translate }}</p>
|
||||
|
@ -7,7 +7,10 @@
|
||||
<div class="form-row">
|
||||
<div class="form-col">
|
||||
<div class="h2">
|
||||
{{ "task_orders.review.review_your_task_order" | translate }}
|
||||
{{ "task_orders.review.review_your_funding" | translate }}
|
||||
</div>
|
||||
<div>
|
||||
{{ TotalsBox(task_order=task_order) }}
|
||||
</div>
|
||||
|
||||
<div class="h3">
|
||||
@ -32,40 +35,36 @@
|
||||
{{ "task_orders.review.funding_summary" | translate }}
|
||||
</div>
|
||||
|
||||
{% for clin in task_order.clins %}
|
||||
<div>
|
||||
{{ "{}".format(clin.jedi_clin_type) | translate}}
|
||||
</div>
|
||||
|
||||
<table class="fixed-table-wrapper">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="task-order__clin-amount">{{ "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.number" | translate }}</th>
|
||||
<th>{{ "task_orders.review.clins.type" | translate }}</th>
|
||||
<th>{{ "task_orders.review.clins.idiq_clin_description" | translate }}</th>
|
||||
<th>{{ "task_orders.review.clins.pop" | translate }}</th>
|
||||
<th class="task-order__amount">{{ "task_orders.review.clins.amount" | translate }}</th>
|
||||
<th class="task-order__amount">{{ "task_orders.review.clins.obligated" | translate }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{% for clin in task_order.clins %}
|
||||
<tr>
|
||||
<td>{{ clin.obligated_amount | dollars }}</td>
|
||||
<td>{{ clin.number }}</td>
|
||||
<td>{{ clin.type }}</td>
|
||||
<td>{{ "{}".format(clin.jedi_clin_type) | translate}}</td>
|
||||
<td>
|
||||
{% if clin.is_obligated() %}
|
||||
{{ "common.yes" | translate }}
|
||||
{% else %}
|
||||
{{ "common.no" | translate }}
|
||||
{% endif %}
|
||||
{{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }}
|
||||
</td>
|
||||
<td>{{ clin.start_date | formattedDate }}</td>
|
||||
<td>{{ clin.end_date | formattedDate }}</td>
|
||||
{# TODO: Swap in total CLIN amount #}
|
||||
<td class="task-order__amount">$123,456,789.00</td>
|
||||
<td class="task-order__amount">{{ clin.obligated_amount | dollars }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-col">
|
||||
{{ TotalsBox(task_order=task_order) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -73,10 +73,10 @@ components:
|
||||
destructive_message: You will no longer be able to access this {resource}
|
||||
destructive_title: Warning! This action is permanent
|
||||
totals_box:
|
||||
obligated_funds: Funds obligated for cloud
|
||||
obligated_text: This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.
|
||||
total_amount: Total contract amount
|
||||
total_text: This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.
|
||||
obligated_funds: Total Obligated Funds
|
||||
obligated_text: This amount strictly calculates Base CLINs, and may represent 100% of your total task order budget, or just a portion if you also have Optional Base or Optional CLINs.
|
||||
total_amount: Total Possible Task Order Funds
|
||||
total_text: This amount represents the total value of all Base and Option CLINs, including any extensions listed within your task order.
|
||||
usa_header:
|
||||
flag_image_alt: U.S. Flag
|
||||
official_message: An official website of the United States government
|
||||
@ -350,17 +350,19 @@ portfolios:
|
||||
task_orders:
|
||||
review:
|
||||
pdf_title: Approved Task Order
|
||||
review_your_task_order: Review your task order
|
||||
funding_summary: Task Order Summary
|
||||
review_your_funding: Review your funding
|
||||
funding_summary: CLIN Summary
|
||||
task_order_number: Task Order Number
|
||||
check_paragraph: Check to make sure the information you entered is correct. After submission, you will confirm this task order was signed by a contracting officer. Thereafter, you will be informed as soon as CCPO completes their review.
|
||||
supporting_document:
|
||||
title: Supporting document
|
||||
clins:
|
||||
amount: Amount
|
||||
obligated: Obligated
|
||||
pop_start: PoP Start
|
||||
pop_end: PoP End
|
||||
number: TO CLIN
|
||||
type: CLIN Type
|
||||
idiq_clin_description: Description (IDIQ CLIN)
|
||||
pop: PoP
|
||||
amount: CLIN Value
|
||||
obligated: Amount Obligated
|
||||
form:
|
||||
add_clin: Enter another CLIN
|
||||
add_to_header: Add your task order
|
||||
@ -386,7 +388,7 @@ task_orders:
|
||||
description: Finally, plase confirm that your uploaded document representing the information you've entered contains the required signature from your Contracting Officer. You will be informed as soon as CCPO completes their review.
|
||||
alert_message: All task orders require a Contracting Officer signature.
|
||||
next_button: 'Confirm & Submit'
|
||||
sticky_header_text: 'Add Funding ({step} of 5)'
|
||||
sticky_header_text: 'Add Task Order (step {step} of 5)'
|
||||
new:
|
||||
form_help_text: Before you can begin work in the cloud, you'll need to complete the information below and upload your approved task order for reference by the CCPO.
|
||||
app_info:
|
||||
@ -396,10 +398,10 @@ task_orders:
|
||||
sign:
|
||||
digital_signature_description: I acknowledge that the uploaded task order contains the required KO signature.
|
||||
JEDICLINType:
|
||||
JEDI_CLIN_1: 'Base CLIN 0001: Unclassified IaaS and PaaS'
|
||||
JEDI_CLIN_2: 'CLIN 2: Classified Cloud Services - 0002'
|
||||
JEDI_CLIN_3: 'CLIN 3:'
|
||||
JEDI_CLIN_4: 'CLIN 4:'
|
||||
JEDI_CLIN_1: 'Unclassified IaaS and PaaS (IDIQ CLIN 0001)'
|
||||
JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)'
|
||||
JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)'
|
||||
JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)'
|
||||
testing:
|
||||
example_string: Hello World
|
||||
example_with_variables: 'Hello, {name}!'
|
||||
|
Loading…
x
Reference in New Issue
Block a user