Dp position card

app/controllers/main_routes/main_routes.py

@@ -16,6 +16,8 @@
 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
+from app.models.positionHistory import PositionHistory
 
 @main_bp.route('/logout', methods=['GET'])
 def triggerLogout():
@@ -51,21 +53,78 @@ 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 = []
+    pos_his = []
+    if pos == []:
+        positions = ["No Positions for this Department"]
+    else:
+        for i in pos:
+            positions.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")")
+            try:
+                pos_his_obj = PositionHistory.get(PositionHistory.positioncode == i.POSN_CODE)
+                pos_his.append(str(pos_his_obj.positioncode) + str(pos_his_obj.revisiondate))
+            except:
+                pos_his.append("#")
+
+    staff = Tracy().getSupervisors()
+    supervisors = []
+
+    for i in staff:
+        if i.ORG == org:
+            supervisors.append(i.FIRST_NAME + " " + i.LAST_NAME + " (" + i.EMAIL + ")")
+
+
+    pos = Tracy().getPositionsFromDepartment(org, account)
+    positions = []
+    pos_his = []
+    if pos == []:
+        positions = ["No Positions for this Department"]
+    else:
+        for i in pos:
+            positions.append(i.POSN_TITLE + ": " + "(WLS " + i.WLS + ")")
+            try:
+                pos_his_obj = PositionHistory.get(PositionHistory.positioncode == i.POSN_CODE)
+                pos_his.append(str(pos_his_obj.positioncode) + str(pos_his_obj.revisiondate))
+            except:
+                pos_his.append("#")
 
     return render_template('main/departmentPortal.html', 
                            departments = departments,
-                           department = dept)
+                           department = dept,
+                           positions = positions,
+                           supervisors = supervisors,
+                           pos_his = pos_his
+                           )
+
+@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, 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,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/base.css

@@ -207,6 +207,7 @@ a {
   background-clip: border-box;
   border: 1px solid rgba(0, 0, 0, 0.125);
   border-radius: 0.25rem;
+  overflow: hidden;
 }
 
 .card-body {
@@ -250,6 +251,9 @@ a {
   padding: 0.5rem 1rem;
   background-color: rgba(0, 0, 0, 0.03);
   border-top: 1px solid rgba(0, 0, 0, 0.125);
+  border-bottom-left-radius: 1rem;
+  border-bottom-right-radius: 1rem;
+
 }
 
 .card-footer:last-child {

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,13 +3,14 @@
 {% block scripts %}
 {{super()}}
     <script type="text/javascript" src="{{url_for('static', filename='js/departmentPortal.js') }}?u={{lastStaticUpdate}}"></script>
+    <link rel="stylesheet" type="text/css"
 {% 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">
+  <div class="form-group" style="width:65rem; margin-left: auto; margin-right:auto">
     <select class="selectpicker"
             name='department'
             id='selectedDepartment'
@@ -24,4 +25,115 @@ <h2 class="text-center">{% if department %} {{department.DEPT_NAME}} Portal {% e
     </select>
 
   </div>
+
+{% if department %}
+<div class="card-group" style="display:inline-flex; gap: 1rem">
+
+<section class="card "style="width:90%; border-radius: 1rem;" aria-labelledby="current_allocation-title">
+    <div class="card-body">
+      <div class="media">
+        <div class="header-container" style="padding-top: 12px;">
+          <span aria-hidden="true" style="color: #424242; font-size: 24px;">
+            <i class="bi bi-clock" style="border: 1px solid #c0c0c0; border-radius: 12px; padding: 3px 3.5px 1.5px 3.5px; font-size: 1.5em; color: #6e6e6e"></i> 
+            <h1 style="display: inline; margin: 0;" >Current Allocation</h1>
+          </span>
+        </div>
+      </div>
+      <div>
+        <div class="header-container" style="display: flex; justify-content: space-between; align-items: center; padding-left: 10px; padding-right: 10px;">
+          <h3>AY 26/27</h3> <h3>15/20 Positions</h3>
+        </div>
+        <ul style="font-size: 1.2em; padding-left: 75px;">
+          <li>10 HR : 2</li>
+          <li>12 HR : 3</li>
+          <li>15 HR : 5</li>
+          <li>20 HR : 5</li>
+        </ul>
+      </div>
+      <div class="header-container" style="display: flex; justify-content: space-between; align-items: center; padding-left: 10px; padding-right: 10px;">
+        <h3>Break Hours</h3> <h3>0 of 200 Hrs.</h3>
+      </div>
+    </div>
+        <div class="card-footer text-center">
+      <a href="#" class="btn btn-primary btn-sm">
+        View Details <span class="glyphicon glyphicon-chevron-right"></span>
+      </a>
+      <a href="#" class="btn btn-primary btn-sm">
+        Request Allocation <span class="glyphicon glyphicon-chevron-right"></span>
+      </a>
+    </div>
+    </section>
+
+  <section class="card "style="width:90%; border-radius: 1rem;" aria-labelledby="members-title">
+    <div class="card-body">
+      <div class="media">
+         <div class="media-left media-middle">
+          <span aria-hidden="true" style="color: #000; font-size: 24px;">
+            <i class="bi bi-people-fill" style="border: 1px solid #c0c0c0; border-radius: 12px; padding: 3px 3.5px 1.5px 3.5px; font-size: 1.5em; color: #6e6e6e"></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" style="width:90%; border-radius: 1rem;">
+    <div class="card-body">
+       <div class="media">
+        <div class="media-left media-middle">
+          <span aria-hidden="true" style="color: #424242; font-size: 24px;">
+            <i class="bi bi-suitcase-lg-fill" style="border: 1px solid #c0c0c0; border-radius: 12px; padding: 3px 3.5px 1.5px 3.5px; font-size: 1.5em; color: #6e6e6e"></i>
+          </span>
+        </div>
+        <div class="media-body media-middle">
+          <h1>Positions</h1>
+        </div>
+
+      </div>
+      <ul style="line-height:2;">
+      {% for p in positions %}
+        {% if 7 > loop.index0 %}
+          {% if not pos_his[loop.index0] == "#" %}
+          <li class="card-text">
+            <a href= "/department/{{ department.ORG }}/{{ department.ACCOUNT }}/managepositions/{{pos_his[loop.index0]}}">{{ p }}</a> </li>
+          {% else %}
+            <li class="card-text">{{ p }}</li>
+          {% endif %}
+        {% 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 All Positions<span class="glyphicon glyphicon-chevron-right"></span></a>
+       </div>
+    </div>
+</div>
+
+{% endif %}
+
 {% 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 %}