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

Add pdf column and uploader

Browse Source
This commit is contained in:
Montana
2019-02-05 09:06:23 -05:00
parent d4fd3fb262
commit ce2b4b6ea1
9 changed files with 124 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
templates/components/datepicker.html
View File

@@ -1,50 +0,0 @@
{% from "components/icon.html" import Icon %}
{% macro DatePicker(field) -%}
<date-selector inline-template>
<div class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid }">
<input v-bind:value="formattedDate" type="hidden" />
<div class="usa-form-group usa-form-group-month">
<label>Month</label>
<input
max="12"
maxlength="2"
min="1"
type="number"
v-bind:class="{ 'usa-input-error': !isMonthValid }"
v-model="month"
/>
</div>
<div class="usa-form-group usa-form-group-day">
<label>Day</label>
<input
maxlength="2"
min="1"
type="number"
v-bind:class="{ 'usa-input-error': !isDayValid }"
v-bind:max="daysMaxCalculation"
v-model="day"
/>
</div>
<div class="usa-form-group usa-form-group-year">
<label>Year</label>
<input
maxlength="2"
type="number"
v-model="year"
/>
</div>
<div class="usa-form-group-date-ok" v-if="isDateValid">
{{ Icon("ok", classes="icon--green") }}
</div>
</div>
</date-selector>
{%- endmacro %}

33
templates/portfolios/task_orders/review.html
View File

@@ -17,11 +17,11 @@
{% include "fragments/flash.html" %}
{% block form_action %}
{% if task_order_id %}
<form method='POST' action="{{ url_for('portfolios.submit_ko_review', portfolio_id=portfolio_id, task_order_id=task_order_id, form=form) }}" autocomplete="off" enctype="multipart/form-data">
{% endif %}
<form method='POST' action="{{ url_for('portfolios.submit_ko_review', portfolio_id=portfolio.id, task_order_id=task_order.id, form=form) }}" autocomplete="off" enctype="multipart/form-data">
{% endblock %}
{{ form.csrf_token }}
{% block form %}
{% set message = "task_orders.ko_review.submitted_by" | translate({"name": task_order.creator.full_name}) %}
@@ -63,11 +63,28 @@
<div class="h2">{{ "task_orders.ko_review.task_order_information"| translate }}</div>
<div class="form__sub-fields">
<div class="usa-input">
<div class="usa-input__title">{{ form.pdf.label }}</div>
{{ form.pdf.description }}
{{ form.pdf }}
</div>
<upload inline-template v-bind:initial-data='{{ form.data | tojson }}' v-bind:upload-errors='{{ form.pdf.errors | list }}'>
<div>
<template v-if="showUpload">
<div class="usa-input {% if form.pdf.errors %} usa-input--error {% endif %}">
<div class="usa-input__title">{{ form.pdf.label }}</div>
{{ form.pdf.description }}
{{ form.pdf }}
{% for error in form.pdf.errors %}
<span class="usa-input__message">{{error}}</span>
{% endfor %}
</div>
</template>
<template v-else>
<p>Uploaded {{ form.pdf.data.filename }}</p>
<div>
<button type="button" v-on:click="showUploadInput">Change</button>
</div>
</template>
</div>
</upload>
{{ TextInput(form.number) }}
{{ TextInput(form.loa) }}
{{ TextInput(form.custom_clauses, paragraph=True) }}

11
templates/task_orders/new/app_info.html
View File

@@ -4,7 +4,6 @@
{% from "components/options_input.html" import OptionsInput %}
{% from "components/date_input.html" import DateInput %}
{% from "components/multi_checkbox_input.html" import MultiCheckboxInput %}
{% from "components/datepicker.html" import DatePicker %}
{% block heading %}
{{ "task_orders.new.app_info.section_title"| translate }}
@@ -12,16 +11,6 @@
{% block form %}
<div class="usa-input">
<label>
<div class="usa-input__title">Date picker</div>
</label>
<span class="usa-form-hint">For example: 04 28 1986</span>
{{ DatePicker() }}
</div>
<!-- App Info Section -->
<h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>