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

Merge pull request #566 from dod-ccpo/upload-csp-estimate

Browse Source 
Upload proof of CSP estimate
This commit is contained in:
patricksmithdds
2019-01-23 14:56:28 -05:00
committed by GitHub
parent e16f12be80 7e4f6bf3eb
commit f553c9a9ea
20 changed files with 223 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/portfolios/task_orders/show.html
View File

@@ -137,7 +137,7 @@
<div class="panel__content">
{{ DocumentLink(
title="Cloud Services Estimate",
link_url="#") }}
link_url=task_order.csp_estimate and url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) ) }}
{{ DocumentLink(
title="Market Research",
link_url="#") }}

4
templates/task_orders/_new.html
View File

@@ -10,9 +10,9 @@
{% block form_action %}
{% if task_order_id %}
<form method='POST' action="{{ url_for('task_orders.new', screen=current, task_order_id=task_order_id) }}" autocomplete="off">
<form method='POST' action="{{ url_for('task_orders.new', screen=current, task_order_id=task_order_id) }}" autocomplete="off" enctype="multipart/form-data">
{% else %}
<form method='POST' action="{{ url_for('task_orders.update', screen=current, portfolio_id=portfolio_id) }}" autocomplete="off">
<form method='POST' action="{{ url_for('task_orders.update', screen=current, portfolio_id=portfolio_id) }}" autocomplete="off" enctype="multipart/form-data">
{% endif %}
{% endblock %}

27
templates/task_orders/new/funding.html
View File

@@ -12,7 +12,11 @@
{% block form %}
<funding inline-template v-bind:initial-data='{{ form.data|tojson }}'>
<funding
inline-template
v-bind:initial-data='{{ form.data|mixedContentToJson }}'
v-bind:upload-errors='{{ form.csp_estimate.errors | list }}'
>
<div>
<!-- Get Funding Section -->
<h3 class="subheading">{{ "task_orders.new.funding.performance_period_title" | translate }}</h3>
@@ -28,13 +32,22 @@
{{ Icon("link")}} Cloud Service Provider's estimate calculator
</a></p>
<p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
<div class="usa-input">
<div class="usa-input__title">
{{ form.pdf.label }}
<template v-if="showUpload">
<div class="usa-input {% if form.csp_estimate.errors %} usa-input--error {% endif %}">
{{ form.csp_estimate.label }}
{{ form.csp_estimate.description }}
{{ form.csp_estimate }}
{% for error in form.csp_estimate.errors %}
<span class="usa-input__message">{{error}}</span>
{% endfor %}
</div>
{{ form.pdf.description }}
<input type="file" disabled="disabled" />
</div>
</template>
<template v-else>
<p>Uploaded {{ form.csp_estimate.data.filename }}</p>
<div>
<button type="button" v-on:click="showUploadInput">Change</button>
</div>
</template>
<hr>

9
templates/task_orders/new/review.html
View File

@@ -113,7 +113,14 @@
<div class="row">
{% call ReviewField(("task_orders.new.review.performance_period" | translate), task_order.performance_length, filter="translateDuration") %}
<p><a href="#" class='icon-link icon-link--left' download>{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link" | translate }}</a></p>
{% if task_order.csp_estimate %}
<p>
<a href="{{ url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) }}" class='icon-link icon-link--left' download>{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a>
</p>
{% else %}
<a href="{{ url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) }}" class='icon-link icon-link--left icon-link--disabled' aria-disabled="true">{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a>
{{ Icon('alert', classes='icon--red') }} <span class="task-order-invite-message not-sent">{{ "task_orders.new.review.not_uploaded"| translate }}</span>
{% endif %}
{% endcall %}
<div class="col col--grow">