From 1ca4d62a3a1aae3685ab74db16133e705f560be8 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Fri, 25 Jan 2019 15:58:41 -0500
Subject: [PATCH] Render form fields on the page

---
 atst/forms/ko_review.py                      | 22 ++++++++------------
 atst/routes/portfolios/task_orders.py        |  6 +++++-
 templates/portfolios/task_orders/review.html | 15 +++++++++++--
 translations.yaml                            |  4 +++-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/atst/forms/ko_review.py b/atst/forms/ko_review.py
index 7c7cb399..51ff7fba 100644
--- a/atst/forms/ko_review.py
+++ b/atst/forms/ko_review.py
@@ -8,31 +8,27 @@ from .validators import IsNumber
 
 from atst.utils.localization import translate
 
+
 class KOReviewForm(CacheableForm):
     pdf = FileField(
         translate("forms.ko_review.pdf_label"),
+        description=translate("forms.ko_review.pdf_description"),
         validators=[
-            FileAllowed(["pdf"], translate("forms.ko_review.pdf_description")),
+            FileAllowed(
+                ["pdf", "png"], translate("forms.task_order.file_format_not_allowed")
+            ),
             InputRequired(),
         ],
-        render_kw={"required": False},
+        render_kw={"required": False, "accept": ".pdf,.png,application/pdf,image/png"},
     )
     to_number = StringField(
-        translate("forms.ko_review.to_number"),
-        validators=[
-            Length(min=10),
-            IsNumber(),
-        ],
+        translate("forms.ko_review.to_number"), validators=[Length(min=10), IsNumber()]
     )
     loa = StringField(
-        translate("forms.ko_review.loa"),
-        validators=[
-            Length(min=10),
-            IsNumber(),
-        ],
+        translate("forms.ko_review.loa"), validators=[Length(min=10), IsNumber()]
     )
     custom_clauses = TextAreaField(
         translate("forms.ko_review.custom_clauses_label"),
         description=translate("forms.ko_review.custom_clauses_description"),
-        validators=[Optional()]
+        validators=[Optional()],
     )
diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py
index c9bec4a9..3c63137c 100644
--- a/atst/routes/portfolios/task_orders.py
+++ b/atst/routes/portfolios/task_orders.py
@@ -81,7 +81,11 @@ def review_task_order(portfolio_id, task_order_id, form=None):
         form=form or KOReviewForm(),
     )
 
-@portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/submit_review", methods=["POST"])
+
+@portfolios_bp.route(
+    "/portfolios/<portfolio_id>/task_order/<task_order_id>/submit_review",
+    methods=["POST"],
+)
 def submit_review_task_order(portfolio_id, task_order_id, form=None):
     portfolio = Portfolios.get(g.current_user, portfolio_id)
     task_order = TaskOrders.get(g.current_user, task_order_id)
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 4d863c6e..1615a283 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -3,6 +3,9 @@
 {% from "components/edit_link.html" import EditLink %}
 {% from "components/required_label.html" import RequiredLabel %}
 {% from "components/icon.html" import Icon %}
+{% from "components/datepicker.html" import DatePicker %}
+{% from "components/text_input.html" import TextInput %}
+
 
 {% block content %}
 
@@ -205,7 +208,10 @@
           </div>
         </div>
 
-        <div class="">Period of Performance Start Date</div>
+        <div class="">{{ "task_orders.ko_review.performance_start"| translate }}</div>
+        {{ DatePicker() }}
+        <div class="">{{ "task_orders.ko_review.performance_end"| translate }}</div>
+        {{ DatePicker() }}
 
         <hr>
 
@@ -223,7 +229,12 @@
 
         <div class="h2">{{ "task_orders.ko_review.task_order_information"| translate }}</div>
 
-        <div class="">Upload a copy of your Task Order document</div>
+        {{ form.pdf.label }}
+        {{ form.pdf.description }}
+        {{ form.pdf }}
+        {{ TextInput(form.to_number) }}
+        {{ TextInput(form.loa) }}
+        {{ TextInput(form.custom_clauses, paragraph=True) }}
 
       </div>
     </div>
diff --git a/translations.yaml b/translations.yaml
index 5014cf86..6c9bc1e0 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -58,7 +58,7 @@ forms:
     pdf_label: Upload a copy of your Task Order document
     pdf_description: Upload a PDF of the Task Order that you entered in your system of record for your organization.
     to_number: Task Order Number
-    loa: Line of Accounting (LOA) \#1
+    loa: Line of Accounting (LOA) #1
     custom_clauses_label: Task Order Custom Clauses (optional)
     custom_clauses_description: This will put a pause on the CSP access once the KO signs until the CCPO reviews that language to make sure it is legal.
   edit_member:
@@ -464,6 +464,8 @@ task_orders:
       add_button_text: Add / Invite Security Officer
       invite_button_text: Invite Security Officer
   ko_review:
+    performance_start: Period of Performance Start Date
+    performance_end: Period of Performance End Date
     task_order_information: Task Order Information
 testing:
   example_string: Hello World