Merge pull request #880 from dod-ccpo/to-review-modal

TO Review Submit Modal
This commit is contained in:
dandds
2019-06-11 13:10:17 -04:00
committed by GitHub
15 changed files with 187 additions and 28 deletions

View File

@@ -0,0 +1,31 @@
{% from "components/alert.html" import Alert %}
{% from "components/checkbox_input.html" import CheckboxInput %}
{% macro SubmitConfirmation(modal_id, submit_text, submit_action, form, task_order) %}
<submit-confirmation inline-template name="{{ modal_id }}" key="{{ modal_id }}">
<div>
<div class="usa-input">
<label for="{{ modal_id }}-deleted-text">
<div class="modal__form--header">
<h1>Signature confirmation: <em>Task Order #{{task_order.number}}</em></h1>
</div>
{{ Alert('',
message="All task orders require a Contracting Officer signature."
) }}
</label>
<div v-on:change="toggleValid" class="checkbox">
{{ CheckboxInput(field=form.signature) }}
</div>
</div>
<div class="action-group">
<form method="POST" action="{{ submit_action }}">
{{ form.csrf_token }}
<button class="usa-button usa-button-primary" v-bind:disabled="!valid">
{{ submit_text }}
</button>
</form>
<button v-on:click="$root.closeModal('{{ modal_id }}')" class="usa-button usa-button-secondary">{{ "common.cancel" | translate }}</button>
</div>
</div>
</submit-confirmation>
{% endmacro %}

View File

@@ -68,6 +68,8 @@
<a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Start a new task order</a>
{% endcall %}
{% include "fragments/flash.html" %}
<div class="portfolio-funding">
{% if task_orders %}

View File

@@ -1,14 +1,29 @@
{% from "components/icon.html" import Icon %}
{% from "components/totals_box.html" import TotalsBox %}
{% from "components/modal.html" import Modal %}
{% from "components/semi_collapsible_text.html" import SemiCollapsibleText %}
{% from "components/sticky_cta.html" import StickyCTA %}
{% from "components/submit_confirmation.html" import SubmitConfirmation %}
{% from "components/totals_box.html" import TotalsBox %}
{% extends 'portfolios/base.html' %}
{% block portfolio_content %}
{% set submit_modal_id = "submit-to-1" %}
{% call Modal(name=submit_modal_id) %}
{{
SubmitConfirmation(
modal_id=submit_modal_id,
submit_text="Confirm & Submit",
submit_action=url_for('task_orders.submit_task_order', task_order_id=task_order.id),
form=signature_form,
task_order=task_order,
)
}}
{% endcall %}
{% call StickyCTA(text="Review Funding") %}
<a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
<a href="{{ url_for("task_orders.edit", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Submit task order</a>
<a v-on:click="openModal('submit-to-1')" class="usa-button usa-button-primary" type="submit">Submit task order</a>
{% endcall %}
<div class="task-order-summary">