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

ccpo should only see review form on review screen if request is pending CCPO action

Browse Source
This commit is contained in:
dandds 2018-09-10 12:18:30 -04:00
parent 139103b2ce
commit d3c98523c4
2 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/requests/approval.py
View File

@ -26,6 +26,9 @@ def task_order_dictionary(task_order):
def render_approval(request, form=None): def render_approval(request, form=None):
data = request.body data = request.body
pending_final_approval = Requests.is_pending_ccpo_approval(request) pending_final_approval = Requests.is_pending_ccpo_approval(request)
pending_review = (
Requests.is_pending_ccpo_acceptance(request) or pending_final_approval
)
if pending_final_approval and request.task_order: if pending_final_approval and request.task_order:
data["task_order"] = task_order_dictionary(request.task_order) data["task_order"] = task_order_dictionary(request.task_order)
@ -34,6 +37,7 @@ def render_approval(request, form=None):
data=data, data=data,
request_id=request.id, request_id=request.id,
status=request.status.value, status=request.status.value,
pending_review=pending_review,
financial_review=pending_final_approval, financial_review=pending_final_approval,
pdf_available=request.task_order and request.task_order.pdf, pdf_available=request.task_order and request.task_order.pdf,
f=form or CCPOReviewForm(), f=form or CCPOReviewForm(),

3
templates/requests/approval.html
View File

@ -26,6 +26,7 @@
</section> </section>
{% if pending_review %}
<section class='panel'> <section class='panel'>
<header class='panel__heading'> <header class='panel__heading'>
<h2 class='h3'>Approval Notes</h2> <h2 class='h3'>Approval Notes</h2>
@ -53,6 +54,7 @@
</div> </div>
<h4 class="h3">Mission Authorizing Official</h4> <h4 class="h3">Mission Authorizing Official</h4>
<div class='form-row'> <div class='form-row'>
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
@ -124,6 +126,7 @@
<span>Cancel</span> <span>Cancel</span>
</a> </a>
</section> </section>
{% endif %}
<section class='panel'> <section class='panel'>
<header class='panel__heading'> <header class='panel__heading'>