Link conditionals created during evaluations

Author: mbillow

conditional/blueprints/conditional.py

@@ -10,7 +10,7 @@
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.flask import render_template
 
-from conditional.models.models import Conditional
+from conditional.models.models import Conditional, SpringEval, FreshmanEvalData
 
 from conditional import db
 
@@ -63,8 +63,22 @@ def create_conditional():
     uid = post_data['uid']
     description = post_data['description']
     due_date = datetime.strptime(post_data['dueDate'], "%Y-%m-%d")
+    if post_data['evaluation'] == 'spring':
+        current_eval = SpringEval.query.filter(SpringEval.status == "Pending",
+            SpringEval.uid == uid,
+            SpringEval.active == True).first().id # pylint: disable=singleton-comparison
+        db.session.add(Conditional(uid, description, due_date, s_eval=current_eval))
+    elif post_data['evaluation'] == 'intro':
+        if uid.isdigit():
+            current_eval = FreshmanEvalData.query.filter(FreshmanEvalData.freshman_eval_result == "Pending",
+                FreshmanEvalData.id == uid).first().id
+        else:
+            current_eval = FreshmanEvalData.query.filter(FreshmanEvalData.freshman_eval_result == "Pending",
+                FreshmanEvalData.uid == uid).first().id
+        db.session.add(Conditional(uid, description, due_date, i_eval=current_eval))
+    else:
+        db.session.add(Conditional(uid, description, due_date))
 
-    db.session.add(Conditional(uid, description, due_date))
     db.session.flush()
     db.session.commit()
 
@@ -89,12 +103,23 @@ def conditional_review():
     status = post_data['status']
 
     logger.info(action="updated conditional-%s to %s" % (cid, status))
-    Conditional.query.filter(
-        Conditional.id == cid). \
-        update(
+    conditional = Conditional.query.filter(Conditional.id == cid)
+    cond_obj = conditional.first()
+
+    conditional.update(
         {
             'status': status
         })
+    if cond_obj.s_evaluation:
+        SpringEval.query.filter(SpringEval.id == cond_obj.s_evaluation).update(
+            {
+                'status': status
+            })
+    elif cond_obj.i_evaluation:
+        FreshmanEvalData.query.filter(FreshmanEvalData.id == cond_obj.i_evaluation).update(
+            {
+                'freshman_eval_result': status
+            })
 
     db.session.flush()
     db.session.commit()

conditional/models/models.py

@@ -219,14 +219,18 @@ class Conditional(db.Model):
     status = Column(Enum('Pending', 'Passed', 'Failed',
                          name="conditional_enum"),
                     nullable=False)
+    s_evaluation = Column(ForeignKey('spring_evals.id'))
+    i_evaluation = Column(ForeignKey('freshman_eval_data.id'))
 
-    def __init__(self, uid, description, due):
+    def __init__(self, uid, description, due, s_eval=None, i_eval=None):
         self.uid = uid
         self.description = description
         self.date_due = due
         self.date_created = datetime.now()
         self.status = "Pending"
         self.active = True
+        self.s_evaluation = s_eval
+        self.i_evaluation = i_eval
 
 
 class EvalSettings(db.Model):

frontend/javascript/modules/conditionalActions.js

@@ -28,7 +28,6 @@ export default class ConditionalActions {
       });
     } else {
       const actionExt = (action === "pass") ? "Passed" : "Failed";
-
       let payload = {
         id: this.id,
         status: actionExt

frontend/javascript/modules/conditionalForm.js

@@ -16,10 +16,15 @@ export default class ConditionalForm {
   _submitForm(e) {
     e.preventDefault();
     let uid = this.form.uid.value;
+    let evaluation = null;
+    if (location.pathname.split('/')[1] === "slideshow") {
+      evaluation = location.pathname.split('/')[2];
+    }
     let payload = {
       uid: uid,
       description: this.form.querySelector('input[name=description]').value,
-      dueDate: this.form.querySelector('input[name=due_date]').value
+      dueDate: this.form.querySelector('input[name=due_date]').value,
+      evaluation: evaluation
     };
     FetchUtil.postWithWarning(this.endpoint, payload, {
       warningText: "Are you sure you want to create this conditional?",