Adding the Manage Members Page

app/__init__.py

@@ -1,5 +1,5 @@
 import os
-
+from datetime import date
 from flask import Flask
 from flask_restful import Api
 from flask_bootstrap import Bootstrap
@@ -79,9 +79,21 @@ def load_openTerm():
             session['openTerm'] = model_to_dict(term)
         g.openTerm = term
 
+def currentYear():
+    today = date.today()
+    year = today.year
+
+    if today.month < 7:
+        return year - 1, year
+
+    return year, year + 1
+
 @app.context_processor
 def inject_environment():
-    return dict(env=app.config['ENV'])
+    return dict(
+        env=app.config['ENV'],
+        currentYear=currentYear()
+    )
 
 @app.before_request
 def queryCount():

app/controllers/main_routes/__init__.py

@@ -1,3 +1,4 @@
+from datetime import date
 from flask import render_template
 from flask import Blueprint
 from app.login_manager import require_login
@@ -14,6 +15,7 @@ def injectGlobalData():
             'lastStaticUpdate': lastStaticUpdate}
 
 from app.controllers.main_routes import main_routes
+from app.controllers.main_routes import departmentPortal
 from app.controllers.main_routes import laborStatusForm
 from app.controllers.main_routes import laborHistory
 from app.controllers.main_routes import alterLSF

app/controllers/main_routes/departmentPortal.py

@@ -1,28 +1,244 @@
-from flask import render_template, g
+from flask import abort, g, jsonify, redirect, render_template, request, url_for
+from peewee import DoesNotExist
+
 from app.controllers.main_routes import main_bp
 from app.logic.getPositions import getPositions
-from peewee import DoesNotExist
+from app.logic.getSupervisors import buildSupervisorDisplay, getSupervisorDepartments
+from app.logic.manageMembers import attachPositionCounts, getStudentCounts
+from app.logic.search import searchPerson
 from app.models.department import Department
+from app.models.supervisor import Supervisor
 from app.models.supervisorDepartment import SupervisorDepartment
 
+
+@main_bp.route('/department/<org>/<account>/members', methods=['GET'])
+def manageMembers(org=None, account=None):
+    """Generates the Manage Members page."""
+    currentUser = g.currentUser
+
+    if not currentUser.supervisor:
+        return redirect(url_for('main.laborhistory', id=currentUser.student.ID))
+
+    dept = Department.get_or_none(
+        Department.ORG == org,
+        Department.ACCOUNT == account
+    )
+
+    if not dept:
+        abort(404)
+
+    members = getSupervisorDepartments(dept)
+
+    supervisorDeptRecord = SupervisorDepartment.get_or_none(
+        supervisor=currentUser.supervisor,
+        department=dept
+    )
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        supervisorDeptRecord
+    ):
+        return render_template('errors/403.html'), 403
+
+    counts = getStudentCounts(dept)
+    members = attachPositionCounts(members, counts)
+
+    return render_template(
+        'main/manageMembers.html',
+        members=members,
+        department=dept,
+    )
+
+
 @main_bp.route('/department/<org>/<account>/positions', methods=['GET'])
 def managePositions(org, account):
+    """Generates the Manage Positions page."""
     try:
-        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+        dept = Department.get(
+            Department.ORG == org,
+            Department.ACCOUNT == account
+        )
     except DoesNotExist:
         return render_template('errors/404.html'), 404
-    
+
     if not g.currentUser.isLaborAdmin:
-        if not SupervisorDepartment.select().where(
+        supervisorDeptRecord = SupervisorDepartment.get_or_none(
             (SupervisorDepartment.supervisor == g.currentUser.supervisor) &
             (SupervisorDepartment.department == dept.departmentID)
-        ).exists():
+        )
+
+        if not supervisorDeptRecord:
             return render_template('errors/403.html'), 403
 
     positions = getPositions(dept)
 
-    return render_template('main/managePositions.html',
-                           department = dept,
-                           department_name = dept.DEPT_NAME,
-                           positions = positions
-                           )
+    return render_template(
+        'main/managePositions.html',
+        department=dept,
+        department_name=dept.DEPT_NAME,
+        positions=positions
+    )
+
+
+@main_bp.route('/members/search/<query>', methods=['GET'])
+def searchMember(query=None):
+    """Search supervisors by name or B-number."""
+    currentUser = g.currentUser
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        currentUser.supervisor
+    ):
+        return render_template('errors/403.html'), 403
+
+    supervisors = (
+        searchPerson(Supervisor, query)
+        .order_by(Supervisor.LAST_NAME.asc())
+        .limit(10)
+    )
+
+    supervisors = [buildSupervisorDisplay(supervisor) for supervisor in supervisors]
+    supervisors = [supervisor for supervisor in supervisors if supervisor is not None]
+
+    return jsonify(supervisors)
+
+
+@main_bp.route('/members/update_coordinator', methods=['POST'])
+def updateCoordinator():
+    """Assigns or unassigns a supervisor as a Labor Coordinator."""
+    currentUser = g.currentUser
+
+    supervisorID = request.form.get("supervisorID")
+    departmentID = request.form.get("departmentID")
+    isCoordinator = request.form.get("isCoordinator") == "true"
+
+    if not supervisorID or not departmentID:
+        return "", 400
+
+    supervisorDeptRecord = None
+
+    if currentUser.supervisor:
+        supervisorDeptRecord = SupervisorDepartment.get_or_none(
+            (SupervisorDepartment.supervisor == currentUser.supervisor) &
+            (SupervisorDepartment.department == departmentID)
+        )
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        supervisorDeptRecord
+    ):
+        return render_template('errors/403.html'), 403
+
+    member = SupervisorDepartment.get(
+        (SupervisorDepartment.supervisor == supervisorID) &
+        (SupervisorDepartment.department == departmentID)
+    )
+
+    member.isCoordinator = isCoordinator
+    member.save()
+
+    return "", 200
+
+
+@main_bp.route('/members/update_eligibility', methods=['POST'])
+def updateEligibility():
+    """Updates a supervisor's eligibility status."""
+    currentUser = g.currentUser
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        currentUser.supervisor
+    ):
+        return render_template('errors/403.html'), 403
+
+    supervisorID = request.form.get("supervisorID")
+
+    if not supervisorID:
+        return "", 400
+
+    member = Supervisor.get(Supervisor.ID == supervisorID)
+    member.isBanned = not member.isBanned
+    member.save()
+
+    return "", 200
+
+
+@main_bp.route('/members/remove', methods=['DELETE'])
+def removeMember():
+    """Removes a staff member from a department."""
+    currentUser = g.currentUser
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        currentUser.supervisor
+    ):
+        return render_template('errors/403.html'), 403
+
+    supervisorID = request.form.get("supervisorID")
+    departmentID = request.form.get("departmentID")
+
+    if not supervisorID or not departmentID:
+        return "", 400
+
+    member = SupervisorDepartment.get(
+        (SupervisorDepartment.supervisor == supervisorID) &
+        (SupervisorDepartment.department == departmentID)
+    )
+
+    member.delete_instance()
+
+    return "", 200
+
+
+@main_bp.route('/members/add', methods=['POST'])
+def addUserToDept():
+    """Adds a user to a department."""
+    currentUser = g.currentUser
+    supervisorID = request.form.get("supervisorID")
+    departmentID = request.form.get("departmentID")
+
+    if not supervisorID or not departmentID:
+        return jsonify(success=False, message="Missing supervisor or department."), 400
+
+    if not (
+        currentUser.isLaborAdmin or
+        currentUser.isLaborDepartmentStudent or
+        currentUser.supervisor
+    ):
+        return render_template('errors/403.html'), 403
+
+    try:
+        supervisor = Supervisor.get_or_none(Supervisor.ID == supervisorID)
+
+        if not supervisor:
+            return jsonify(success=False, message="Supervisor not found."), 404
+
+        supervisorDeptRecord = SupervisorDepartment.get_or_none(
+            supervisor=supervisor,
+            department=departmentID
+        )
+
+        if supervisorDeptRecord:
+            return jsonify(
+                success=False,
+                message="Supervisor already exists in this department."
+            ), 200
+
+        SupervisorDepartment.create(
+            supervisor=supervisor,
+            department=departmentID
+        )
+
+        return jsonify(success=True, message="Supervisor added to department."), 200
+
+    except Exception as e:
+        print(f'Could not add user to department: {e}')
+        return jsonify(
+            success=False,
+            message="Could not add supervisor to department."
+        ), 500

app/controllers/main_routes/main_routes.py

@@ -59,10 +59,14 @@ def supervisorPortal():
 @main_bp.route('/department/<org>/<account>', methods=['GET'])
 def departmentPortal(org=None,account=None):
     currentUser = g.currentUser
-    try:
-        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
-    except (NameError, DoesNotExist):
+    if org and account:
+        try:
+            dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+        except (NameError, DoesNotExist):
+            dept = None
+    else:
         dept = None
+
 
     if currentUser.isLaborAdmin:
         departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc()))