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

Change TO fragment to a macro to make it reusable in the builder and view page, final tweaks to review and view pages

Browse Source
This commit is contained in:
leigh-mil 2019-12-23 11:44:53 -05:00
parent 2e088d1316
commit e25f519243
9 changed files with 97 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/task_orders/builder_base.html
View File

@ -9,7 +9,7 @@
{{ form.csrf_token }} {{ form.csrf_token }}
{{ StickyCTA( {{ StickyCTA(
text='task_orders.form.sticky_header_text' | translate, text=sticky_cta_text,
context=('task_orders.form.sticky_header_context' | translate({"step": step}) )) }} context=('task_orders.form.sticky_header_context' | translate({"step": step}) )) }}
{% call Modal(name='cancel', dismissable=True) %} {% call Modal(name='cancel', dismissable=True) %}

162
templates/task_orders/fragments/task_order_view.html
View File

@ -2,86 +2,90 @@
{% from "components/semi_collapsible_text.html" import SemiCollapsibleText %} {% from "components/semi_collapsible_text.html" import SemiCollapsibleText %}
{% from "components/tooltip.html" import Tooltip %} {% from "components/tooltip.html" import Tooltip %}
{% macro TaskOrderView(task_order, portfolio, builder_mode=False) %}
{% set obligated_funds = task_order.total_obligated_funds %}
{% set contract_amount = task_order.total_contract_amount %}
{% set expended_funds = task_order.invoiced_funds %}
{% set obligated_funds = task_order.total_obligated_funds %} <div>
{% set contract_amount = task_order.total_contract_amount %} <section class="row">
{% set expended_funds = task_order.invoiced_funds %} <div class='col col--grow reporting-summary-item'>
<h4 class="reporting-summary-item__header">
<div> <span class="reporting-summary-item__header-text">Total obligated funds</span>
<section class="row"> {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="reporting-summary-item__header-icon") }}
<div class='col col--grow reporting-summary-item'> </h4>
<h4 class="reporting-summary-item__header">
<span class="reporting-summary-item__header-text">Total obligated funds</span>
{{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="reporting-summary-item__header-icon") }}
</h4>
<p class="reporting-summary-item__value--large">
{{ obligated_funds | dollars }}
</p>
</div>
<div class='col col--grow reporting-summary-item'>
<h4 class="reporting-summary-item__header">
<span class="reporting-summary-item__header-text">Total Task Order value</span>
{{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="reporting-summary-item__header-icon") }}
</h4>
{% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
{% if earliest_pop_start_date and latest_pop_end_date %}
<p class="reporting-summary-item__value--large"> <p class="reporting-summary-item__value--large">
{{ contract_amount | dollars }} {{ obligated_funds | dollars }}
</p> </p>
{% else %} </div>
<p class="reporting-summary-item__value--large"> - </p> <div class='col col--grow reporting-summary-item'>
{% endif %} <h4 class="reporting-summary-item__header">
</div> <span class="reporting-summary-item__header-text">Total Task Order value</span>
<div class='col col--grow reporting-summary-item'> {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="reporting-summary-item__header-icon") }}
<h4 class="reporting-summary-item__header"> </h4>
<span class="reporting-summary-item__header-text">Total expended funds</span> {% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
{{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="reporting-summary-item__header-icon") }} {% if earliest_pop_start_date and latest_pop_end_date %}
</h4> <p class="reporting-summary-item__value--large">
<p class="reporting-summary-item__value--large"> {{ contract_amount | dollars }}
{{ expended_funds | dollars }} </p>
</p> {% else %}
</div> <p class="reporting-summary-item__value--large"> - </p>
</section> {% endif %}
<hr> </div>
<section> <div class='col col--grow reporting-summary-item'>
<h4>Documents</h4> <h4 class="reporting-summary-item__header">
<div class="panel panel__content"> <span class="reporting-summary-item__header-text">Total expended funds</span>
<a href="{{ pdf_download_url }}"> {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="reporting-summary-item__header-icon") }}
{{ task_order.pdf.filename }} </h4>
{{ Icon('link', classes="icon--primary icon--medium") }} <p class="reporting-summary-item__value--large">
</a> {{ expended_funds | dollars }}
</div> </p>
</section> </div>
<hr> </section>
<section> <hr>
<h4>CLIN summary</h4> <section>
<table class="fixed-table-wrapper atat-table"> <h4>Documents</h4>
<thead> <div class="panel panel__content">
<tr> {% if builder_mode %}
<th>{{ "task_orders.review.clins.number" | translate }}</th> {{ Icon('ok', classes="icon--green icon--medium") }}
<th>{{ "task_orders.review.clins.type" | translate }}</th> {% endif %}
<th>{{ "task_orders.review.clins.idiq_clin_description" | translate }}</th> <a href="{{ pdf_download_url }}">
<th>{{ "task_orders.review.clins.pop" | translate }}</th> {{ task_order.pdf.filename }}
<th class="task-order__amount">{{ "task_orders.review.clins.total_amount" | translate }}</th> {{ Icon('link', classes="icon--primary icon--medium") }}
<th class="task-order__amount">{{ "task_orders.review.clins.obligated" | translate }}</th> </a>
</tr> </div>
</thead> </section>
<hr>
<section>
<h4>CLIN summary</h4>
<table class="fixed-table-wrapper atat-table">
<thead>
<tr>
<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.total_amount" | translate }}</th>
<th class="task-order__amount">{{ "task_orders.review.clins.obligated" | translate }}</th>
</tr>
</thead>
<tbody> <tbody>
{% for clin in task_order.sorted_clins %} {% for clin in task_order.sorted_clins %}
<tr> <tr>
<td>{{ clin.number }}</td> <td>{{ clin.number }}</td>
<td>{{ clin.type }}</td> <td>{{ clin.type }}</td>
<td>{{ "{}".format(clin.jedi_clin_type) | translate}}</td> <td>{{ "{}".format(clin.jedi_clin_type) | translate}}</td>
<td> <td>
{{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }} {{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }}
</td> </td>
{# TODO: Swap in total CLIN amount #} {# TODO: Swap in total CLIN amount #}
<td class="task-order__amount">{{ clin.total_amount | dollars }}</td> <td class="task-order__amount">{{ clin.total_amount | dollars }}</td>
<td class="task-order__amount">{{ clin.obligated_amount | dollars }}</td> <td class="task-order__amount">{{ clin.obligated_amount | dollars }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</section> </section>
</div> </div>
{% endmacro %}

1
templates/task_orders/step_1.html
View File

@ -12,6 +12,7 @@
{% set next_button_text = "Next: Add TO Number" %} {% set next_button_text = "Next: Add TO Number" %}
{% set step = "1" %} {% set step = "1" %}
{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader( {{ TOFormStepHeader(

1
templates/task_orders/step_2.html
View File

@ -7,6 +7,7 @@
{% set next_button_text = "Next: Add Base CLIN" %} {% set next_button_text = "Next: Add Base CLIN" %}
{% set previous_button_link = url_for("task_orders.form_step_one_add_pdf", task_order_id=task_order_id) %} {% set previous_button_link = url_for("task_orders.form_step_one_add_pdf", task_order_id=task_order_id) %}
{% set step = "2" %} {% set step = "2" %}
{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader( {{ TOFormStepHeader(

1
templates/task_orders/step_3.html
View File

@ -8,6 +8,7 @@
{% set next_button_text = "task_orders.form.step_3.next_button" | translate %} {% set next_button_text = "task_orders.form.step_3.next_button" | translate %}
{% set previous_button_link = url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id) %} {% set previous_button_link = url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id) %}
{% set step = "3" %} {% set step = "3" %}
{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
{% block to_builder_form_field %} {% block to_builder_form_field %}

7
templates/task_orders/step_4.html
View File

@ -1,17 +1,20 @@
{% extends "task_orders/builder_base.html" %} {% extends "task_orders/builder_base.html" %}
{% from "task_orders/fragments/task_order_view.html" import TaskOrderView %}
{% set action = url_for('task_orders.form_step_five_confirm_signature', task_order_id=task_order_id) %} {% set action = url_for('task_orders.form_step_five_confirm_signature', task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.form_step_three_add_clins", task_order_id=task_order_id) %} {% set previous_button_link = url_for("task_orders.form_step_three_add_clins", task_order_id=task_order_id) %}
{% set step = "4" %} {% set step = "4" %}
{% set sticky_cta_text = 'task_orders.form.sticky_header_review_text' | translate %}
{% block next_button %} {% block next_button %}
<a <a
href="{{ action }}" href="{{ action }}"
class="usa-button usa-button-primary"> class="usa-button usa-button-primary">
Next: Submit Task Order Next: Confirm
</a> </a>
{% endblock %} {% endblock %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{% include "task_orders/fragments/task_order_view.html" %} {{ TaskOrderView(task_order, portfolio, builder_mode=True) }}
{% endblock %} {% endblock %}

1
templates/task_orders/step_5.html
View File

@ -8,6 +8,7 @@
{% set next_button_text = 'task_orders.form.step_5.next_button' | translate %} {% set next_button_text = 'task_orders.form.step_5.next_button' | translate %}
{% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %} {% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %}
{% set step = "5" %} {% set step = "5" %}
{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %}
{% block to_builder_form_field %} {% block to_builder_form_field %}
{{ TOFormStepHeader( {{ TOFormStepHeader(

3
templates/task_orders/view.html
View File

@ -1,4 +1,5 @@
{% from "components/sticky_cta.html" import StickyCTA %} {% from "components/sticky_cta.html" import StickyCTA %}
{% from "task_orders/fragments/task_order_view.html" import TaskOrderView %}
{% extends 'portfolios/base.html' %} {% extends 'portfolios/base.html' %}
@ -11,6 +12,6 @@
{% endcall %} {% endcall %}
<div class="task-order"> <div class="task-order">
{% include "task_orders/fragments/task_order_view.html" %} {{ TaskOrderView(task_order, portfolio) }}
</div> </div>
{% endblock %} {% endblock %}

3
translations.yaml
View File

@ -531,7 +531,8 @@ task_orders:
description: Prior to submitting the Task Order, you must acknowledge, by marking the appropriate box below, that the uploaded Task Order is signed by an appropriate, duly warranted Contracting Officer who has the authority to execute the uploaded Task Order on your Agency’s behalf and has authorized you to upload the Task Order in accordance with Agency policy and procedures. You must further acknowledge, by marking the appropriate box below, that all information entered herein matches that of the submitted Task Order. description: Prior to submitting the Task Order, you must acknowledge, by marking the appropriate box below, that the uploaded Task Order is signed by an appropriate, duly warranted Contracting Officer who has the authority to execute the uploaded Task Order on your Agency’s behalf and has authorized you to upload the Task Order in accordance with Agency policy and procedures. You must further acknowledge, by marking the appropriate box below, that all information entered herein matches that of the submitted Task Order.
alert_message: All task orders require a Contracting Officer signature. alert_message: All task orders require a Contracting Officer signature.
next_button: 'Confirm & Submit' next_button: 'Confirm & Submit'
sticky_header_text: 'Add Task Order' sticky_header_text: 'Add a Task Order'
sticky_header_review_text: Review Changes
sticky_header_context: 'Step {step} of 5' sticky_header_context: 'Step {step} of 5'
empty_state: empty_state:
header: Add approved task orders header: Add approved task orders