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

TO Review Submit Modal

atst/domain/task_orders.py

@@ -1,3 +1,4 @@
+import datetime
 from flask import current_app as app
 
 from atst.database import db
@@ -47,6 +48,16 @@ class TaskOrders(BaseDomainClass):
 
         return task_order
 
+    @classmethod
+    def sign(cls, task_order, signer_dod_id):
+        task_order.signer_dod_id = signer_dod_id
+        task_order.signed_at = datetime.datetime.now()
+
+        db.session.add(task_order)
+        db.session.commit()
+
+        return task_order
+
     @classmethod
     def create_clins(cls, task_order_id, clin_list):
         for clin_data in clin_list:

atst/forms/task_order.py

@@ -59,7 +59,6 @@ class TaskOrderForm(BaseForm):
 
 class SignatureForm(BaseForm):
     signature = BooleanField(
-        translate("task_orders.sign.digital_signature_label"),
-        description=translate("task_orders.sign.digital_signature_description"),
+        translate("task_orders.sign.digital_signature_description"),
         validators=[Required()],
     )

atst/models/task_order.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 from enum import Enum
 
 from sqlalchemy import Column, DateTime, ForeignKey, String
@@ -100,7 +101,8 @@ class TaskOrder(Base, mixins.TimestampsMixin):
 
     @property
     def end_date(self):
-        return max((c.end_date for c in self.clins), default=None)
+        default_end_date = self.start_date + timedelta(days=1)
+        return max((c.end_date for c in self.clins), default=default_end_date)
 
     @property
     def days_to_expiration(self):

atst/routes/task_orders/index.py

@@ -1,11 +1,13 @@
-from flask import g, render_template
+from flask import g, render_template, url_for, redirect
 
 from . import task_orders_bp
 from atst.domain.authz.decorator import user_can_access_decorator as user_can
 from atst.domain.portfolios import Portfolios
 from atst.domain.task_orders import TaskOrders
-from atst.models.task_order import Status
+from atst.forms.task_order import TaskOrderForm, SignatureForm
 from atst.models import Permissions
+from atst.models.task_order import Status as TaskOrderStatus
+from atst.utils.flash import formatted_flash as flash
 
 
 @task_orders_bp.route("/task_orders/<task_order_id>")
@@ -25,7 +27,28 @@ def view_task_order(task_order_id):
 @user_can(Permissions.VIEW_TASK_ORDER_DETAILS, message="review task order details")
 def review_task_order(task_order_id):
     task_order = TaskOrders.get(task_order_id)
-    return render_template("portfolios/task_orders/review.html", task_order=task_order)
+    to_form = TaskOrderForm(number=task_order.number)
+    signature_form = SignatureForm()
+    return render_template(
+        "portfolios/task_orders/review.html",
+        task_order=task_order,
+        to_form=to_form,
+        signature_form=signature_form,
+    )
+
+
+@task_orders_bp.route("/task_orders/<task_order_id>/submit", methods=["POST"])
+@user_can(Permissions.CREATE_TASK_ORDER, "submit task order")
+def submit_task_order(task_order_id):
+
+    task_order = TaskOrders.get(task_order_id)
+    TaskOrders.sign(task_order=task_order, signer_dod_id=g.current_user.dod_id)
+
+    flash("task_order_submitted", task_order=task_order)
+
+    return redirect(
+        url_for("task_orders.portfolio_funding", portfolio_id=task_order.portfolio.id)
+    )
 
 
 @task_orders_bp.route("/portfolios/<portfolio_id>/task_orders")
@@ -34,11 +57,11 @@ def portfolio_funding(portfolio_id):
     portfolio = Portfolios.get(g.current_user, portfolio_id)
     task_orders = TaskOrders.sort(portfolio.task_orders)
     label_colors = {
-        Status.DRAFT: "warning",
-        Status.ACTIVE: "success",
-        Status.UPCOMING: "info",
-        Status.EXPIRED: "error",
-        Status.UNSIGNED: "purple",
+        TaskOrderStatus.DRAFT: "warning",
+        TaskOrderStatus.ACTIVE: "success",
+        TaskOrderStatus.UPCOMING: "info",
+        TaskOrderStatus.EXPIRED: "error",
+        TaskOrderStatus.UNSIGNED: "purple",
     }
     return render_template(
         "portfolios/task_orders/index.html",

atst/utils/flash.py

@@ -175,7 +175,7 @@ MESSAGES = {
         "category": "success",
     },
     "task_order_submitted": {
-        "title_template": "Task Order Form Submitted",
+        "title_template": "Your Task Order has been uploaded successfully.",
         "message_template": """
         Your task order form for {{ task_order.portfolio_name }} has been submitted.
         """,