diff --git a/templates/requests/approval.html b/templates/requests/approval.html index 9b590ef5..009314fe 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -32,7 +32,55 @@ - {% if request.is_pending_ccpo_action %} +
+
+
+
+

CCPO Internal Comments

+
+ +
+ {% if comments %} +
    + {% for comment in comments %} +
  1. +
    +
    +

    {{ comment.full_name_commenter }}

    +

    {{ comment.message }}

    +
    + {% set timestamp=comment.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} +
    + +
    +
    +
  2. + {% endfor %} +
+ {% else %} +
+

No CCPO comments have been recorded yet.

+
+ {% endif %} + +
+ +
+

Add a comment

+
+ +
+ {{ internal_comment_form.csrf_token }} + {{ TextInput(internal_comment_form.text, paragraph=True, noMaxWidth=True) }} +
+
+
+ +
+
+
+ +
{{ f.csrf_token }} @@ -40,8 +88,63 @@
+ +
+

CCPO Review Activity

+
+ +
+ {% if reviews %} +
    + {% for review in reviews %} +
  1. +
    +
    + {{ review.log_name }} +

    {{ review.status.log_name }} by {{ review.full_name_reviewer }}

    + {% if review.comment %} +

    {{ review.comment }}

    + {% endif %} + +
    + {% if review.lname_mao %} +
    +

    Mission Owner approval on behalf of:

    + {{ review.full_name_mao }} + {{ review.email_mao }} + {{ review.phone_mao }} +
    + {% endif %} + + {% if review.lname_ccpo %} +
    +

    CCPO approval on behalf of:

    + {{ review.full_name_ccpo }} +
    + {% endif %} +
    +
    + {% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} +
    + +
    +
    +
  2. + {% endfor %} +
+ {% else %} +
+

No CCPO approvals or request changes have been recorded yet.

+
+ {% endif %} +
+ + {% if request.is_pending_ccpo_action %} +
+

Review this Request

+
+
-

Review this Request

@@ -119,8 +222,11 @@
+ {% endif %} +
+ {% if request.is_pending_ccpo_action %}
@@ -129,65 +235,12 @@ Cancel
+ {% endif %} +
- {% endif %} - -
-
-
-

CCPO Activity Log

-
- -
- {% if reviews %} -
    - {% for review in reviews %} -
  1. -
    -
    - {{ review.log_name }} -

    {{ review.status.log_name }} by {{ review.full_name_reviewer }}

    - {% if review.comment %} -

    {{ review.comment }}

    - {% endif %} - -
    - {% if review.lname_mao %} -
    -

    Mission Owner approval on behalf of:

    - {{ review.full_name_mao }} - {{ review.email_mao }} - {{ review.phone_mao }} -
    - {% endif %} - - {% if review.lname_ccpo %} -
    -

    CCPO approval on behalf of:

    - {{ review.full_name_ccpo }} -
    - {% endif %} -
    -
    - {% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} -
    - -
    -
    -
  2. - {% endfor %} -
- {% else %} -
-

No CCPO approvals or request changes have been recorded yet.

-
- {% endif %} -
-
-