request approval screen
This commit is contained in:
Andrew Croce
dandds
parent
905226e98a
commit
2a97ed5dc3
@ -35,7 +35,7 @@ def render_approval(request, form=None):
|
|||||||
return render_template(
|
return render_template(
|
||||||
"requests/approval.html",
|
"requests/approval.html",
|
||||||
data=data,
|
data=data,
|
||||||
status_events=reversed(request.status_events),
|
reviews=list(reversed(request.reviews)),
|
||||||
request=request,
|
request=request,
|
||||||
current_status=request.status.value,
|
current_status=request.status.value,
|
||||||
pending_review=pending_review,
|
pending_review=pending_review,
|
||||||
|
|||||||
@ -16,8 +16,9 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<section class='panel'>
|
<section class='panel'>
|
||||||
<header class='panel__heading request-approval__heading'>
|
<header class='panel__heading panel__heading--divider request-approval__heading'>
|
||||||
<h1 class='h2'>Request #{{ request.id }}</h1>
|
<h1 class='h2'>Request #{{ request.id }}
|
||||||
|
</h1>
|
||||||
<span class='label label--info'>{{ current_status }}</span>
|
<span class='label label--info'>{{ current_status }}</span>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@ -32,38 +33,58 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
{% if pending_review %}
|
{% if pending_review %}
|
||||||
|
<section class='request-approval__review'>
|
||||||
<form method="POST" action="{{ url_for("requests.submit_approval", request_id=request.id) }}" autocomplete="off">
|
<form method="POST" action="{{ url_for("requests.submit_approval", request_id=request.id) }}" autocomplete="off">
|
||||||
{{ f.csrf_token }}
|
{{ f.csrf_token }}
|
||||||
<section class='panel'>
|
|
||||||
<header class='panel__heading'>
|
|
||||||
<h2 class='h3'>Approval Notes</h2>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
|
<ccpo-approval inline-template>
|
||||||
|
<div>
|
||||||
|
<div class='panel'>
|
||||||
<div class='panel__content'>
|
<div class='panel__content'>
|
||||||
|
<h2>Review this Request</h2>
|
||||||
|
|
||||||
<div class="form__sub-fields">
|
<div class='usa-input'>
|
||||||
|
<fieldset class='usa-input__choices usa-input__choices--inline'>
|
||||||
<h3>Instructions for the Requestor</h3>
|
<input v-on:change='setReview' type='radio' name='review' id='review-approving' value='approving'/>
|
||||||
|
<label for='review-approving'>Ready for approval</label>
|
||||||
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. <b>These notes will be visible to the person making the JEDI Cloud request</b>.
|
|
||||||
|
|
||||||
{{ TextInput(f.comment, paragraph=True, placeholder="Add notes or comments explaining what changes are being requested or why further discussion is needed about this request.") }}
|
|
||||||
|
|
||||||
|
<input v-on:change='setReview' type='radio' name='review' id='review-denying' value='denying'/>
|
||||||
|
<label for='review-denying'>Request revisions</label>
|
||||||
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-row">
|
<div v-if='approving || denying' class='form__sub-fields' v-cloak>
|
||||||
<div class="form-col">
|
<h3>Message to Requestor <span class='subtitle'>(optional)</span></h3>
|
||||||
<h3>Authorizing Officials</h3>
|
<div v-if='approving' key='approving' v-cloak>
|
||||||
<p>This section is not visible to the person making the request. It is only viewable by CCPO staff.</p>
|
{{ TextInput(
|
||||||
<p>Provide the name of the key officials for both parties that have authorized this request to move forward.</p>
|
f.comment,
|
||||||
|
label='Approval comments or notes',
|
||||||
|
description='Provide any comments or notes regarding the approval of this request. <strong>This message will be shared with the person making the JEDI request.</strong>.',
|
||||||
|
paragraph=True,
|
||||||
|
noMaxWidth=True
|
||||||
|
) }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else key='denying' v-cloak>
|
||||||
|
{{ TextInput(
|
||||||
|
f.comment,
|
||||||
|
label='Revision instructions or notes',
|
||||||
|
paragraph=True,
|
||||||
|
noMaxWidth=True
|
||||||
|
) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h4 class="h3">Mission Authorizing Official</h4>
|
|
||||||
|
|
||||||
|
<div v-if='approving' class='form__sub-fields' v-cloak>
|
||||||
|
|
||||||
|
<h3>Authorizing Officials <span class='subtitle'>(optional)</span></h3>
|
||||||
|
<p>Provide the name of the key officials for both parties that have authorized this request to move forward. <strong>This section is not visible to the person making the request. It is only viewable by CCPO staff.</strong></p>
|
||||||
|
|
||||||
|
<hr />
|
||||||
|
|
||||||
|
<h4>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'>
|
||||||
{{ TextInput(f.fname_mao, placeholder="First name of mission authorizing official") }}
|
{{ TextInput(f.fname_mao, placeholder="First name of mission authorizing official") }}
|
||||||
</div>
|
</div>
|
||||||
@ -71,27 +92,23 @@
|
|||||||
<div class='form-col form-col--half'>
|
<div class='form-col form-col--half'>
|
||||||
{{ TextInput(f.lname_mao, placeholder="Last name of mission authorizing official") }}
|
{{ TextInput(f.lname_mao, placeholder="Last name of mission authorizing official") }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class='form-row'>
|
<div class='form-row'>
|
||||||
|
|
||||||
<div class='form-col form-col--half'>
|
<div class='form-col form-col--half'>
|
||||||
{{ TextInput(f.email_mao, placeholder="name@mail.mil") }}
|
{{ TextInput(f.email_mao, placeholder="name@mail.mil") }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class='form-col form-col--half'>
|
<div class='form-col form-col--half'>
|
||||||
{{ TextInput(f.phone_mao, placeholder="(123) 456-7890", validation='usPhone') }}
|
{{ TextInput(f.phone_mao, placeholder="(123) 456-7890", validation='usPhone') }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<hr />
|
||||||
|
|
||||||
<h4 class="h3">CCPO Authorizing Official</h4>
|
<h4>CCPO 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'>
|
||||||
{{ TextInput(f.fname_ccpo, placeholder="First name of CCPO authorizing official") }}
|
{{ TextInput(f.fname_ccpo, placeholder="First name of CCPO authorizing official") }}
|
||||||
</div>
|
</div>
|
||||||
@ -99,86 +116,95 @@
|
|||||||
<div class='form-col form-col--half'>
|
<div class='form-col form-col--half'>
|
||||||
{{ TextInput(f.lname_ccpo, placeholder="Last name of CCPO authorizing official") }}
|
{{ TextInput(f.lname_ccpo, placeholder="Last name of CCPO authorizing official") }}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if='approving || denying' class='action-group' v-cloak>
|
||||||
|
<button type="submit" name="approved" class='usa-button usa-button-big'>Approve Request</button>
|
||||||
</section>
|
<button type="submit" name="denied" class='usa-button usa-button-big usa-button-secondary'>Request Revisions</button>
|
||||||
|
|
||||||
<section class='action-group'>
|
|
||||||
<input type="submit" name="approved" class='usa-button usa-button-big' value='Approve Request'>
|
|
||||||
<input type="submit" name="denied" class='usa-button usa-button-big usa-button-secondary' value='Mark as Changes Requested'>
|
|
||||||
<a href='{{ url_for("requests.requests_index") }}' class='icon-link'>
|
<a href='{{ url_for("requests.requests_index") }}' class='icon-link'>
|
||||||
{{ Icon('x') }}
|
{{ Icon('x') }}
|
||||||
<span>Cancel</span>
|
<span>Cancel</span>
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</div>
|
||||||
|
</div>
|
||||||
|
</ccpo-approval>
|
||||||
</form>
|
</form>
|
||||||
|
</section>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<section class='panel'>
|
|
||||||
<h4 class="h3">CCPO Internal Notes</h4>
|
<section class='internal-notes' id='ccpo-notes'>
|
||||||
<p>You may add additional comments and notes for internal CCPO reference and follow-up here.</p>
|
|
||||||
<div class='form-row'>
|
|
||||||
<div class='form-col'>
|
|
||||||
<form method="POST" action="{{ url_for('requests.create_internal_comment', request_id=request.id) }}">
|
<form method="POST" action="{{ url_for('requests.create_internal_comment', request_id=request.id) }}">
|
||||||
|
<div class='panel'>
|
||||||
|
<div class='panel__content'>
|
||||||
|
|
||||||
{{ internal_comment_form.csrf_token }}
|
{{ internal_comment_form.csrf_token }}
|
||||||
{{ TextInput(internal_comment_form.text, paragraph=True) }}
|
{{ TextInput(internal_comment_form.text, paragraph=True, noMaxWidth=True) }}
|
||||||
<button type="submit">Leave comment</button>
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class='action-group action-group--tight'>
|
||||||
|
<button class='usa-button' type="submit">Save Notes</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class='panel'>
|
<section>
|
||||||
|
{% if reviews %}
|
||||||
|
<div class='panel'>
|
||||||
<header class='panel__heading'>
|
<header class='panel__heading'>
|
||||||
<h2 class='h3 request-approval__columns__heading'>Approval Log</h2>
|
<h2 class='h3 request-approval__columns__heading'>CCPO Activity Log</h2>
|
||||||
</header>
|
</header>
|
||||||
<div>
|
|
||||||
<div class='approval-log'>
|
<div class='approval-log'>
|
||||||
<ol>
|
<ol>
|
||||||
|
{% for review in reviews %}
|
||||||
{% for status_event in status_events %}
|
|
||||||
{% if status_event.review %}
|
|
||||||
<li>
|
<li>
|
||||||
<article class='approval-log__log-item'>
|
<article class='approval-log__log-item'>
|
||||||
<div>
|
<div>
|
||||||
<h3 class='approval-log__log-item__header'>{{ status_event.log_name }} by {{ status_event.review.full_name_reviewer }}</h3>
|
<h3 class='approval-log__log-item__header'>{{ review.log_name }} by {{ review.full_name_reviewer }}</h3>
|
||||||
{% if status_event.review.comment %}
|
{% if review.comment %}
|
||||||
<p>{{ status_event.review.comment }}</p>
|
<p>{{ review.comment }}</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class='approval-log__behalfs'>
|
<div class='approval-log__behalfs'>
|
||||||
{% if status_event.review.lname_mao %}
|
{% if review.lname_mao %}
|
||||||
<div class='approval-log__behalf'>
|
<div class='approval-log__behalf'>
|
||||||
<h3 class='approval-log__log-item__header'>Mission Owner approval on behalf of:</h3>
|
<h3 class='approval-log__log-item__header'>Mission Owner approval on behalf of:</h3>
|
||||||
<span>{{ status_event.review.full_name_mao }}</span>
|
<span>{{ review.full_name_mao }}</span>
|
||||||
<span>{{ status_event.review.email_mao }}</span>
|
<span>{{ review.email_mao }}</span>
|
||||||
<span>{{ status_event.review.phone_mao }}</span>
|
<span>{{ review.phone_mao }}</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if status_event.review.lname_ccpo %}
|
{% if review.lname_ccpo %}
|
||||||
<div class='approval-log__behalf'>
|
<div class='approval-log__behalf'>
|
||||||
<h3 class='approval-log__log-item__header'>CCPO approval on behalf of:</h3>
|
<h3 class='approval-log__log-item__header'>CCPO approval on behalf of:</h3>
|
||||||
<span>{{ status_event.review.full_name_ccpo }}</span>
|
<span>{{ review.full_name_ccpo }}</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% set timestamp=status_event.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %}
|
{% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %}
|
||||||
<footer class='approval-log__log-item__timestamp'><time datetime='{{ timestamp }}'>{{ timestamp }}</time></footer>
|
<footer class='approval-log__log-item__timestamp'><time datetime='{{ timestamp }}'>{{ timestamp }}</time></footer>
|
||||||
</article>
|
</article>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% else %}
|
||||||
|
{{ Alert('CCPO Activity Log',
|
||||||
|
message='No CCPO approvals or request changes have been recorded yet.',
|
||||||
|
level='warning'
|
||||||
|
) }}
|
||||||
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user