Manage positions page

app/controllers/main_routes/main_routes.py

@@ -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():
@@ -51,21 +52,52 @@ def supervisorPortal():
 @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):
+    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)
+                           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():

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()
+    approvedBy     = ForeignKeyField(Supervisor)
+    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,13 @@
+from app.models import *
+from app.models.department import Department
+
+class PositionHistory(baseModel):
+    positioncode       = CharField()
+    status             = CharField()
+    WLS                = IntegerField()
+    revisiondate       = DateField()
+    Description        = TextField(default=None)
+    Department         = ForeignKeyField(Department)
+
+    class Meta:
+        primary_key = CompositeKey('positioncode', 'revisiondate', 'status')

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/managepositions.css

@@ -0,0 +1,15 @@
+.width-12{
+    width:12%;
+}
+
+*{
+    /* outline:solid 1px lime; */
+    margin:0;
+    padding:0;
+    box-sizing:border-box;
+}
+
+.department-header{
+    padding:1%;
+    margin-top:-20px;
+}

app/templates/main/departmentPortal.html

@@ -3,11 +3,13 @@
 {% block scripts %}
 {{super()}}
     <script type="text/javascript" src="{{url_for('static', filename='js/departmentPortal.js') }}?u={{lastStaticUpdate}}"></script>
+    <link rel="stylesheet" type="text/css"
+  href="{{url_for('static', filename ='css/departmentPortal.css')}}?u={{lastStaticUpdate}}">
 {% endblock %}
-
 {% block app_content %}
 <h2 class="text-center">{% if department %} {{department.DEPT_NAME}} Portal {% else %} Choose a Department: {% endif %} </h2>
 
+
   <!--selectpicker for department-->
   <div class="form-group">
     <select class="selectpicker"
@@ -24,4 +26,133 @@ <h2 class="text-center">{% if department %} {{department.DEPT_NAME}} Portal {% e
     </select>
 
   </div>
-{% endblock %}
+
+{% if department %}
+<div class="card-group" style="display:inline-flex; gap: 2rem;" style="height: 1000px">
+
+  <div class="card" style="width:50rem; border-radius: 2rem;">
+    <div class="card-body">
+      <h5 class="card-title">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16"height="16"fill="currentColor" class="bi bi-clock" viewBox="0 0 16 16">
+          <path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z"/>
+          <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0"/>
+        </svg>
+        Current Allocation
+      </h5>
+      <p class="card-text"><br> AY 26/27 15/20 POSITIONS <br><br> Break Hours 0 of 200 hrs</p>
+      <a href="#" class="btn btn-primary">Go somewhere</a>
+    </div>
+  </div>
+
+  <section class="card "style="width:50rem; border-radius: 2rem;" aria-labelledby="members-title">
+    <div class="card-body">
+      <div class="media">
+        <div class="media-left">
+          <span class="btn btn-default btn-lg img-circle disabled" aria-hidden="true">
+            <i class="fa fa-users"></i>
+          </span>
+        </div>
+        <div class="media-body media-middle">
+          <h1>
+            Members
+          </h1>
+        </div>
+      </div>
+      <h4>Labor Coordinator(s)</h4>
+      <p>Dr. Jones</p>
+
+      <h2>Supervisors</h2>
+      {% for s in supervisors %}
+      {% if 3 > loop.index0 %}
+        <p>{{ s }}</p>
+      {% elif 4 > loop.index0 %}
+        <p>and {{ supervisors | length}} more...</p>
+      {% endif %}
+      {% endfor %}
+    </div>
+
+    <div class="card-footer text-center">
+      <a href="#" class="btn btn-primary">View Details
+         <span class="glyphicon glyphicon-chevron-right"></span>
+      </a>
+    </div>
+  </section>
+
+  <div class="card mb-3" style="width:50rem; border-radius: 2rem;">
+    <div class="card-body">
+       <div class="media">
+        <div class="media-body media-middle">
+          <h1>Positions</h1>
+        </div>
+        <div class="media-right">
+          <span class="btn btn-default btn-lg img-circle disabled" aria-hidden="true">
+            <i class="fa fa-suitcase"></i>
+          </span>
+        </div>
+
+      </div>
+      <ul style="line-height:2;">
+      {% for p in positions %}
+        {% if 7 > loop.index0 %}
+          <li class="card-text">{{ p }}</li>
+        {% elif 8 == loop.index0 %}
+          </ul><p class="card-text">and {{ positions | length}} more...</p>
+        {% endif %}
+      {% endfor %}
+      </ul>
+
+    </div>
+       <div class="card-footer text-center">
+          <a href="/department/{{ department.ORG }}/{{ department.ACCOUNT }}/managepositions" class="btn btn-primary">View Details <span class="glyphicon glyphicon-chevron-right"></span></a>
+       </div>
+      </div>
+</div>
+
+{% endif %}
+
+
+<!-- <div class="col-sm-4">
+  <section class="card members-card" aria-labelledby="members-title">
+    <div class="card-body">
+
+      <div class="media">
+        <div class="media-left">
+          <span class="members-card-icon" aria-hidden="true">
+            <i class="fa fa-users"></i>
+          </span>
+        </div>
+
+        <div class="media-body media-middle">
+          <h3 id="members-title" class="media-heading card-title">
+            <strong>Members</strong>
+          </h3>
+        </div>
+      </div>
+
+      <h4 class="text-primary"><strong>Labor Coordinator</strong></h4>
+      <p class="card-text">Dr. Jones</p>
+
+      <h4 class="text-primary"><strong>Supervisors</strong></h4>
+      <p class="card-text">
+        Dr. Heggen<br>
+        Dr. Nakazawa
+      </p>
+
+      <p class="text-center">
+        <span class="members-card-cta">
+          <a href="#" class="btn btn-primary btn-sm members-card-btn">
+            View Details <span class="glyphicon glyphicon-chevron-right"></span>
+          </a>
+
+        </span>
+      </p>
+
+    </div>
+  </section>
+</div> -->
+
+{% endblock %}\
+
+
+
+

app/templates/main/managepositions.html

@@ -0,0 +1,90 @@
+{% extends "base.html" %}
+
+{% block styles %}
+{{super()}}
+  <link href="/static/css/managepositions.css?u={{lastStaticUpdate}}" rel="stylesheet" type="text/css">
+{% endblock %}
+
+{% block scripts %}
+{{super()}}
+    <script type="text/javascript" src="{{url_for('static', filename='js/managePositions.js') }}?u={{lastStaticUpdate}}"></script>
+{% endblock %}
+
+{% block app_content %}
+<div class="text-white  department-header">
+    <h2>{{ department_name }}</h2>
+</div>
+
+<div class="container-fluid position-management">
+
+    <div class="row page-header">
+        <div class="form-group col-xs-4 ">
+        <select class="selectpicker"
+                name='department'
+                id='selectedDepartment'
+                data-live-search='true'
+                title="Department"
+                >
+        <option value = "" disabled selected>Search a position</option>
+        {% for p in positions %}
+            <option data-account="{{p.POSN_TITLE}}" data-org="{{p.POSN_CODE}}" data-content=
+            "<span>{{p.DEPT_NAME}}</span><small class='text-muted'> {{p.POSN_TITLE}} </small>">{{p.POSN_TITLE}}</option>
+        {% endfor %}
+        </select>
+
+  </div>
+            <h1 class="col-xs-4 text-center">Manage Positions</h1>
+        <div class="col-xs-4 text-right">
+            <button class="btn add-btn btn-primary" id="addPositionButton">
+                Add Position
+            </button>
+        </div>
+    </div>
+
+    <div class="table-responsive">
+        <table class="table table-striped table-bordered text-center" id="positionTable">
+            <thead>
+                <tr>
+                    <th class="text-center">Position (WSL)</th>
+                    <th class="text-center">Position Code</th>
+                    <th class="text-center">Status</th>
+                    <th class="width-12 text-center">Last Revision Date</th>
+                    <th class="width-12 text-center">View Position Description</th>
+                    <th class="text-center">Edit Position Description</th>
+                </tr>
+            </thead>
+            <tbody>
+                <!-- Sample Row -->
+
+                {% for position in positions %}
+                <tr>
+                    <td>{{position.POSN_TITLE}} ({{position.WLS}})</td>
+                    <td>{{position.POSN_CODE}}</td>
+                    <td>
+                        <p class="bg-success p-5">
+                            Active
+                        </p>
+                    </td>
+                    <td>01/01/2024</td>
+                    <td>
+                        <button class="btn btn-success view-btn">
+                            View
+                        </button>
+                    </td>
+                    <td>
+                        <button class="btn btn-primary request-btn">
+                            Request an Update
+                        </button>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <h3 class="total">
+        Total Positions:
+        <span id="positionCount">{{ positions|length }}</span>
+    </h2>
+</div>
+
+{% endblock %}

app/templates/main/supervisorPortal.html

@@ -227,7 +227,7 @@ <h1 class="fs-1" data-toggle="collapse">Form Search</h1>
 </div>
 <br>
 <div style="position: relative; z-index: 1;" id="sortOptions">
-  <div class="container-fluid" style="margin-bottom: -40px; float: right;">
+  <div class="container-fluid" style="margin-bottom: 15px; float: right;">
     <label for="columnPicker">Sorting Options:</label>
     <select id="columnPicker" name="columnPicker" class="selectpicker" title="Column">
       <option value="term">Term</option>