526 contrasting confirmation messages

app/controllers/admin_routes/adminManagement.py

@@ -76,7 +76,7 @@ def manageLaborAdmin():
 
 def addAdmin(user, adminType):
     setattr(user, f"is{adminType}Admin", True)
-    user.save()
+    user.save() 
 
 def removeAdmin(user, adminType):
     setattr(user, f"is{adminType}Admin", False)

app/controllers/main_routes/laborStatusForm.py

@@ -3,6 +3,7 @@
 from app.controllers.main_routes import *
 from app.login_manager import require_login
 from app.models.user import *
+from app.models import mainDB
 from app.models.status import *
 from app.models.laborStatusForm import *
 from app.models.overloadForm import *
@@ -73,31 +74,22 @@ def userInsert():
     rspFunctional = json.loads(rsp)
     all_forms = []
     for i in range(len(rspFunctional)):
-
-        # Get a student record for the given bnumber
-        try:
-            student = getOrCreateStudentRecord(bnumber=rspFunctional[i]['stuBNumber'])
-            supervisor = createSupervisorFromTracy(bnumber=rspFunctional[i]['stuSupervisorID'])
-        except InvalidUserException as e:
-            print(e)
-            return "", 500
-
-        department, created = Department.get_or_create(DEPT_NAME = rspFunctional[i]['stuDepartment'])
-        term, created = Term.get_or_create(termCode = rspFunctional[i]['stuTermCode'])
         try:
-            lsf = createLaborStatusForm(student, supervisor.ID, department.departmentID, term, rspFunctional[i])
-            createOverloadFormAndFormHistory(rspFunctional[i], lsf, currentUser, host=request.host) 
-            try:
+            with mainDB.atomic():
+                # Get a student record for the given bnumber
+                student = getOrCreateStudentRecord(bnumber=rspFunctional[i]['stuBNumber'])
+                supervisor = createSupervisorFromTracy(bnumber=rspFunctional[i]['stuSupervisorID'])
+                department, created = Department.get_or_create(DEPT_NAME = rspFunctional[i]['stuDepartment'])
+                term, created = Term.get_or_create(termCode = rspFunctional[i]['stuTermCode'])
+                lsf = createLaborStatusForm(student, supervisor.ID, department.departmentID, term, rspFunctional[i])
+                createOverloadFormAndFormHistory(rspFunctional[i], lsf, currentUser, host=request.host) 
                 emailDuringBreak(checkForSecondLSFBreak(term.termCode, student.ID), term)
-            except Exception as e:
-                print("Error when sending emails during break: " + str(e))
-
+
             all_forms.append(True)
         except Exception as e:
+            print("ERROR on creating Labor Status Form/Overload Form" + str(e)) 
             all_forms.append(False)
-            print("ERROR on creating Labor Status Form/Overload Form" + str(e))
 
-    flash("Form(s) submitted successfully! They will be eligible for approval in one business day.", "success")
     return jsonify(all_forms)
 
 @main_bp.route("/laborstatusform/getDate/<termcode>", methods=['GET'])

app/logic/emailHandler.py

@@ -16,7 +16,7 @@
 from app import app
 import os
 from datetime import datetime, date
-
+from app.logic.utils import makeThirdPartyLink
 
 class emailHandler():
     def __init__(self, formHistoryKey):

app/logic/statusFormFunctions.py

@@ -57,41 +57,43 @@ def createOverloadFormAndFormHistory(rspFunctional, lsf, creatorID, host=None):
     """
     # We create a 'Labor Status Form' first, then we check to see if a 'Labor Overload Form'
     # needs to be created
-    isOverload = rspFunctional.get("isItOverloadForm") == "True"
-    if isOverload:
-        newLaborOverloadForm = OverloadForm.create( studentOverloadReason = None,
-                                                    financialAidApproved = None,
-                                                    financialAidApprover = None,
-                                                    financialAidReviewDate = None,
-                                                    SAASApproved = None,
-                                                    SAASApprover = None,
-                                                    SAASReviewDate = None,
-                                                    laborApproved = None,
-                                                    laborApprover = None,
-                                                    laborReviewDate = None)
-        formOverload = FormHistory.create( formID = lsf.laborStatusFormID,
-                                            historyType = "Labor Overload Form",
-                                            overloadForm = newLaborOverloadForm.overloadFormID,
-                                            createdBy   = creatorID,
-                                            createdDate = date.today(),
-                                            status      = "Pre-Student Approval")
-        email = emailHandler(formOverload.formHistoryID)
-        link = makeThirdPartyLink("student", host, formOverload.formHistoryID)
-        email.LaborOverLoadFormSubmitted(link)
-
-    formHistory = FormHistory.create( formID = lsf.laborStatusFormID,
-                        historyType = "Labor Status Form",
-                        overloadForm = None,
-                        createdBy   = creatorID,
-                        createdDate = date.today(),
-                        status      = "Pre-Student Approval")
+    try:
+        isOverload = rspFunctional.get("isItOverloadForm") == "True"
+        if isOverload:
+            newLaborOverloadForm = OverloadForm.create( studentOverloadReason = None,
+                                                        financialAidApproved = None,
+                                                        financialAidApprover = None,
+                                                        financialAidReviewDate = None,
+                                                        SAASApproved = None,
+                                                        SAASApprover = None,
+                                                        SAASReviewDate = None,
+                                                        laborApproved = None,
+                                                        laborApprover = None,
+                                                        laborReviewDate = None)
+            formOverload = FormHistory.create( formID = lsf.laborStatusFormID,
+                                                historyType = "Labor Overload Form",
+                                                overloadForm = newLaborOverloadForm.overloadFormID,
+                                                createdBy   = creatorID,
+                                                createdDate = date.today(),
+                                                status      = "Pre-Student Approval")
+            email = emailHandler(formOverload.formHistoryID)
+            link = makeThirdPartyLink("student", host, formOverload.formHistoryID)
+            email.LaborOverLoadFormSubmitted(link)
 
-    if not formHistory.formID.termCode.isBreak and not isOverload:
-        email = emailHandler(formHistory.formHistoryID)
-        email.laborStatusFormSubmitted()
+        formHistory = FormHistory.create( formID = lsf.laborStatusFormID,
+                            historyType = "Labor Status Form",
+                            overloadForm = None,
+                            createdBy   = creatorID,
+                            createdDate = date.today(),
+                            status      = "Pre-Student Approval")
 
-    return formHistory
+        if not formHistory.formID.termCode.isBreak and not isOverload:
+            email = emailHandler(formHistory.formHistoryID)
 
+        return formHistory
+    except Exception as e:
+        print("Error creating overload form:", e)
+        raise 
 
 
 def checkForSecondLSFBreak(termCode, student):
@@ -223,13 +225,18 @@ def emailDuringBreak(secondLSFBreak, term):
     """
     Sending emails during break period
     """
-    if term.isBreak:
-        isOneLSF = json.loads(secondLSFBreak)
-        formHistory = FormHistory.get(FormHistory.formHistoryID == isOneLSF['formHistoryID'])
-        email = emailHandler(formHistory.formHistoryID)
-        email.laborStatusFormSubmitted()
-        if(len(isOneLSF["previousSupervisorNames"]) > 1): #Student has more than one lsf. Send email to both supervisors and student
-            email.notifyAdditionalLaborStatusFormSubmittedForBreak()
+    try: 
+        if term.isBreak:
+            isOneLSF = json.loads(secondLSFBreak)
+            formHistory = FormHistory.get(FormHistory.formHistoryID == isOneLSF['formHistoryID'])
+            email = emailHandler(formHistory.formHistoryID)
+            email.laborStatusFormSubmitted()
+            if(len(isOneLSF["previousSupervisorNames"]) > 1): #Student has more than one lsf. Send email to both supervisors and student
+                email.notifyAdditionalLaborStatusFormSubmittedForBreak()
+    except Exception as e:
+        print("Error sending email during break:", e)
+        raise
+
 
 
 def createOverloadForm(newWeeklyHours, lsf, currentUser, adjustedForm=None,  formHistories=None, host=None):

app/models/__init__.py

@@ -1,8 +1,9 @@
+from app import app
 import os
-
 from peewee import *
+from flask_sqlalchemy import SQLAlchemy
+db = SQLAlchemy(app)
 
-from app import app
 
 def getMySQLDB():
     if os.environ.get("USING_CONTAINER", False):