Merge branch 'laborReleaseFormAdmin' of https://github.com/BCStudentSoftwareDevTeam/lsf into laborReleaseFormAdmin

Author: RueHaile

app/controllers/admin_routes/adminManagement.py

@@ -8,7 +8,7 @@
 from app.models.student import Student
 from app.logic.tracy import Tracy
 from app.logic.userInsertFunctions import createStudentFromTracy, createSupervisorFromTracy, createUser
-from app.logic.adminManagement import searchForAdmin,  getUser, addAdmin, removeAdmin
+from app.logic.adminManagement import searchForAdmin, getUser
 from app.logic.utils import adminFlashMessage
 
 
@@ -25,7 +25,9 @@ def admin_Management():
         elif currentUser.supervisor:
             return render_template('errors/403.html'), 403
 
-    users = User.select()
+    users = (User.select(User,Supervisor,Student)
+                .join(Supervisor,join_type=JOIN.LEFT_OUTER).switch()
+                .join(Student,join_type=JOIN.LEFT_OUTER))
     return render_template( 'admin/adminManagement.html',
                             title=('Admin Management'),
                             users = users
@@ -47,35 +49,43 @@ def adminSearch():
 
 @admin.route("/adminManagement/userInsert", methods=['POST'])
 def manageLaborAdmin():
-    if request.form.get("addAdmin"):
-        newAdmin = getUser('addAdmin')
-        addAdmin(newAdmin, 'labor')
-        adminFlashMessage(newAdmin, 'added', 'Labor')
+    actionMap = {
+    "addLaborAdmin":     {"selectPickerID": "addAdmin",                "type": "Labor",        "action": "add",    "pretty": "Labor"},
+    "removeLaborAdmin":  {"selectPickerID": "removeAdmin",             "type": "Labor",        "action": "remove", "pretty": "Labor"},
+    "addFinAidAdmin":    {"selectPickerID": "addFinancialAidAdmin",    "type": "FinancialAid", "action": "add",    "pretty": "Financial Aid"},
+    "removeFinAidAdmin": {"selectPickerID": "removeFinancialAidAdmin", "type": "FinancialAid", "action": "remove", "pretty": "Financial Aid"},
+    "addSaasAdmin":      {"selectPickerID": "addSAASAdmin",            "type": "Saas",         "action": "add",    "pretty": "SAAS"},
+    "removeSaasAdmin":   {"selectPickerID": "removeSAASAdmin",         "type": "Saas",         "action": "remove", "pretty": "SAAS"},
+    }    
 
-    elif request.form.get("removeAdmin"):
-        oldAdmin = getUser('removeAdmin')
-        removeAdmin(oldAdmin, 'labor')
-        adminFlashMessage(oldAdmin, 'removed', 'Labor')
+    key = request.form.get('action')
+    meta = actionMap[key]
+    user = getUser(actionMap[key]['selectPickerID'])
 
-    elif request.form.get("addFinancialAidAdmin"):
-        newAdmin = getUser('addFinancialAidAdmin')
-        addAdmin(newAdmin, 'finAid')
-        adminFlashMessage(newAdmin, 'added', 'Financial Aid')
-
-    elif request.form.get("removeFinancialAidAdmin"):
-        oldAdmin = getUser('removeFinancialAidAdmin')
-        removeAdmin(oldAdmin, 'finAid')
-        adminFlashMessage(oldAdmin, 'removed', 'Financial Aid')
+    # pick addAdmin or removeAdmin dynamically
+    if meta['action'] == 'add':
+        addAdmin(user, meta['type'])
+    else:
+        removeAdmin(user, meta['type'])
+    
+    flashMessage(user, 
+                    'added' if meta["action"] == "add" else 'removed', 
+                    meta["pretty"])
+             
+    return redirect(url_for('admin.admin_Management'))
 
-    elif request.form.get("addSAASAdmin"):
-        newAdmin = getUser('addSAASAdmin')
-        addAdmin(newAdmin, 'saas')
-        adminFlashMessage(newAdmin, 'added', 'SAAS')
+def addAdmin(user, adminType):
+    setattr(user, f"is{adminType}Admin", True)
+    user.save()
 
-    elif request.form.get("removeSAASAdmin"):
-        oldAdmin = getUser('removeSAASAdmin')
-        removeAdmin(oldAdmin, 'saas')
-        adminFlashMessage(oldAdmin, 'removed', 'SAAS')
+def removeAdmin(user, adminType):
+    setattr(user, f"is{adminType}Admin", False)
+    user.save()
 
-    return redirect(url_for('admin.admin_Management'))
+def flashMessage(user, action, adminType):
+    message = "{} has been {} as a {} Admin".format(user.fullName, action, adminType)
 
+    if action == 'added':
+        flash(message, "success")
+    elif action == 'removed':
+        flash(message, "danger")

app/controllers/admin_routes/allPendingForms.py

@@ -317,6 +317,7 @@ def finalUpdateStatus(raw_status):
         print("Unknown status: ", raw_status)
         return jsonify({"success": False})
 
+    flash("Forms have been successfully updated.", "success")
     form_ids = eval(request.data.decode("utf-8"))
     return saveStatus(new_status, form_ids, currentUser)
 
@@ -496,7 +497,6 @@ def modalFormUpdate():
                 conn = Banner()
                 save_form_status = conn.insert(historyForm)
 
-
             # if we are able to save
             if save_form_status:
                 # This try is to handle Overload Forms

app/controllers/admin_routes/emailTemplateController.py

@@ -32,7 +32,7 @@ def getEmailArray():
                         "audience": template.audience,
                         "formType": template.formType,
                         "action": template.action
-            } for template in EmailTemplate.select()])
+            } for template in templates])
 
 @admin.route('/admin/emailTemplates/getPurpose/<fieldsDictSTR>', methods=['GET'])
 

app/controllers/main_routes/laborHistory.py

@@ -57,11 +57,34 @@ def laborhistory(id):
                 if len(authorizedForms) == 0:
                     return render_template('errors/403.html'), 403
 
-        
         authorizedForms = Term.order_by_term(list(authorizedForms.objects()), reverse=True)
         downloadId = saveFormSearchResult("Labor History", authorizedForms, "studentHistory")
 
         laborStatusFormList = ','.join([str(form.formID.laborStatusFormID) for form in studentForms])
+        # modify status display for overload and release forms
+        formIds = [form.formID for form in authorizedForms]
+
+        relatedForms = (FormHistory.select().where(
+                     (FormHistory.formID.in_(formIds)) &
+                     ((FormHistory.releaseForm.is_null(False)) | (FormHistory.overloadForm.is_null(False)) | (FormHistory.adjustedForm.is_null(False)))
+                 ))
+
+        formMap = {form.formID.laborStatusFormID: form for form in authorizedForms}
+
+        # initialize displayStatus with each form's base status
+        for form in authorizedForms:
+            form.displayStatus = str(form.status)
+        # iterate once over relatedForms and update each form displayStatus
+        for related in relatedForms:
+            form = formMap.get(related.formID.laborStatusFormID)
+
+            if related.overloadForm:
+                form.displayStatus = "Overload " + str(related.status)
+            if related.adjustedForm:
+                form.displayStatus = "Adjustment " + str(related.status)
+            if related.releaseForm:
+                form.displayStatus = "Release Pending" if str(related.status) == "Pending" else "Released"
+
         return render_template('main/formHistory.html',
     				            title=('Labor History'),
                                 student = student,

app/controllers/main_routes/laborReleaseForm.py

@@ -24,7 +24,6 @@ def laborReleaseForm(laborStatusKey):
     if not currentUser.isLaborAdmin:       # Not an admin
         if currentUser.student and not currentUser.supervisor:
             return redirect('/laborHistory/' + currentUser.student.ID)
-
     forms = LaborStatusForm.select().distinct().where(LaborStatusForm.laborStatusFormID == laborStatusKey)
     laborAdmins = (User.select(User, Supervisor).join(Supervisor)
                        .where(User.isLaborAdmin == True)
@@ -58,6 +57,7 @@ def laborReleaseForm(laborStatusKey):
             email.laborReleaseFormSubmitted(releaseContactUsername, releaseContactFullName)
 
 
+
             # Once all the forms are created, the user gets redirected to the
             # home page and gets a flash message telling them the forms were
             # submiteds

app/controllers/main_routes/main_routes.py

@@ -127,6 +127,4 @@ def submitToBanner(formHistoryId):
     if save_form_status:
         return "Form successfully submitted to Banner.", 200
     else:
-        return "Submitting to Banner failed.", 500
-
-
+        return "Submitting to Banner failed.", 500

app/logic/emailHandler.py

@@ -32,7 +32,7 @@ def __init__(self, formHistoryKey):
         self.date = self.laborStatusForm.startDate.strftime("%m/%d/%Y")
         self.weeklyHours = str(self.laborStatusForm.weeklyHours)
         self.contractHours = str(self.laborStatusForm.contractHours)
-
+        self.adminName = ""
         self.positions = LaborStatusForm.select().where(LaborStatusForm.termCode == self.term, LaborStatusForm.studentSupervisee == self.student)
         self.supervisors = []
         for position in self.positions:
@@ -102,7 +102,6 @@ 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)
             self.mail.send(message)
 
         elif app.config['ENV'] == 'testing':
@@ -138,6 +137,43 @@ def laborStatusFormSubmitted(self):
             self.checkRecipient("Labor Status Form Submitted For Student",
                           "Primary Position Labor Status Form Submitted")
 
+    def statusResendEmail(self):
+        """
+        Sends email to labor supervisor and student when LSF is expired.
+        """
+
+        lsfID = self.laborStatusForm.laborStatusFormID
+        expired = self.laborStatusForm.isExpired
+        if not expired:
+            return
+        supervisorTemplate = EmailTemplate.get_or_none(
+            EmailTemplate.purpose == "Email when Labor Status Form is expired to Supervisor"
+        )
+        studentTemplate = EmailTemplate.get_or_none(
+            EmailTemplate.purpose == "Email when Labor Status Form is expired to Student"
+        )
+        if not supervisorTemplate or not studentTemplate:
+            return
+        try:
+            Presentday = date.today()  
+            already_sent = (EmailTracker
+                            .select()
+                            .where(
+                                (EmailTracker.formID == lsfID) &
+                                ((EmailTracker.subject == supervisorTemplate.subject) | (EmailTracker.subject == studentTemplate.subject)) &
+                                (EmailTracker.date == Presentday)  
+                            )
+                            .exists())
+            if already_sent:
+                return
+        except Exception as e:
+            print(f"Check failed for LSF{lsfID}: {e}. Proceeding to send.")
+        self.checkRecipient(
+            studentEmailPurpose=studentTemplate.purpose,
+            emailPurpose=supervisorTemplate.purpose,
+            secondaryEmailPurpose=None
+        )
+
     def laborStatusFormApproved(self):
         if self.laborStatusForm.jobType == 'Secondary':
             if self.term.isBreak:
@@ -173,7 +209,7 @@ def laborStatusFormAdjusted(self, newSupervisor=False):
     def laborReleaseFormSubmitted(self, adminUserName=None, adminName=None):
         self.adminName = adminName
         self.adminEmail = adminUserName + "@berea.edu"
-        emailTemplate = EmailTemplate.get(EmailTemplate.purpose == "Labor Release Form Admin Notification")
+        emailTemplate = EmailTemplate.get(EmailTemplate.purpose == "Labor Release Form Admin Notification") 
         self.checkRecipient("Labor Release Form Submitted For Student",
                       "Labor Release Form Submitted For Supervisor")
         self.sendEmail(emailTemplate, "admin")

app/logic/getTableData.py

@@ -62,7 +62,11 @@ def getDatatableData(request):
     for field, value in fieldValueMap.items():
         if value != "" and value:
             if type(value) is list:
-                clauses.append(field.in_(value))
+                if field == FormHistory.historyType:
+                    if "Labor Status Form" not in value:
+                        clauses.append(field.in_(value))    # if "original" is selected, we include all forms, so no need to filter by historyType
+                else:
+                    clauses.append(field.in_(value))
             elif field is StudentLaborEvaluation.ID:
                 sleJoin=value[0]
             else:
@@ -126,18 +130,16 @@ def getFormattedData(filteredSearchResults, view ='simple'):
     '''
     if view == "simple":
         formattedData = {}
-        todaysDate = date.today()
         filteredSearchResults.order_by(FormHistory.formID.startDate.desc())
         isMostCurrent = False
         for form in filteredSearchResults:
-            startDate = form.formID.startDate
-            endDate = form.formID.endDate
+            createdDate = form.createdDate
             bNumber = form.formID.studentSupervisee.ID
             if bNumber not in formattedData:
                 absentInFormatting = True
             else:
                 absentInFormatting = False 
-                isMostCurrent = (startDate > formattedData[bNumber][1]) or (startDate <= todaysDate <= endDate)
+                isMostCurrent = (createdDate > formattedData[bNumber][1])
             if absentInFormatting or isMostCurrent:
 
                 # html fields
@@ -148,20 +150,31 @@ def getFormattedData(filteredSearchResults, view ='simple'):
                 departmentName = form.formID.department.DEPT_NAME
                 statusFormId = form.formID.laborStatusFormID
 
+                # determine display status for each student
+                formStatus = str(form.status)
+                displayStatus = formStatus
+
+                if form.adjustedForm is not None:
+                    displayStatus = "Adjustment " + formStatus
+                if form.overloadForm is not None:
+                    displayStatus = "Overload " + formStatus
+                if form.releaseForm is not None:
+                    displayStatus = "Release Pending" if formStatus == "Pending" else "Released"
+
                 html = f"""
                 <a href="/laborHistory/{bNumber}">
                     <span class="h4">{firstName} {lastName} ({bNumber})</span>
                 </a>
-                <span class="pushRight">{form.status}</span>
+                <span class="pushRight">{displayStatus}</span>
                 <br>
                 <span class="pushLeft h6">
                     {term} - <a><span onclick=loadFormHistoryModal({statusFormId})>{positionTitle} ({jobType})</span></a> - {departmentName}
                 </span>
                 """
 
-                formattedData[bNumber] = (html, startDate, endDate)
-
-        formattedDataList = [[value] for value, _, _ in formattedData.values()]
+                formattedData[bNumber] = (html, createdDate)
+            
+        formattedDataList = [[value] for value, _S in formattedData.values()]
 
         return formattedDataList
 

app/logic/utils.py

@@ -27,6 +27,6 @@ def adminFlashMessage(user, action, adminType):
     elif action == 'removed':
         flash(message, "danger") 
 
-# This function calculates the expiration date for a student confirmation and the total date is 30 days from now at 11:59:59 PM
+# This function calculates the expiration date for a student confirmation and the total date based on the number of days set in the secret config from now at 11:59:59 PM
 def calculateExpirationDate():
     return datetime.combine(datetime.now() + timedelta(app.config["student_confirmation_days"]),time(23, 59, 59))