Creating a Manage Staff page

app/controllers/main_routes/__init__.py

@@ -14,6 +14,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

@@ -0,0 +1,69 @@
+from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify
+from peewee import JOIN, DoesNotExist, fn, Case
+from functools import reduce
+import operator
+from app.models.department import Department
+from app.models.supervisor import Supervisor
+from app.models.supervisorDepartment import SupervisorDepartment
+from app.models.student import Student
+from app.models.laborStatusForm import LaborStatusForm
+from app.models.formHistory import FormHistory
+from app.models.term import Term
+from app.controllers.admin_routes.allPendingForms import checkAdjustment
+from app.controllers.main_routes import main_bp
+from app.logic.download import CSVMaker, saveFormSearchResult, retrieveFormSearchResult
+from app.logic.search import getDepartmentsForSupervisor, searchPerson, searchSupervisorPortal
+from app.login_manager import require_login, logout
+from app.logic.getTableData import getDatatableData
+from app.logic.banner import Banner
+from flask import abort
+
+
+@main_bp.route('/department/<org>/<account>/members', methods=['GET'])
+def manageStaff(org=None,account=None):
+    try:
+        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+    except (NameError, DoesNotExist):
+        dept = None
+        abort(404)
+
+    members = list(
+        SupervisorDepartment.
+        select(
+            SupervisorDepartment,
+            Supervisor
+        ).where(
+            SupervisorDepartment.department == dept
+        ).join(
+            Supervisor
+        ).dicts()
+    )
+
+    student_count = list(
+        LaborStatusForm.
+        select(
+            fn.SUM(Case(LaborStatusForm.jobType, (("Primary", 1),), 0)).alias("primary_positions"), 
+            fn.SUM(Case(LaborStatusForm.jobType, (("Secondary", 1),), 0)).alias("secondary_positions"),
+            LaborStatusForm.department, 
+            LaborStatusForm.supervisor
+        ).group_by(
+            LaborStatusForm.department, 
+            LaborStatusForm.supervisor
+        ).dicts()
+    )
+
+
+    counts = {(row["department"], row["supervisor"]): row for row in student_count}
+
+    for member in members:
+
+        key = (member["department"], member["supervisor"])
+        row = counts.get(key, {})
+
+        member["primary_positions"] = row.get("primary_positions", 0)
+        member["secondary_positions"] = row.get("secondary_positions", 0)
+
+    return render_template('main/manageMembers.html', 
+                           members = members,
+                           department = dept)
+

app/controllers/main_routes/main_routes.py

@@ -1,5 +1,5 @@
 from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify
-from peewee import JOIN
+from peewee import JOIN, DoesNotExist
 from functools import reduce
 import operator
 from app.models.department import Department
@@ -16,6 +16,7 @@
 from app.login_manager import require_login, logout
 from app.logic.getTableData import getDatatableData
 from app.logic.banner import Banner
+from app.logic.tracy import Tracy
 
 @main_bp.route('/logout', methods=['GET'])
 def triggerLogout():
@@ -47,6 +48,57 @@ def supervisorPortal():
                             currentUser = currentUser
                             )
 
+@main_bp.route('/department', methods=['GET'])
+@main_bp.route('/department/<org>', methods=['GET'])
+@main_bp.route('/department/<org>/<account>', methods=['GET'])
+def departmentPortal(org=None,account=None):
+    if org and account:
+        try:
+            dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+        except (NameError, DoesNotExist):
+            dept = None
+    else:
+        dept = None
+
+    if g.currentUser.isLaborAdmin:
+        departments = list(Department.select().order_by(Department.isActive.desc(), Department.DEPT_NAME.asc()))
+    else:
+        departments = list(getDepartmentsForSupervisor(g.currentUser).order_by(Department.isActive.desc(), Department.DEPT_NAME.asc()))
+
+    pos = Tracy().getPositionsFromDepartment(org, account)
+    positions = []
+    for i in pos:
+        positions.append(i.POSN_TITLE + "" + "(" + i.WLS + ")")
+
+    staff = Tracy().getSupervisors()
+    supervisors = []
+
+    for i in staff:
+        if i.ORG == org:
+            supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")")
+
+    return render_template('main/departmentPortal.html', 
+                           departments = departments,
+                           department = dept,
+                           positions = positions,
+                           supervisors = supervisors
+                           )
+
+@main_bp.route('/department/<org>/<account>/managepositions', methods=['GET'])
+def managePositions(org, account):
+    try:
+        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+    except DoesNotExist:
+        return render_template('errors/404.html'), 404
+
+    positions = Tracy().getPositionsFromDepartment(org, account)
+    print(positions)
+    return render_template('main/managepositions.html',
+                           department = dept,
+                           department_name = dept.DEPT_NAME,
+                           positions = positions
+                           )
+
 @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST'])
 def addUserToDept():
     userDeptData = request.form
@@ -113,4 +165,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/models/allocation.py

@@ -0,0 +1,23 @@
+from app.models import *
+from app.models.department import Department
+from app.models.supervisor import Supervisor
+from app.models.term import Term
+
+class Allocation(baseModel):
+    termCode       = ForeignKeyField(Term)
+    department     = ForeignKeyField(Department)
+    isFinal        = BooleanField(default=False)
+    approvedOn     = DateField(null=True)
+    approvedBy     = ForeignKeyField(Supervisor, null=True)
+    justification  = TextField()
+    primary_10     = IntegerField()
+    primary_12     = IntegerField()
+    primary_15     = IntegerField()
+    primary_20     = IntegerField()
+    secondary_5    = IntegerField()
+    secondary_10   = IntegerField()
+    breakHours     = IntegerField()
+
+    class Meta:
+        indexes = ( (('termCode', 'department', 'isFinal'), True), )
+

app/models/positionHistory.py

@@ -0,0 +1,14 @@
+from app.models import *
+from app.models.department import Department
+
+class PositionHistory(baseModel):
+    positionCode       = CharField()
+    department         = ForeignKeyField(Department)
+    status             = CharField()
+    wls                = IntegerField()
+    revisionDate       = DateField()
+    description        = TextField(default=None)
+
+    class Meta:
+        indexes = ( (('positionCode', 'revisionDate', 'status'), True), )
+

app/models/supervisor.py

@@ -13,9 +13,11 @@ class Supervisor(baseModel):
     ORG                 = CharField(null=True)
     DEPT_NAME           = CharField(null=True)
 
-    legal_name      = CharField(null=True)
-    preferred_name  = CharField(null=True)
-    isActive        = BooleanField(default=False)
+    legal_name          = CharField(null=True)
+    preferred_name      = CharField(null=True)
+    isActive            = BooleanField(default=False)
+    isBanned            = BooleanField(default=False)
+
 
 
     @property

app/models/supervisorDepartment.py

@@ -3,5 +3,6 @@
 from app.models.department import Department
 
 class SupervisorDepartment(baseModel):
-    supervisor = ForeignKeyField(Supervisor, null=True)
+    supervisor = ForeignKeyField(Supervisor)
     department = ForeignKeyField(Department)
+    isCoordinator = BooleanField(default=False)

app/static/css/base.css

@@ -191,3 +191,76 @@ a {
   font-size:1.2em;
   z-index:999;
 }
+
+.card {
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  border-radius: 0.25rem;
+}
+
+.card-body {
+  -webkit-box-flex: 1;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+  padding: 1rem 1rem;
+}
+
+.card-title {
+  margin-bottom: 0.5rem;
+  font-size: 1.25rem;
+  font-weight: 500;
+}
+
+.card-subtitle {
+  margin-top: -0.25rem;
+  margin-bottom: 0;
+}
+
+.card-text:last-child {
+  margin-bottom: 0;
+}
+
+.card-link + .card-link {
+  margin-left: 1rem;
+}
+
+.card-header {
+  padding: 0.5rem 1rem;
+  margin-bottom: 0;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-header:first-child {
+  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+}
+
+.card-footer {
+  padding: 0.5rem 1rem;
+  background-color: rgba(0, 0, 0, 0.03);
+  border-top: 1px solid rgba(0, 0, 0, 0.125);
+}
+
+.card-footer:last-child {
+  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
+}
+
+.card-img, .card-img-top {
+  width: 100%;
+}
+
+.card-img-top {
+  border-top-left-radius: calc(0.25rem - 1px);
+  border-top-right-radius: calc(0.25rem - 1px);
+}