Manage Departments Page Update

app/controllers/admin_routes/manage_departments.py

@@ -1,50 +1,106 @@
 from app.controllers.admin_routes import *
+from app.models import term
+from app.models.formHistory import FormHistory
 from app.models.user import *
 from app.models.supervisorDepartment import SupervisorDepartment
 from app.login_manager import require_login
 from app.logic.search import getSupervisorsForDepartment
 from app.controllers.admin_routes import admin
 from app.controllers.errors_routes.handlers import *
-#from app.models.manageDepartments import *
 from app.models.term import *
 from flask_bootstrap import bootstrap_find_resource
 from app.models.department import *
+from app.models.allocation import *
+from app.models.laborStatusForm import * #Do we need to import all?
 from flask import request, redirect
 from flask import jsonify
 from playhouse.shortcuts import model_to_dict
 from app.logic.tracy import Tracy
+from datetime import date
+from flask import g
+from app.logic.manageDepartments import * # Reorganize imports to avoid circular import issues.  This is a temporary fix, but it works for now.
+from app.controllers.admin_routes.termManagement import createTerms
+
+
+
+@admin.route('/admin/manageDepartments/', methods=['GET'])
+@admin.route('/admin/manageDepartments/<academicYear>', methods=['GET']) # FIXME: The default value year should be the current academic year (Rather than waiting to be clicked it should be on the current year by default).
 
-@admin.route('/admin/manageDepartments', methods=['GET'])
 # @login_required
-def manage_departments():
+def manage_departments(academicYear = None):
     """
     Updates the Labor Status Forms database with any new departments in the Tracy database on page load.
     Returns the departments to be used in the HTML for the manage departments page.
     """
+
     try:
-        currentUser = require_login()
-        if not currentUser:                    # Not logged in
-            return render_template('errors/403.html')
-        if not currentUser.isLaborAdmin:       # Not an admin
-            if currentUser.student: # logged in as a student
-                return redirect('/laborHistory/' + currentUser.student.ID)
-            elif currentUser.supervisor:
-                return render_template('errors/403.html'), 403
 
+        checkAdmistratorRights()
+
+        if academicYear == None: 
+            academicYear = g.openTerm.termCode
+        else: 
+            academicYear = int(academicYear)
+
+        previousAYTerms, currentAYTerms, nextAYTerms = generateTermsForAdjacentYears(academicYear)
+        chosenAY = Term.get(Term.termCode == academicYear)
+
+
+        # Works. Should work without production data now.
+        # We've also thought about having a drop down menu to select the term once the academic year is selected. This should also include the ability to view the entire academic year.
+        # Given the new implementation of the term management page, we can now use the term management page to create terms for the academic year and then use this page to view the 
+        # departments for that academic year.  This will be a much more efficient way to manage the terms and departments.
+        # A concept of Currently Selected Term does not exist, yet. Implementing it here will make it so that the user can select a term and then view the departments for that term.  
+        # This will be a much more efficient way to manage the terms and departments.
+
+
+        # For Testing Purposes.  This will be removed once the term management page is fully implemented and the terms are created for the academic year.
+        # totalBreakSum = getUsedBreakHours(currentAY)
+        # for row in totalBreakSum:
+        #     print(row['department'],int(row['totalHours']),row['termCode'])
+        #     print(totalBreakSum)
+
+
+        # fallTerm = createdTerms[1]
+        # springTerm = createdTerms[4]
+        # summerTerm = createdTerms[6]
+        #
+        # print("******************",fallTerm.termName, springTerm.termName, summerTerm.termName, "**********************")
+        # print("******************",previousAY.termName, nextAY.termName, currentAY.termName, "**********************")
+
+
+        breakHoursByDepartment = {row["department"]: str(row["totalHours"] if row["totalHours"] is not None else 0) for row in getUsedBreakHours(chosenAY)} 
+        # I think Scott wanted this to say NULL not zero, unsure.
+
+
+        activeDepartments = getActiveDepartmentsWithAllocation(chosenAY)
+        inactiveDepartments = Department.select().where(Department.isActive == False)  
+
+
+        allocationStatus = {
+            department.departmentID: getAllocationStatus(chosenAY, department)
+            for department in activeDepartments
+        }
 
-        activeDepartments = Department.select().where(Department.isActive == True)
-        inactiveDepartments = Department.select().where(Department.isActive == False)
         allSupervisors= Supervisor.select().order_by(Supervisor.LAST_NAME)
+
         return render_template( 'admin/manageDepartments.html',
-                                title = ("Manage Departments"),
                                 activeDepartments = activeDepartments,
                                 inactiveDepartments = inactiveDepartments,
-                                allSupervisors = allSupervisors
+                                allSupervisors = allSupervisors,
+                                currentAY = currentAYTerms[0],
+                                previousAY = previousAYTerms[0],
+                                nextAY = nextAYTerms[0],
+                                academicYear = chosenAY.termName,
+                                breakHoursByDepartment = breakHoursByDepartment,
+                                allocationStatus = allocationStatus
                                 )
     except Exception as e:
         print("Error Loading all Departments", e)
         return render_template('errors/500.html'), 500
 
+
+
 @admin.route("/admin/manageDepartments/<departmentID>", methods=['GET'])
 def getSupervisorsInDepartment(departmentID):
         currentUser = require_login()
@@ -60,6 +116,8 @@ def getSupervisorsInDepartment(departmentID):
         supervisors = [model_to_dict(supervisor) for supervisor in supervisors]
         return jsonify(supervisors)
 
+
+
 @admin.route('/admin/manageDepartments/removeSupervisorFromDepartment', methods=['POST'])
 def removeSupervisorFromDepartment():
     try:
@@ -85,13 +143,15 @@ def removeSupervisorFromDepartment():
         print(f'Could not remove user from department: {e}')
         return "", 500
 
+
+
 @admin.route('/admin/complianceStatus', methods=['POST'])
 def complianceStatusCheck():
     """
     This function changes the compliance status in the database for labor status forms.  It works in collaboration with the ajax call in manageDepartments.js
     """
     try:
-        rsp = eval(request.data.decode("utf-8")) # This fixes byte indices must be intergers or slices error
+        rsp = request.get_json() # This fixes byte indices must be intergers or slices error
         if rsp:
             department = Department.get(int(rsp['deptName']))
             department.departmentCompliance = not department.departmentCompliance

app/controllers/admin_routes/termManagement.py

@@ -37,26 +37,42 @@ def createTerms(termYear):
         This function creates the terms for the given Academic Year
     """
     code = termYear * 100
+    createdTerms = []
     for i in range(8):
         try:
             if i == 0:
-                Term.create(termCode = code, termName = "AY {}-{}".format(termYear, termYear + 1), isAcademicYear=True)
+                term = Term.create(termCode = code, termName = "AY {}-{}".format(termYear, termYear + 1), isAcademicYear=True)
             elif i == 1:
-                Term.create(termCode = (code + 11), termName = "Fall {}".format(termYear))
+                term = Term.create(termCode = (code + 11), termName = "Fall {}".format(termYear))
             elif i == 7:
-                Term.create(termCode = (code + 4), termName = "Fall Break {}".format(termYear), isBreak=True)
+                term = Term.create(termCode = (code + 4), termName = "Fall Break {}".format(termYear), isBreak=True)
             elif i == 2:
-                Term.create(termCode = (code + 1), termName = "Thanksgiving Break {}".format(termYear), isBreak=True)
+                term = Term.create(termCode = (code + 1), termName = "Thanksgiving Break {}".format(termYear), isBreak=True)
             elif i == 3:
-                Term.create(termCode = (code + 2), termName = "Christmas Break {}".format( termYear), isBreak=True)
+                term = Term.create(termCode = (code + 2), termName = "Christmas Break {}".format( termYear), isBreak=True)
             elif i == 4:
-                Term.create(termCode = (code + 12), termName = "Spring {}".format(termYear + 1))
+                term = Term.create(termCode = (code + 12), termName = "Spring {}".format(termYear + 1))
             elif i == 5:
-                Term.create(termCode = (code + 3), termName = "Spring Break {}".format(termYear + 1), isBreak=True)
+                term = Term.create(termCode = (code + 3), termName = "Spring Break {}".format(termYear + 1), isBreak=True)
             elif i == 6:
-                Term.create(termCode = (code + 13), termName = "Summer {}".format(termYear + 1), isBreak=True, isSummer=True)
+                term = Term.create(termCode = (code + 13), termName = "Summer {}".format(termYear + 1), isBreak=True, isSummer=True)
         except IntegrityError as e:
-            pass
+            termCodeMap = {
+                0: code, 
+                1: code + 11,  
+                2: code + 1,
+                3: code + 2, 
+                4: code + 12, 
+                5: code + 3, 
+                6: code + 13,
+                7: code + 4,
+            }
+            term = Term.get_or_none(Term.termCode == termCodeMap[i])
+
+        if term is not None:
+            createdTerms.append(term)
+
+    return createdTerms
 
 @admin.route("/termManagement/setDate/", methods=['POST'])
 def ourDate():

app/logic/manageDepartments.py

@@ -0,0 +1,173 @@
+from app.controllers.admin_routes.termManagement import createTerms
+from app.models.laborStatusForm import *
+from app.models.formHistory import *
+from app.models.allocation import *
+from app.models.department import *
+from app.models.term import *
+from app.login_manager import require_login
+from app.controllers.main_routes import departmentPortal
+from flask import g, abort
+from peewee import fn
+
+
+def checkAdmistratorRights():
+    """
+    Checks whether the current user has administrator rights to view the page.  
+    """
+    currentUser = require_login()
+    if not currentUser:                    # If the current user is not logged in
+        return render_template('errors/403.html')
+    if not currentUser.isLaborAdmin:       # If the currrent user is not an admin
+        if currentUser.student: # If the currrent user is logged in as a student
+            return redirect('/laborHistory/' + currentUser.student.ID)
+        elif currentUser.supervisor:
+            return render_template('errors/403.html'), 403
+
+
+
+def getUsedBreakHours(term):
+    """
+    Returns the total number of break hours used by each department for a given term.
+    """
+    # totalBreakSum = FormHistory.select(fn.SUM(LaborStatusForm.contractHours)).where( (FormHistory.historyType_id == "Labor Status Form ") & (FormHistory.status_id == "Approved"))
+
+    totalBreakSum = (
+    FormHistory
+    .select(
+        LaborStatusForm.department,
+        LaborStatusForm.termCode.termCode,
+        fn.SUM(LaborStatusForm.contractHours).alias('totalHours')
+
+    )
+    .join(
+        LaborStatusForm,
+        on=(FormHistory.formID == LaborStatusForm.laborStatusFormID),
+    )
+    .join(
+        Term,
+        on = (LaborStatusForm.termCode == Term.termCode)
+    )
+    .where(
+        (FormHistory.historyType == "Labor Status Form") &
+        (FormHistory.status == "Approved") &
+        (LaborStatusForm.termCode == term)
+    )
+    .group_by(LaborStatusForm.department, LaborStatusForm.termCode).dicts()
+)
+
+    print(list(totalBreakSum))
+
+    # correctLSF = LaborStatusForm.select().where(LaborStatusForm.termCode == term)
+
+    # print("Something2\n\n\n\n",list(correctLSF))
+
+    return totalBreakSum
+
+
+
+def getActiveDepartmentsWithAllocation(term):
+    """
+    Returns a list of active departments with allocations for the given term.
+    """
+
+    # This was left just incase anything went wrong. Delete this if everything works as expected. Not necessary in current implementation.
+    # activeDepartments = Department.select().where(Department.isActive == True)
+    # allAllocations = Allocation.select().where(Allocation.termCode == currentAY)
+
+    activeDepartments = (Department
+                        .select(Department, Allocation)
+                        .join(Allocation)
+                        .where(
+                            Department.isActive == True,
+                            Allocation.termCode == term.termCode
+                        )
+                    )
+
+    for dept in activeDepartments:
+        dept.totalPrimaries = (dept.allocation.primary_10 + dept.allocation.primary_12 + dept.allocation.primary_15 + dept.allocation.primary_20)
+        dept.totalSecondaries = (dept.allocation.secondary_5 + dept.allocation.secondary_10)
+
+        dept.lsfCountPrimaries = getLSFCountPrimaries(term, dept)
+        dept.lsfCountSecondaries = getLSFCountSecondaries(term, dept)
+
+        # # print("######################")
+        # print(f"COUNTS: {lsfCountSecondaries} ")
+        # print([lsf.formID for lsf in lsfCountPrimaries])
+        # print([lsf.formID for lsf in lsfCountSecondaries])
+
+    return activeDepartments
+
+
+
+def getAllocationStatus(term, department):
+    """
+    Returns the allocation status for a given department during a given term.
+    """
+    allocation = Allocation.get(
+        (Allocation.termCode == term) &
+        (Allocation.department == department)
+    )
+    return allocation.isFinal
+
+
+
+def getLSFCountPrimaries(currentTerm, department):
+    """
+    Returns the count of primary LSFs for a given department during a given term. (WIP)
+    """
+    lsfCountPrimaries = FormHistory.select().join(LaborStatusForm).join(Department).where(FormHistory.status == "Approved", LaborStatusForm.termCode == currentTerm.termCode, LaborStatusForm.jobType == "Primary", Department.departmentID == department.departmentID).count()
+    return lsfCountPrimaries
+
+
+
+def getLSFCountSecondaries(currentTerm, department):
+    """
+    Returns the count of secondary LSFs for a given department during a given term. (WIP)
+    """
+    lsfCountSecondaries = FormHistory.select().join(LaborStatusForm).join(Department).where(FormHistory.status == "Approved", LaborStatusForm.termCode == currentTerm.termCode, LaborStatusForm.jobType == "Secondary", Department.departmentID == department.departmentID).count()
+    return lsfCountSecondaries
+
+
+
+# def getTotalPositionHours
+
+
+
+# def getCurrentSelectedTerm(currentTerm):
+    #'''
+    #Returns the current term code based on a the selected term from a dropdown menu in the manage departments page.
+    #Should only contain the current term, the next term, and the previous term.
+    #'''
+
+
+
+def generateTerms(termCode):
+    """
+    Generates all the terms in an academic year. 
+    """
+
+    # Truncating term codes to hundreds. That's how we get the academic year. 
+    academicYearCode = (termCode // 100)
+
+    return createTerms(academicYearCode)   
+
+
+
+def generateTermsForAdjacentYears(academicYear): 
+    """
+    Generates all ther terms for the current year, the previous year, and the future year. 
+    """
+
+
+    previousAYCode  = g.openTerm.termCode - 100
+    currentAYCode   = g.openTerm.termCode 
+    nextATCode      = g.openTerm.termCode + 100
+
+    if (academicYear != previousAYCode) and (academicYear != currentAYCode) and (academicYear != nextATCode):
+        abort(400)
+
+    PreviousAYTerms    = generateTerms(previousAYCode)
+    CurrentAYTerms     = generateTerms(currentAYCode) 
+    NextAYTerms        = generateTerms(nextATCode)
+
+    return (PreviousAYTerms, CurrentAYTerms, NextAYTerms)

app/static/css/manageDepartments.css

@@ -34,4 +34,10 @@ h1 {
 
 #flasher{
 	z-index: 999999;
+}
+
+#activeDepartmentsTable th,
+#activeDepartmentsTable td {
+  vertical-align: middle;
+  text-align: center;
 }