changes in new-allocation-card by conwelld · Pull Request #654 · BCStudentSoftwareDevTeam/lsf

conwelld · 2026-07-21T14:58:52Z

Allocation card revert merge

There was no way to access an allocation card from the department portals page, where one could view a summary of their allocations and click a view allocation button.

Changes

Added summary to the view allocation card that changes based on demo data
Added CSS styling to the HTML file
added allocation logic to the main routed file that iterates through labor status forms
Changed HTML to have card space for all three cards to be added
added demo data to students and forms so data looked more presentable
added information icon to AY as well as the break hours to give more context to what users are seeing.
added CSS styling to make the information icon
added JavaScript to allow for Bootstrap tooltips
added css styling that changes based on window size

Testing

Used 'flask run' to load the page, and everything shows up as it should
Reset the database, and no errors arose

conwelld · 2026-07-21T15:28:59Z

Thanks for looking into this. I have fixed the comments you have made (removed code from other branches and added comments to logic)

BetterRocket · 2026-07-21T18:15:13Z

+                           break_hours = sumBreak,
+                           )
+@main_bp.route('/department/<org>/<account>/managepositions', methods=['GET'])
+def managePositions(org, account):


The manage positions page is not under the scope of this issue. Remove.

We just remove the duplicated logic (if statement because it is suing the try and exception)

BetterRocket · 2026-07-21T18:24:35Z

+            "endDate": "2025-09-01"
+        }
+]
+LaborStatusForm.insert_many(dummy_lsf).on_conflict_replace().execute()


looks good otherwise

BetterRocket · 2026-07-21T18:28:13Z

No logic file and tests needed yet because the logic related to pulling allocations and allocation utilization will be standardized by another team, whereupon this will have to be modified to use those functions.

…everything touching the 202500

…rvice. See #657 but beyond that we created allo files

MImran2002 · 2026-07-22T18:25:15Z

@@ -1,5 +1,6 @@
 from flask import render_template, request, json, redirect, url_for, send_file, g, flash, jsonify
 from peewee import JOIN, DoesNotExist
+from flask_bootstrap import forms


remove extra import line

MImran2002 · 2026-07-22T18:26:46Z

 from app.login_manager import require_login, logout
 from app.logic.getTableData import getDatatableData
 from app.logic.banner import Banner
+from app.logic.allocation_utilization import get_department_allocation_summary


getDepartmentAllocationSummary other logic files uses camel casing

MImran2002 · 2026-07-22T18:27:20Z

 from app.logic.banner import Banner
+from app.logic.allocation_utilization import get_department_allocation_summary
+from app.models.allocation import Allocation
+from app.logic.tracy import Tracy


remove tracy

MImran2002 · 2026-07-22T18:27:45Z

-    try:
-        dept = Department.get(Department.ORG == org, Department.ACCOUNT == account)
-    except (NameError, DoesNotExist):
+    open_term = g.openTerm


camelcase and Dayton has talked to scott on not using term but we grab allocation but whenever we grab them we should sort them by most recent year so current term.

MImran2002 · 2026-07-22T18:33:15Z

+    open_term = g.openTerm
+    term_code = open_term.termCode
+
+    if org and account:


if org and account can be removed as it is working regardless

MImran2002 · 2026-07-22T19:02:13Z

 mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`lsf\`; CREATE USER IF NOT EXISTS 'lsf_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'lsf_user'@'%';"
 mysql -u root -proot --execute="CREATE DATABASE IF NOT EXISTS \`UTE\`; CREATE USER IF NOT EXISTS 'tracy_user'@'%' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'tracy_user'@'%';"

-cd database


we don't touch those files unless there is a separate PR on these

MImran2002 · 2026-07-22T19:02:31Z

+              <h1>Allocations</h1>
+            </div>
+            <div class="header-container">
+              <h3>{{ term.termName }} <i class="bi bi-info-circle" data-toggle="tooltip" data-placement="top" title="All values are shown as Used/Given"></i></h3> <h3>{{used_allocation}}/{{total_allocation or 0}} Positions</h3>


used/allocated

MImran2002 · 2026-07-22T19:03:07Z

+              </span>
+            </div>
+            <div class="media-body media-middle">
+              <h1>Allocations</h1>


<h3> not <h1>

MImran2002 · 2026-07-22T19:04:24Z

+              <h1>Allocations</h1>
+            </div>
+            <div class="header-container">
+              <h3>{{ term.termName }} <i class="bi bi-info-circle" data-toggle="tooltip" data-placement="top" title="All values are shown as Used/Given"></i></h3> <h3>{{used_allocation}}/{{total_allocation or 0}} Positions</h3>


if we are planning to use the most recent as a way in peewee we should find a way to get the term name for this summary card too

MImran2002 · 2026-07-22T19:05:15Z

+              <h1>Allocations</h1>
+            </div>
+            <div class="header-container">
+              <h3>{{ term.termName }} <i class="bi bi-info-circle" data-toggle="tooltip" data-placement="top" title="All values are shown as Used/Given"></i></h3> <h3>{{used_allocation}}/{{total_allocation or 0}} Positions</h3>


<h4> o
with something that has style changes

added changes from previous branch to avoid all files being commited

9bd90f6

conwelld self-assigned this Jul 21, 2026

conwelld requested review from BetterRocket and fritzj2 July 21, 2026 14:59

fritzj2 requested changes Jul 21, 2026

View reviewed changes

Comment thread app/controllers/main_routes/main_routes.py Outdated

Comment thread app/controllers/main_routes/main_routes.py

Comment thread app/controllers/main_routes/main_routes.py Outdated

conwelld changed the title ~~added changes from previous branch to avoid all files being commited new-allocation-card~~ changes in new-allocation-card Jul 21, 2026

fixed some pr comments

56d5a29

fritzj2 reviewed Jul 21, 2026

View reviewed changes

Comment thread app/static/css/departmentPortal.css Outdated

fritzj2 reviewed Jul 21, 2026

View reviewed changes

Comment thread app/static/css/departmentPortal.css Outdated

conwelld added 2 commits July 21, 2026 11:34

fixed some pr comments for css styling

faf1957

fixed useless code

1204269

This comment was marked as outdated.

Sign in to view

fritzj2 requested changes Jul 21, 2026

View reviewed changes

Comment thread app/controllers/main_routes/main_routes.py Outdated

Comment thread app/controllers/main_routes/main_routes.py Outdated

fixed department code

0f166c2

BetterRocket reviewed Jul 21, 2026

View reviewed changes

Comment thread app/controllers/main_routes/main_routes.py

BetterRocket reviewed Jul 21, 2026

View reviewed changes

DanielRukwasha assigned DanielRukwasha and unassigned conwelld Jul 21, 2026

We have change the hard coded part with variable able to be flexible …

6f5850a

…everything touching the 202500

DanielRukwasha mentioned this pull request Jul 22, 2026

Replace department-portal allocation summary with the shared allocation-utilization service #657

Open

Temporary allocation logic will be replaced by the official shared se…

813f398

…rvice. See #657 but beyond that we created allo files

MImran2002 assigned conwelld Jul 22, 2026

MImran2002 requested changes Jul 22, 2026

View reviewed changes

DanielRukwasha assigned munsakad Jul 22, 2026

Uh oh!

Conversation

conwelld commented Jul 21, 2026

Allocation card revert merge

Changes

Testing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

conwelld commented Jul 21, 2026

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BetterRocket commented Jul 21, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants