diff --git a/atst/routes/requests/approval.py b/atst/routes/requests/approval.py index 66be2233..8c21493d 100644 --- a/atst/routes/requests/approval.py +++ b/atst/routes/requests/approval.py @@ -26,6 +26,9 @@ def task_order_dictionary(task_order): def render_approval(request, form=None): data = request.body 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: data["task_order"] = task_order_dictionary(request.task_order) @@ -34,6 +37,7 @@ def render_approval(request, form=None): data=data, request_id=request.id, status=request.status.value, + pending_review=pending_review, financial_review=pending_final_approval, pdf_available=request.task_order and request.task_order.pdf, f=form or CCPOReviewForm(), diff --git a/templates/requests/approval.html b/templates/requests/approval.html index 3135f0f5..cb9df6fc 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -26,104 +26,107 @@ -
-
-

Approval Notes

-
+ {% if pending_review %} +
+
+

Approval Notes

+
-
+
-
+
-

Instructions for the Requestor

+

Instructions for the Requestor

- Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI request. + Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI request. - {{ TextInput(f.comments, paragraph=True, placeholder="Add notes or comments explaining what changes are being requested or why further discussion is needed about this request.") }} - -
- -
-
-

Authorizing Officials

-

This section is not visible to the person making the request. It is only viewable by CCPO staff.

-

Provide the name of the key officials for both parties that have authorized this request to move forward.

+ {{ TextInput(f.comments, paragraph=True, placeholder="Add notes or comments explaining what changes are being requested or why further discussion is needed about this request.") }}
-
-

Mission Authorizing Official

-
+
+
+

Authorizing Officials

+

This section is not visible to the person making the request. It is only viewable by CCPO staff.

+

Provide the name of the key officials for both parties that have authorized this request to move forward.

+ +
+
+

Mission Authorizing Official

+ + +
+ +
+ {{ TextInput(f.fname_mao, placeholder="First name of mission authorizing official") }} +
+ +
+ {{ TextInput(f.lname_mao, placeholder="Last name of mission authorizing official") }} +
-
- {{ TextInput(f.fname_mao, placeholder="First name of mission authorizing official") }}
-
- {{ TextInput(f.lname_mao, placeholder="Last name of mission authorizing official") }} -
+
-
+
+ {{ TextInput(f.email_mao, placeholder="name@mail.mil") }} +
-
-
- {{ TextInput(f.email_mao, placeholder="name@mail.mil") }} +
+ {{ TextInput(f.phone_mao, placeholder="(123) 456-7890", validation='usPhone') }} +
+
-
- {{ TextInput(f.phone_mao, placeholder="(123) 456-7890", validation='usPhone') }} +

CCPO Authorizing Official

+ +
+ +
+ {{ TextInput(f.fname_ccpo, placeholder="First name of CCPO authorizing official") }} +
+ +
+ {{ TextInput(f.lname_ccpo, placeholder="Last name of CCPO authorizing official") }} +
+
-
-

CCPO Authorizing Official

+

CCPO Internal Notes

-
+

You may add additional comments and notes for internal CCPO reference and follow-up here.

-
- {{ TextInput(f.fname_ccpo, placeholder="First name of CCPO authorizing official") }} -
+
-
- {{ TextInput(f.lname_ccpo, placeholder="Last name of CCPO authorizing official") }} -
+
-
+
+ + +
- - -

CCPO Internal Notes

- -

You may add additional comments and notes for internal CCPO reference and follow-up here.

- -
- -
- -
- -
-
+
-
- -
- - - - {{ Icon('x') }} - Cancel - -
+
+ + + + {{ Icon('x') }} + Cancel + +
+ {% endif %}