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

Merge pull request #1301 from dod-ccpo/to-builder-summary-items

Browse Source 
TO Builder Step 4 bugfixes
This commit is contained in:
leigh-mil 2020-01-09 13:55:29 -05:00 committed by GitHub
commit 7f13643ff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
atst/models/task_order.py
View File

@ -140,7 +140,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):
@property
def invoiced_funds(self):
# TODO: implement this using reporting data from the CSP
return self.total_obligated_funds * Decimal(0.75)
if self.is_active:
return self.total_obligated_funds * Decimal(0.75)
else:
return 0
@property
def display_status(self):

10
templates/task_orders/form_header.html
View File

@ -1,4 +1,4 @@
{% macro TOFormStepHeader(description, title=None, to_number=None) %}
{% macro TOFormStepHeader(description=None, title=None, to_number=None) %}
<div class="task-order__header">
{% if title -%}
<div class="h2">
@ -10,8 +10,10 @@
<strong>Task Order Number:</strong> {{ to_number }}
</p>
{% endif %}
<p>
{{ description }}
</p>
{% if description %}
<p>
{{ description }}
</p>
{% endif %}
</div>
{% endmacro %}

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

@ -23,14 +23,9 @@
<span class="summary-item__header-text">Total Task Order value</span>
{{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="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="summary-item__value--large">
{{ contract_amount | dollars }}
</p>
{% else %}
<p class="summary-item__value--large"> - </p>
{% endif %}
<p class="summary-item__value--large">
{{ contract_amount | dollars }}
</p>
</div>
<div class='col col--grow summary-item'>
<h4 class="summary-item__header">

2
templates/task_orders/step_4.html
View File

@ -1,6 +1,7 @@
{% extends "task_orders/builder_base.html" %}
{% from "task_orders/fragments/task_order_view.html" import TaskOrderView %}
{% from 'task_orders/form_header.html' import TOFormStepHeader %}
{% 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) %}
@ -16,5 +17,6 @@
{% endblock %}
{% block to_builder_form_field %}
{{ TOFormStepHeader(to_number=task_order.number) }}
{{ TaskOrderView(task_order, portfolio, builder_mode=True) }}
{% endblock %}