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

Fix TO index blank states and number type issue

Browse Source
This commit is contained in:
leigh-mil 2019-12-13 10:54:00 -05:00
parent 2edfecdd45
commit 2c2b69affe
4 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
atst/models/task_order.py
View File

@ -1,4 +1,5 @@
from enum import Enum from enum import Enum
from decimal import Decimal
from sqlalchemy import Column, DateTime, ForeignKey, String from sqlalchemy import Column, DateTime, ForeignKey, String
from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.ext.hybrid import hybrid_property
@ -172,7 +173,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
@property @property
def invoiced_funds(self): def invoiced_funds(self):
# TODO: implement this using reporting data from the CSP # TODO: implement this using reporting data from the CSP
return self.total_obligated_funds * 75 / 100 return self.total_obligated_funds * Decimal(0.75)
@property @property
def display_status(self): def display_status(self):

5
atst/routes/task_orders/index.py
View File

@ -28,5 +28,8 @@ def review_task_order(task_order_id):
def portfolio_funding(portfolio_id): def portfolio_funding(portfolio_id):
portfolio = Portfolios.get(g.current_user, portfolio_id) portfolio = Portfolios.get(g.current_user, portfolio_id)
task_orders = TaskOrders.sort_by_status(portfolio.task_orders) task_orders = TaskOrders.sort_by_status(portfolio.task_orders)
to_count = len(portfolio.task_orders)
# TODO: Get expended amount from the CSP # TODO: Get expended amount from the CSP
return render_template("task_orders/index.html", task_orders=task_orders) return render_template(
"task_orders/index.html", task_orders=task_orders, to_count=to_count
)

82
templates/task_orders/index.html
View File

@ -15,45 +15,49 @@
{% macro TaskOrderList(task_orders, status) %} {% macro TaskOrderList(task_orders, status) %}
<div class="accordion"> <div class="accordion">
{% call Accordion(title=status, id=status, heading_tag="h4") %} {% call Accordion(title=("task_orders.status_list_title"|translate({'status': status})), id=status, heading_tag="h4") %}
{% for task_order in task_orders %} {% if task_orders|length > 0 %}
{% set to_number %} {% for task_order in task_orders %}
{% if task_order.number != "" %} {% set to_number %}
Task Order #{{ task_order.number }} {% if task_order.number != "" %}
{% else %} Task Order #{{ task_order.number }}
New Task Order {% else %}
{% endif %} New Task Order
{% endset %} {% endif %}
<div class="accordion__content--list-item"> {% endset %}
<h4><a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id) }}">{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}</a></h4> <div class="accordion__content--list-item">
{% if status != 'Expired' -%} <h4><a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id) }}">{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}</a></h4>
<div class="row"> {% if status != 'Expired' -%}
<div class="col col--grow"> <div class="row">
<h5> <div class="col col--grow">
Current Period of Performance <h5>
</h5> Current Period of Performance
<p> </h5>
{{ task_order.start_date | formattedDate(formatter="%b %d, %Y") }} <p>
- {{ task_order.start_date | formattedDate(formatter="%b %d, %Y") }}
{{ task_order.end_date | formattedDate(formatter="%b %d, %Y") }} -
</p> {{ task_order.end_date | formattedDate(formatter="%b %d, %Y") }}
</p>
</div>
<div class="col col--grow">
<h5>Total Value</h5>
<p>{{ task_order.total_contract_amount | dollars }}</p>
</div>
<div class="col col--grow">
<h5>Total Obligated</h5>
<p>{{ task_order.total_obligated_funds | dollars }}</p>
</div>
<div class="col col--grow">
<h5>Total Expended</h5>
<p>{{ task_order.invoiced_funds | dollars }}</p>
</div>
</div> </div>
<div class="col col--grow"> {%- endif %}
<h5>Total Value</h5> </div>
<p>{{ task_order.total_contract_amount | dollars }}</p> {% endfor %}
</div> {% else %}
<div class="col col--grow"> {{ "task_orders.status_empty_state" | translate({ 'status': status }) }}
<h5>Total Obligated</h5> {% endif %}
<p>{{ task_order.total_obligated_funds | dollars }}</p>
</div>
<div class="col col--grow">
<h5>Total Expended</h5>
<p>{{ task_order.invoiced_funds | dollars }}</p>
</div>
</div>
{%- endif %}
</div>
{% endfor %}
{% endcall %} {% endcall %}
</div> </div>
{% endmacro %} {% endmacro %}
@ -71,7 +75,7 @@
<div class="portfolio-funding"> <div class="portfolio-funding">
{% if task_orders %} {% if to_count > 0 %}
{% call AccordionList() %} {% call AccordionList() %}
{% for status, to_list in task_orders.items() %} {% for status, to_list in task_orders.items() %}
{{ TaskOrderList(to_list, status) }} {{ TaskOrderList(to_list, status) }}

2
translations.yaml
View File

@ -529,6 +529,8 @@ task_orders:
team_title: Your team team_title: Your team
sign: sign:
digital_signature_description: I acknowledge that the uploaded task order contains the required KO signature. digital_signature_description: I acknowledge that the uploaded task order contains the required KO signature.
status_empty_state: 'This Portfolio has no {status} Task Orders.'
status_list_title: '{status} Task Orders'
JEDICLINType: JEDICLINType:
JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS' JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS'
JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS' JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS'