Manage Departments Draft

app/controllers/admin_routes/manage_departments.py

@@ -9,11 +9,13 @@
 from app.models.term import *
 from flask_bootstrap import bootstrap_find_resource
 from app.models.department import *
+from app.models.allocation import *
 from flask import request, redirect
 from flask import jsonify
 from playhouse.shortcuts import model_to_dict
 from app.logic.tracy import Tracy
 
+
 @admin.route('/admin/manageDepartments', methods=['GET'])
 # @login_required
 def manage_departments():
@@ -34,17 +36,23 @@ def manage_departments():
 
         activeDepartments = Department.select().where(Department.isActive == True)
         inactiveDepartments = Department.select().where(Department.isActive == False)
+        allAllocations = Allocation.select()
+        print("Something",allAllocations, "\n\n\n\n\n","Something")
+
         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,
+                                allAllocations = allAllocations
                                 )
     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()

app/controllers/main_routes/departmentPortal.py

@@ -0,0 +1 @@
+from flask import render_template

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
@@ -47,6 +47,26 @@ 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):
+    try:
+        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
+    except (NameError, DoesNotExist):
+        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()))
+
+    return render_template('main/departmentPortal.html', 
+                           departments = departments,
+                           department = dept)
+
 @main_bp.route('/supervisorPortal/addUserToDept', methods=['GET', 'POST'])
 def addUserToDept():
     userDeptData = request.form
@@ -113,4 +133,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,19 @@
+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)
+    isApproved     = 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()

app/models/positionHistory.py

@@ -0,0 +1,10 @@
+from app.models import *
+from app.models.department import Department
+
+class PositionHistory(baseModel):
+    positioncode       = PrimaryKeyField()
+    status             = CharField()
+    WLS                = IntegerField()
+    revisiondate       = DateField()
+    Description        = TextField()
+    Department         = ForeignKeyField(Department)               

app/models/supervisorDepartment.py

@@ -5,3 +5,12 @@
 class SupervisorDepartment(baseModel):
     supervisor = ForeignKeyField(Supervisor, null=True)
     department = ForeignKeyField(Department)
+    banStatus = BooleanField(default=False)
+    isActive = BooleanField(default=False)
+    isCoordinator = BooleanField(default=False)
+
+    @property
+    def isBanned(self):
+        return self.banStatus
+
+

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);
+}

app/static/css/manageDepartments.css

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

app/static/js/departmentPortal.js

@@ -0,0 +1,6 @@
+$(document).ready(function() {
+    $("#selectedDepartment").on("change",function() {
+        deptData = $(this).find('option:selected').data();
+        window.location = `/department/${deptData.org}/${deptData.account}`;
+    });
+});