Sign TO in post route

This commit is contained in:
Montana
2019-06-10 14:48:16 -04:00
parent 33248daa6b
commit 8446a79a9a
4 changed files with 50 additions and 20 deletions

View File

@@ -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:

View File

@@ -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):

View File

@@ -1,5 +1,3 @@
from datetime import date
from flask import g, render_template, url_for, redirect
from . import task_orders_bp
@@ -42,7 +40,10 @@ def review_task_order(task_order_id):
@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(
@@ -56,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",