Manage Departments Page Update

app/controllers/admin_routes/__init__.py

@@ -13,7 +13,7 @@ def injectGlobalData():
     return {'currentUser': currentUser,
             'lastStaticUpdate': lastStaticUpdate}
 
-from app.controllers.admin_routes import manage_departments
+from app.controllers.admin_routes import manageDepartments
 from app.controllers.admin_routes import termManagement
 from app.controllers.admin_routes import adminManagement
 from app.controllers.admin_routes import allPendingForms

app/controllers/admin_routes/manageDepartments.py

@@ -0,0 +1,124 @@
+from datetime import date
+
+from flask import g, request, redirect, jsonify, abort
+
+from app.controllers.admin_routes import *
+from app.login_manager import require_login
+
+from app.controllers.admin_routes import admin
+from app.controllers.errors_routes.handlers import *
+
+from app.models.formHistory import FormHistory
+from app.models.user import *
+from app.models.term import *
+from app.models.department import *
+from app.models.allocation import *
+from app.models.laborStatusForm import *
+
+from app.logic.manageDepartments import * 
+
+
+
+@admin.route('/admin/manageDepartments/', methods=['GET'])
+@admin.route('/admin/manageDepartments/<academicYear>', methods=['GET']) 
+def manageDepartments(academicYear = None):
+    """
+    Returns the Manage Departments page, which allows the admin to view all the departments
+    and their allocations.  
+    """
+
+    # Checking Admin Rights
+    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 currentUser.student:
+            return redirect('/laborHistory/' + currentUser.student.ID)
+        elif currentUser.supervisor:
+            return render_template('errors/403.html'), 403
+
+
+    # The condition below may be deleted if the routing to the Manage Departments page is changed. 
+    if academicYear == None: 
+        academicYear = g.openTerm.termCode
+    else: 
+        academicYear = int(academicYear)
+
+
+    currentAY, previousAY, nextAY = generateAdjacentYears(academicYear)
+    chosenAY = Term.get(Term.termCode == academicYear)
+
+    breakHoursByDepartment = {row["department"]: str(row["totalHours"] or 0) for row in getUsedBreakHours(chosenAY)}
+
+    activeDepartments = getActiveDepartmentsWithAllocation(chosenAY)
+    inactiveDepartments = Department.select().where(Department.isActive == False)  
+
+    allocationStatus = {
+        department.departmentID: getAllocationStatus(chosenAY, department)
+        for department in activeDepartments
+    }
+
+    allSupervisors= Supervisor.select().order_by(Supervisor.LAST_NAME)
+
+    return render_template( 'admin/manageDepartments.html',
+                            activeDepartments = activeDepartments,
+                            inactiveDepartments = inactiveDepartments,
+                            allSupervisors = allSupervisors,
+                            currentAY = currentAY,
+                            previousAY = previousAY,
+                            nextAY = nextAY,
+                            academicYear = chosenAY.termName,
+                            breakHoursByDepartment = breakHoursByDepartment,
+                            allocationStatus = allocationStatus
+                            )
+
+
+
+@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 = request.get_json()
+        if rsp:
+            department = Department.get(int(rsp['deptName']))
+            department.departmentCompliance = not department.departmentCompliance
+            department.save()
+            return jsonify({"Success": True})
+    except Exception as e:
+        print(e)
+        return jsonify({"Success": False})
+
+
+
+@admin.route('/admin/manageDepartments/<org>/<account>/allocationReview', methods=['GET'])
+def allocationReview(org=None, account=None):
+    """
+    Returns the Allocation Review page/form, which can only be accessed through
+    the Manage Departments page.  
+    """
+
+    # Retrieving the departments based on the org and account numbers 
+    try:
+        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+    except (NameError, DoesNotExist):
+        abort(404)
+
+    # Checking admin rights
+    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 currentUser.student:
+            return redirect('/laborHistory/' + currentUser.student.ID)
+        elif currentUser.supervisor:
+            return render_template('errors/403.html'), 403
+
+    # Retrieving the next year 
+    # DON'T DELETE THE UNDERSCORES
+    _, _, nextAY = generateAdjacentYears()
+    # The generateAdjacentYears() function returns a tuple of three elements, and we only need the third value
+
+    return render_template('admin/allocationReview.html', department = dept, nextAY = nextAY)

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():