multistep task order workflow

atst/domain/task_orders.py

@@ -16,11 +16,13 @@ class TaskOrders(object):
             raise NotFoundError("task_order")
 
     @classmethod
-    def create(cls, workspace, creator):
+    def create(cls, workspace, creator, commit=False):
         task_order = TaskOrder(workspace=workspace, creator=creator)
 
         db.session.add(task_order)
-        db.session.commit()
+
+        if commit:
+            db.session.commit()
 
         return task_order
 

atst/forms/task_order.py

@@ -18,7 +18,11 @@ from .data import (
 )
 
 
-class TaskOrderForm(CacheableForm):
+class AppInfoForm(CacheableForm):
+    portfolio_name = StringField(
+        "Organization Portfolio Name",
+        description="The name of your office or organization. You can add multiple applications to your portfolio. Your task orders are used to pay for these applications and their environments",
+    )
     scope = TextAreaField(
         "Cloud Project Scope",
         description="The name of your office or organization. You can add multiple applications to your portfolio. Your task orders are used to pay for these applications and their environments",
@@ -45,20 +49,23 @@ class TaskOrderForm(CacheableForm):
         choices=PROJECT_COMPLEXITY,
         default="",
     )
-    complexity_other = StringField("?")
+    complexity_other = StringField("Project Complexity Other")
     dev_team = SelectMultipleField(
         "Development Team",
         description="Which people or teams will be completing the development work for your cloud applications?",
         choices=DEV_TEAM,
         default="",
     )
-    dev_team_other = StringField("?")
+    dev_team_other = StringField("Development Team Other")
     team_experience = RadioField(
         "Team Experience",
         description="How much experience does your team have with development in the cloud?",
         choices=TEAM_EXPERIENCE,
         default="",
     )
+
+
+class FundingForm(CacheableForm):
     start_date = DateField(
         "Period of Performance",
         description="Select a start and end date for your Task Order to be active. Please note, this will likely be revised once your Task Order has been approved.",
@@ -80,6 +87,9 @@ class TaskOrderForm(CacheableForm):
         "CLIN 04: Classified Cloud Support and Assistance",
         description="CLASSIFIED technical guidance from the cloud service provider, including architecture, configuration of IaaS and PaaS, integration, troubleshooting assistance, and other services.",
     )
+
+
+class OversightForm(CacheableForm):
     ko_first_name = StringField("First Name")
     ko_last_name = StringField("Last Name")
     ko_email = StringField("Email")
@@ -92,5 +102,7 @@ class TaskOrderForm(CacheableForm):
     so_last_name = StringField("Last Name")
     so_email = StringField("Email")
     so_dod_id = StringField("DOD ID")
-    number = StringField("Task Order Number")
-    loa = StringField("Line of Accounting (LOA)")
+
+
+class ReviewForm(CacheableForm):
+    pass

atst/models/task_order.py

@@ -56,3 +56,13 @@ class TaskOrder(Base, mixins.TimestampsMixin):
         return "<TaskOrder(number='{}', budget='{}', end_date='{}', id='{}')>".format(
             self.number, self.budget, self.end_date, self.id
         )
+
+    def to_dictionary(self):
+        return {
+            "portfolio_name": self.workspace.name,
+            **{
+                c.name: getattr(self, c.name)
+                for c in self.__table__.columns
+                if c.name not in ["id"]
+            },
+        }

atst/routes/task_orders/__init__.py

@@ -1,26 +1,128 @@
-from flask import Blueprint, request as http_request, render_template
+from flask import Blueprint, request as http_request, render_template, g, redirect, url_for
 
 from atst.domain.task_orders import TaskOrders
-from atst.forms.task_order import TaskOrderForm
+from atst.domain.workspaces import Workspaces
+import atst.forms.task_order as task_order_form
 
 task_orders_bp = Blueprint("task_orders", __name__)
 
 
-@task_orders_bp.route("/task_order/edit/<task_order_id>")
-def edit(task_order_id):
-    form = TaskOrderForm()
-    task_order = TaskOrders.get(task_order_id)
-    return render_template("task_orders/edit.html", form=form, task_order=task_order)
+TASK_ORDER_SECTIONS = [
+    {
+        "section": "app_info",
+        "title": "What You're Building",
+        "template": "task_orders/new/app_info.html",
+        "form": task_order_form.AppInfoForm,
+    },
+    {
+        "section": "funding",
+        "title": "Funding",
+        "template": "task_orders/new/funding.html",
+        "form": task_order_form.FundingForm,
+    },
+    {
+        "section": "oversight",
+        "title": "Oversight",
+        "template": "task_orders/new/oversight.html",
+        "form": task_order_form.OversightForm,
+    },
+    {
+        "section": "review",
+        "title": "Review & Download",
+        "template": "task_orders/new/review.html",
+        "form": task_order_form.ReviewForm,
+    },
+]
 
 
-@task_orders_bp.route("/task_order/edit/<task_order_id>", methods=["POST"])
-def update(task_order_id):
-    form = TaskOrderForm(http_request.form)
-    task_order = TaskOrders.get(task_order_id)
-    if form.validate():
-        TaskOrders.update(task_order, **form.data)
-        return "i did it"
+class ShowTaskOrderWorkflow:
+    def __init__(self, screen=1, task_order_id=None):
+        self.screen = screen
+        self.task_order_id = task_order_id
+        self._section = TASK_ORDER_SECTIONS[screen - 1]
+        self._task_order = None
+        self._form = None
+
+    @property
+    def task_order(self):
+        if not self._task_order and self.task_order_id:
+            self._task_order = TaskOrders.get(self.task_order_id)
+
+        return self._task_order
+
+    @property
+    def form(self):
+        if self._form:
+            pass
+        elif self.task_order:
+            self._form = self._section["form"](data=self.task_order.to_dictionary())
+        else:
+            self._form = self._section["form"]()
+
+        return self._form
+
+    @property
+    def template(self):
+        return self._section["template"]
+
+
+class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
+    def __init__(self, form_data, user, screen=1, task_order_id=None):
+        self.form_data = form_data
+        self.user = user
+        self.screen = screen
+        self.task_order_id = task_order_id
+        self._task_order = None
+        self._section = TASK_ORDER_SECTIONS[screen - 1]
+
+    @property
+    def form(self):
+        return self._section["form"](self.form_data)
+
+    def validate(self):
+        return self.form.validate()
+
+    def update(self):
+        if self.task_order:
+            TaskOrders.update(self.task_order, **self.form.data)
+        else:
+            ws = Workspaces.create(self.user, self.form.portfolio_name.data)
+            to_data = self.form.data.copy()
+            to_data.pop("portfolio_name")
+            self._task_order = TaskOrders.create(workspace=ws, creator=self.user)
+            TaskOrders.update(self.task_order, **to_data)
+
+        return self.task_order
+
+
+@task_orders_bp.route("/task_order/new/<int:screen>")
+@task_orders_bp.route("/task_order/new/<int:screen>/<task_order_id>")
+def new(screen, task_order_id=None):
+    workflow = ShowTaskOrderWorkflow(screen, task_order_id)
+    return render_template(
+        workflow.template,
+        current=screen,
+        task_order_id=task_order_id,
+        screens=TASK_ORDER_SECTIONS,
+        form=workflow.form,
+    )
+
+
+@task_orders_bp.route("/task_order/new/<int:screen>", methods=["POST"])
+@task_orders_bp.route("/task_order/new/<int:screen>/<task_order_id>", methods=["POST"])
+def update(screen, task_order_id=None):
+    workflow = UpdateTaskOrderWorkflow(
+        http_request.form, g.current_user, screen, task_order_id
+    )
+
+    if workflow.validate():
+        workflow.update()
+        return redirect(url_for("task_orders.new", screen=screen+1, task_order_id=workflow.task_order.id))
     else:
         return render_template(
-            "task_orders/edit.html", form=form, task_order=task_order
+            workflow.template,
+            current=screen,
+            task_order_id=task_order_id,
+            screens=TASK_ORDER_SECTIONS,
+            form=workflow.form,
         )