527 student reasons

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python-envs.pythonProjects": [],
+    "python-envs.defaultEnvManager": "ms-python.python:system"
+}

README.md

@@ -69,4 +69,4 @@ If you want to test with actual emails, use an email other than outlook to test
 1. Set up two factor authentication on your Gmail (Security Settings)
 2. Create an App Password through your Gmail. This 16 character password can only be viewed once, so make sure to save it. (NOTE: You won't have the option to create an app password unless step one is completed)
 3. Inside of your secret_config.yaml file set the MAIL_USERNAME and MAIL_DEFAULT_SENDER as your Gmail, set the MAIL_PASSWORD as your new app password as, and set ALWAYS_SEND_MAIL as True. If you want emails to go to their real recipients, remove MAIL_OVERRIDE_ALL from your config or set it to "".
-4. For testing purposes, change the email of the student and supervisor to match another email that can receive your test emails (or you can use MAIL_OVERRIDE_ALL to send everything to the address specified.
+4. For testing purposes, change the email of the student and supervisor to match another email that can receive your test emails (or you can use MAIL_OVERRIDE_ALL to send everything to the address specified.

app.py

@@ -21,8 +21,8 @@
   PORT  = 8080
 
 if __name__ == "__main__":
-    # Print statements go to your log file in production; to your console while developing
-    print ("Running server at http://{0}:{1}/".format(IP, PORT))
+    #  statements go to your log file in production; to your console while developing
+
     app.run(host = IP, port = PORT, debug = True, threaded = True)
 
 # The next logical place to look is the app/__init__.py file...

app/__init__.py

@@ -18,6 +18,7 @@
 if 'use_banner' not in app.config.keys():
     app.config['use_banner'] = (app.config['ENV'] in ('production','staging'))
 
+
 # Record and output queries if requested
 from flask import session
 from peewee import BaseQuery
@@ -29,9 +30,10 @@ def new_execute(*args, **kwargs):
                 session['querycount'] = 0
 
             session['querycount'] += 1
-            if app.config.get('show_queries'): # in case we selectively disable
+            if app.config.get('show_queries'):
                 print("**Running query {}**".format(session['querycount']))
-                print(args[0])
+                print(args[0])# in case we selectively disable
+                (args[0])
         return old_execute(*args, **kwargs)
     BaseQuery.execute = new_execute
 

app/controllers/admin_routes/allPendingForms.py

@@ -190,6 +190,7 @@ def allPendingForms(formType):
 
 @admin.route('/admin/pendingForms/download', methods=['POST'])
 def downloadAllPendingForms():
+    currentUser = require_login()
     searchResult = retrieveFormSearchResult(request.form.get('downloadId'))
     if not searchResult:
         print(f"[ERROR] Missing or invalid download id was provided by the user.")
@@ -558,6 +559,7 @@ def sendEmail():
                 email = emailHandler(historyForm.formHistoryID)
                 link = makeThirdPartyLink("student", request.host, rsp['formHistoryID'])
                 email.LaborOverloadFormStudentReminder(link)
+
 
             else:
                 if rsp['emailRecipient'] == 'SAASEmail':

app/controllers/main_routes/alterLSF.py

@@ -14,7 +14,7 @@
 from app.models.supervisor import Supervisor
 from app.login_manager import require_login
 from app.logic.alterLSF import modifyLSF, adjustLSF
-
+from app.logic.utils import makeThirdPartyLink
 
 @main_bp.route("/alterLSF/<laborStatusKey>", methods=["GET"])
 def alterLSF(laborStatusKey):
@@ -153,10 +153,11 @@ def submitAlteredLSF(laborStatusKey):
             for formHistory in formHistoryIDs:
                 try:
                     email = emailHandler(formHistory)
+                    link = makeThirdPartyLink("studentAdjustment", request.host, formHistory)
                     if "supervisor" in fieldsChanged:
                         email.laborStatusFormAdjusted(fieldsChanged["supervisor"]["newValue"])
                     else:
-                        email.laborStatusFormAdjusted()
+                        email.laborStatusFormAdjusted(link)
                 except Exception as e:
                     print("An error occured while attempting to send adjustment form emails: ", e)
                 message = "Your labor adjustment form(s) for {0} {1} have been submitted.".format(student.studentSupervisee.FIRST_NAME, student.studentSupervisee.LAST_NAME)

app/controllers/main_routes/laborStatusForm.py

@@ -90,7 +90,7 @@ def userInsert():
             try:
                 emailDuringBreak(checkForSecondLSFBreak(term.termCode, student.ID), term)
             except Exception as e:
-                print("Error when sending emails during break: " + str(e))
+                ("Error when sending emails during break: " + str(e))
 
             all_forms.append(True)
         except Exception as e:

app/controllers/main_routes/studentOverloadApp.py

@@ -18,6 +18,7 @@
 def studentOverloadApp(formHistoryId):
     currentUser = require_login()
     overloadForm = FormHistory.get_by_id(formHistoryId)
+    AdjustmentForm = FormHistory.get_by_id(formHistoryId)
     if not currentUser.isLaborAdmin:
         if not currentUser:        # Not logged in
             return render_template('errors/403.html'), 403
@@ -84,10 +85,26 @@ def studentOverloadApp(formHistoryId):
                 totalCurrentHours += j.formID.weeklyHours
     totalFormHours = totalCurrentHours + prefillHoursOverload
 
+    adjusted_change = AdjustmentForm.adjustedForm
+
+    field_name = adjusted_change.fieldAdjusted
+    old_value  = adjusted_change.oldValue
+    new_value  = adjusted_change.newValue
+
+    if field_name == "department":
+        old_dept = Department.get(Department.ORG == old_value)
+        new_dept = Department.get(Department.ORG == new_value)
+        old_value = old_dept.DEPT_NAME
+        new_value = new_dept.DEPT_NAME
+
+
     return render_template( 'main/studentOverloadApp.html',
 				            title=('student Overload Application'),
                             username = currentUser,
                             overloadForm = overloadForm,
+                            field_name = field_name,
+                            old_value = old_value,
+                            new_value = new_value,
                             prefillStudentName = prefillStudentName,
                             prefillStudentBnum = prefillStudentBnum,
                             prefillStudentCPO = prefillStudentCPO,
@@ -99,14 +116,15 @@ def studentOverloadApp(formHistoryId):
                             currentPrimary = formIDPrimary,
                             currentSecondary = formIDSecondary,
                             totalCurrentHours = totalCurrentHours,
-                            totalFormHours = totalFormHours
+                            totalFormHours = totalFormHours,
                           )
 
+
 @main_bp.route('/studentOverloadApp/withdraw/<formHistoryId>', methods=['POST'])
 def withdrawRequest(formHistoryId):
     formHistory = FormHistory.get_by_id(formHistoryId)
     if formHistory.historyType_id != "Labor Overload Form":
-        print("Somehow we reached a non-overload form history entry ({formHistoryId}) from studentOverloadApp.")
+        ("Somehow we reached a non-overload form history entry ({formHistoryId}) from studentOverloadApp.")
         abort(500)
 
     # send a withdrawal notification to student and supervisor
@@ -126,18 +144,39 @@ def withdrawRequest(formHistoryId):
 def updateDatabase(overloadFormHistoryID):
     try:
         overloadReason = request.form.get('overloadReason')
+
+
         if not overloadReason:
             abort(500)
 
-        oldStatus = Status.get(Status.statusName == "Pre-Student Approval")
+
+        # if status is pending that means we have an adjustment 
+        # if status is "pre-student then it means we have an overload"
+        oldStatus = Status.get((Status.statusName == "Pre-Student Approval"))
+
+
+
         newStatus = Status.get(Status.statusName == "Pending")
 
+
         overloadFormHistory = FormHistory.get(FormHistory.formHistoryID == overloadFormHistoryID)
+
+
+
+
         originalFormHistory = (FormHistory.select()
                                            .where(FormHistory.formID == overloadFormHistory.formID)
                                            .where(FormHistory.status == oldStatus)
-                                           .where(FormHistory.historyType_id == "Labor Status Form")).get()
-
+                                           .where(FormHistory.historyType_id.in_([
+                                               "Labor Status Form",
+                                               "Labor Overload Form",
+                                               "Labor Adjustment Form",
+                                           ]))
+                                           ).get()
+
+
+
+
         with mainDB.atomic() as transaction:
             # Update statuses
             overloadFormHistory.status = newStatus
@@ -150,10 +189,23 @@ def updateDatabase(overloadFormHistoryID):
             originalFormHistory.formID.studentConfirmation = True
             originalFormHistory.formID.save()
 
-            # Update overload form
+
             overloadForm = overloadFormHistory.overloadForm
-            overloadForm.studentOverloadReason = overloadReason
-            overloadForm.save()
+
+
+
+            if overloadForm is None: 
+                overloadForm = OverloadForm.create(studentOverloadReason=overloadReason)
+                overloadForm.studentOverloadReason = overloadReason   
+                overloadFormHistory.overloadForm = overloadForm 
+                overloadFormHistory.save() 
+
+            else: 
+                overloadForm.studentOverloadReason = overloadReason 
+                overloadForm.save()
+
+
+
 
             email = emailHandler(overloadFormHistory.formHistoryID)
             link = makeThirdPartyLink("Financial Aid", request.host, overloadFormHistory.formHistoryID)

app/controllers/main_routes/studentResponse.py

@@ -17,6 +17,7 @@ def confirm():
                             .join(FormHistory)
                             .where(LaborStatusForm.confirmationToken == token
                                    ,LaborStatusForm.studentSupervisee == g.currentUser.student))
+
     try:
         form = forms.get()
     except DoesNotExist as e:

app/logic/emailHandler.py

@@ -90,7 +90,7 @@ def __init__(self, formHistoryKey):
             # is the 'AttributeError' error. We expect to get the 'AttributeError',
             # but if we get anything else then we want to print the error
             if e.__class__.__name__ != "AttributeError":
-                print (e)
+                print(e)
 
     def send(self, message: Message):
         if app.config['ENV'] == 'production' or app.config['ALWAYS_SEND_MAIL']:
@@ -101,7 +101,7 @@ def send(self, message: Message):
                 message.recipients = [app.config['MAIL_OVERRIDE_ALL']]
 
             message.reply_to = app.config["REPLY_TO_ADDRESS"]
-            # print("Debugging emailHandler.py: ", app.config)
+            print("Debugging emailHandler.py: ", app.config)
             self.mail.send(message)
 
         elif app.config['ENV'] == 'testing':
@@ -163,7 +163,8 @@ def laborStatusFormRejected(self):
             self.checkRecipient("Labor Status Form Rejected For Student",
                           "Primary Position Labor Status Form Rejected")
 
-    def laborStatusFormAdjusted(self, newSupervisor=False):
+    def laborStatusFormAdjusted(self, link, newSupervisor=False):
+        self.link = link
         self.checkRecipient("Labor Status Form Adjusted For Student",
                       "Labor Status Form Adjusted For Supervisor")
         if newSupervisor:
@@ -382,3 +383,4 @@ def replaceText(self, form):
         if self.laborStatusForm.studentExpirationDate: # handle old cases where we might not have a date
             form = form.replace("@@StudentConfirmationExpiration@@", self.laborStatusForm.studentExpirationDate.strftime("%B %d, %Y"))
         return(form)
+

app/logic/statusFormFunctions.py

@@ -78,6 +78,7 @@ def createOverloadFormAndFormHistory(rspFunctional, lsf, creatorID, host=None):
         email = emailHandler(formOverload.formHistoryID)
         link = makeThirdPartyLink("student", host, formOverload.formHistoryID)
         email.LaborOverLoadFormSubmitted(link)
+
 
     formHistory = FormHistory.create( formID = lsf.laborStatusFormID,
                         historyType = "Labor Status Form",
@@ -280,8 +281,6 @@ def createOverloadForm(newWeeklyHours, lsf, currentUser, adjustedForm=None,  for
     # This will delete an overload form after the hours are changed
     elif previousTotalHours > 15 and newTotalHours <= 15:  # If we were overloading and now we aren't
             print(f"Trying to get formhistory with formID '{lsf.laborStatusFormID}' and history type: 'Labor Overload Form'")
-            # XXX this breaks if the overload was attached to a different form. ie, this form is the 
-            #     primary, but a secondary is what triggered the overload process
             deleteOverloadForm = FormHistory.get((FormHistory.formID == lsf.laborStatusFormID) & (FormHistory.historyType == "Labor Overload Form"))
             deleteOverloadForm = OverloadForm.get(OverloadForm.overloadFormID == deleteOverloadForm.overloadForm_id)
             deleteOverloadForm.delete_instance()  # This line also deletes the Form History since it's set to cascade up in the model file

app/logic/userInsertFunctions.py

@@ -175,7 +175,7 @@ def createStudentFromTracy(username=None, bnumber=None):
     try:
         return Student.get(Student.ID == tracyStudent.ID.strip())
     except DoesNotExist:
-        #print('Could not find {0} {1} in Student table, creating new entry.'.format(tracyStudent.FIRST_NAME, tracyStudent.LAST_NAME))
+        print('Could not find {0} {1} in Student table, creating new entry.'.format(tracyStudent.FIRST_NAME, tracyStudent.LAST_NAME))
         return Student.create(ID = tracyStudent.ID.strip(),
                             PIDM = tracyStudent.PIDM,
                             legal_name = tracyStudent.FIRST_NAME,

app/logic/utils.py

@@ -12,6 +12,8 @@ def makeThirdPartyLink(recipient, host, formHistoryId):
         route = "admin/financialAidOverloadApproval"
     if recipient == 'student':
         route = "studentOverloadApp"
+    if recipient == "studentAdjustment":    
+        route = "studentOverloadApp"
 
     return f"http://{host}/{route}/{formHistoryId}"
 

app/login_manager.py

@@ -41,7 +41,7 @@ def require_login():
     user = updateUserFromTracy(user)
 
     if 'username' not in session:
-        print("Logging in as", user.username)
+        ("Logging in as", user.username)
         session['username'] = user.username
 
     return user
@@ -63,13 +63,10 @@ def auth_user(env, username):
         description = env['description'].lower()
         supervisor = student = None
         if description == 'student':
-            print("Adding {} to student table".format(username))
             student = createStudentFromTracy(username)
         else:
-            print("Adding {} to supervisor table".format(username))
             supervisor = createSupervisorFromTracy(username)
 
-        print("Creating record for {} in user table".format(username))
         return createUser(username, student=student, supervisor=supervisor)
 
 def getOpenTerm():

app/models/adjustedForm.py

@@ -8,3 +8,4 @@ class AdjustedForm(baseModel):
     oldValue                = CharField()
     newValue                = CharField()
     effectiveDate           = DateField()
+

app/static/js/ckeditor/LICENSE.md

@@ -179,8 +179,8 @@ above, provided that you also meet all of these conditions:
     a warranty) and that users may redistribute the program under
     these conditions, and telling the user how to view a copy of this
     License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    does not normally  such an announcement, your work based on
+    the Program is not required to print  an announcement.)
 
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,

app/static/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css

@@ -311,7 +311,7 @@ div.CodeMirror-cursors {
 /* Used to force a border model for a node */
 .cm-force-border { padding-right: .1px; }
 
-@media print {
+@media  {
   /* Hide the cursor when printing */
   .CodeMirror div.CodeMirror-cursors {
     visibility: hidden;