Manage Departments Page Update by ACBerea · Pull Request #648 · BCStudentSoftwareDevTeam/lsf

ACBerea · 2026-07-13T21:33:44Z

Issue Description

Fixes Issue #623

Display the allocation of all departments on the Manage Departments page.

Changes

Added 4 new buttons at the top of the Manage Departments page: Upload Allocations, Download Allocation History, Annual Allocation Review, and Annual Position Review.
Created 3 new columns: Current Allocations, Requested Allocations, and Actions.
- The Current Allocations column displays approved allocations for the current academic year, which includes primary positions, secondary positions, and break hours. If the department has no current approved allocation, "no current allocations" should be displayed.
- The Requested Allocations column is supposed to display requested allocations for the next academic year.
- The Actions column has an action button, which allows the admin to manage departments (view its positions, allocation history, faculty members, along with sending an allocation review).
Added modals/popups for the Annual Allocation Review and Annual Position Review buttons.

Changes (Once PR #668 Gets Merged)

Made the Allocation Review button work with the backend.
Created a new getCurrentAndNextAY() function, which returns the current and the following academic years.
Added an allocationExists() function, which checks whether an allocations matching certain criteria exist.

Changes (Once PR #662 Gets Merged)

Made the Annual Position Review button work with the backend.
Added an email template for annual position reviews.

To-Do List (on August 7) ❗

If the department does not request an allocation, the table should just show “not requested.” If it requests an allocation and the allocation is approved, it should show “approved.”
On the Requested Allocations column, we must display allocations requested for the next year instead of current approved allocations.
Inactive departments can request allocations, but labor supervisors cannot see these requests and cannot approve them unless they type the URL. It is all because the Allocation Review button is only for active departments.
(Possible/Optional Change) Implementing all the functions from allocationManager.py into the Manage Departments page.

Manual Testing

Check if the Status toggle properly switches between In Compliance and Not in Compliance (you can also reload the page and rerun Flask to check if the changes get saved to the database).
Switch between different available years in the Academic Year dropdown. As you switch between years pay attention to the URL and the Allocation Status header: they must reflect the chosen year.
Click on the Annual Allocation Review and Annual Position Review buttons to make sure the modals actually pop up.

Testing with Test Suites

Type pytest tests/code/test_manageDepartments.py in the command line to run all the test suites written for the Manage Departments page.
Type pytest tests/code/test_academicYearManager.py in the CLI to test the getCurrentAndNextAY() function.
Type pytest tests/code/test_allocationManger.py in the CLI to test the allocationExists() function.

…rmName to academicYear in manageDepartments.html

…dary

… each department, each year

… purposes.

…ments

…eplacing it with accurate dummy data.

…ed breakHours

…website. Added commented out code for the pending variation of the Approved Button in manageDepartments.html.

… for Approved Allocation Status Testing.

…will now change based on if the allocation isFinal from either pending or approved.

…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments

… changed demo data appropriatly.

…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments

…sition of the current AY droplist

… Review Buttons

…eDepartments' into dep_portal_ad_ManageDepartments

…nage Departments page

…ges to the UI

…ments

…py files significantly

BhushanSah · 2026-07-30T14:24:06Z

+    .group_by(LaborStatusForm.department, LaborStatusForm.termCode).dicts()
+)
+
+    print(list(totalBreakSum))


This debug print should be removed.

Thank you for pointing this out

BhushanSah · 2026-07-30T14:24:56Z

+        on = (LaborStatusForm.termCode == Term.termCode)
+    )
+    .where(
+        (FormHistory.historyType == "Labor Status Form") &


Should this also filter FormHistory.historyType == "Labor Status Form"? Right now it only checks Approved status, so other approved history rows could accidentally be included in the position counts.

Honestly, I am not sure. Actually, this will probably be fully replaced

This filter is actually in the code! It's on line 81

BhushanSah · 2026-07-30T14:26:22Z

@@ -0,0 +1,189 @@
+import pytest


Could we clean this test file before merging? There are several unused imports and a large commented-out test block. It would be better to keep only the active tests and the imports they need.

I will clean this all up

BhushanSah · 2026-07-30T14:31:29Z

+            Chosen AY: {{ academicYear.split(" ")[1] }}
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1" style="width: 200px; text-align: center;">


Academic year dropdown opens
but does not clearly close
before closing the dropdown div.

BhushanSah · 2026-07-30T14:32:00Z

+              <td style="white-space: nowrap">
+                <div class="dropdown">
+                  <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1"
+                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">


Action dropdown/table row markup looks unbalanced. There is an extra closing before .

…e + Updated some of the comments

…r own files + Cleaned up the manageDepartments.js file

…anguage

…ments

…the Allocation Review page

…ments

zhytkovd and others added 30 commits July 2, 2026 20:56

Started working on HTML design

9d4acbf

Finished initial design of the department page

8deecb5

Fixed current year button position

9a14e6d

centered data in the table and div container

6a5fec7

Merge branch 'PeeWeeAttribute' into dep_portal_ad

20e8718

Merge branch 'development' into dep_portal_ad

cde15a7

Fixed actions button: made it similar to the other dropdown menus

7341b74

Finished requested UI changes: renaming some elements

25b6251

Added brake hours from the database to the UI

c6c7293

Fixed brake hours given: removed double loop and filtered by AY

636dd71

Added accurate academic year to manage_department.py by allocating te…

b615974

…rmName to academicYear in manageDepartments.html

Changed test data to include break hours in the:changed them to secon…

ac35d1e

…dary

Created a separate function for calculating total break hours used by…

d68e73f

… each department, each year

Began implementing logic for current year. Committing now for merging…

d87910c

… purposes.

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

b900ff1

…ments

Fixed dummy data issues for testing purposes.

22d77f9

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

e977ecb

…ments

Fixed dummy data error regarding left over current_year variable by r…

54021ef

…eplacing it with accurate dummy data.

Added new demo data and improved sql joins.

56bd437

Applied break hours used/give to HTML and fixed extracted data for us…

978b098

…ed breakHours

Fixed button color for actions button to match other versons on the …

6119490

…website. Added commented out code for the pending variation of the Approved Button in manageDepartments.html.

Added demo data for inactive departments in demo_data.py

20aa6e8

Changed isFinal from False to True for some demo-data in demo-data.py…

5747cd2

… for Approved Allocation Status Testing.

Added current year dropdown

11dd7ed

Added functionality to Allocation Approval Status. The status button …

d1844b7

…will now change based on if the allocation isFinal from either pending or approved.

Merge branch 'department-portal-base' of https://github.com/BCStudent…

f2d9266

…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments

Fixed primary and secondary positions to use database information and…

dfcf6f7

… changed demo data appropriatly.

Merge branch 'department-portal-base' of https://github.com/BCStudent…

f90dd7e

…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments

Fixed the bug with the active/inactive departments and changed the po…

1796ba8

…sition of the current AY droplist

Fixed the bug with the active/inactive departments and changed the po…

86683f9

…sition of the current AY droplist

ArtemKurasov and others added 9 commits July 27, 2026 11:56

Added modals for the Annual Allocation Review and the Annual Position…

4c88fbc

… Review Buttons

Merge remote-tracking branch 'refs/remotes/origin/dep_portal_ad_Manag…

6828794

…eDepartments' into dep_portal_ad_ManageDepartments

Added the Term dropdown + Made a lot of changes to the look of the Ma…

66fa149

…nage Departments page

Added new line to table headers

866cbf5

Added a popup for the Allocation Review button + made some minor chan…

2eb23e6

…ges to the UI

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

d9de982

…ments

Tidied up import statements + Deleted some comments

8f69073

Cleaned up the manage_departments.py and the logic/manageDepartments.…

1319589

…py files significantly

Added tests for the generateAdjacentYears() function

39592bb

ArtemKurasov assigned zhytkovd and ArtemKurasov Jul 29, 2026

ArtemKurasov added epic A project that will require multiple sub-tasks to complete and removed draft labels Jul 29, 2026

ArtemKurasov added 2 commits July 29, 2026 15:26

Renamed manage_departments.py to manageDepartments.py

d9dd9c5

Started working on a separate Allocation Review Page

7c22a80

ArtemKurasov requested a review from BhushanSah July 30, 2026 14:00

BhushanSah requested changes Jul 30, 2026

View reviewed changes

ArtemKurasov and others added 13 commits July 30, 2026 11:31

Integrated the Allocation Review form into the Manage Departments pag…

db2bcb5

…e + Updated some of the comments

Moved the styles and js code for the Allocation Review page into thei…

226d3ff

…r own files + Cleaned up the manageDepartments.js file

Made changes in accordance with Bhushan's comments

4c6c659

Added a popup for the Upload Allocations button + Fixed some of the l…

2184f5d

…anguage

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

07d7496

…ments

Fixed several typos

f409edf

Changed the names of the Action Button options

927651b

Added links to the options of the Action button + updated the URL of …

887ecb4

…the Allocation Review page

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

751de1e

…ments

Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…

1f27acc

…ments

changed UI to reflect new changes

aaa3ab2

Removed the concept of the previous AY in the backend

4c82542

More changes to the UI and backend related to the previous AY

d98921d

Navigation Menu

Uh oh!

Manage Departments Page Update - #648

Manage Departments Page Update#648
ACBerea wants to merge 85 commits into
department-portal-basefrom
dep_portal_ad_ManageDepartments

ACBerea commented Jul 13, 2026 •

edited by ArtemKurasov

Loading

Uh oh!

BhushanSah Jul 30, 2026

Uh oh!

ArtemKurasov Jul 30, 2026

Uh oh!

BhushanSah Jul 30, 2026

Uh oh!

ArtemKurasov Jul 30, 2026

Uh oh!

ArtemKurasov Jul 30, 2026

Uh oh!

BhushanSah Jul 30, 2026

Uh oh!

ArtemKurasov Jul 30, 2026

Uh oh!

BhushanSah Jul 30, 2026

Uh oh!

BhushanSah Jul 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

ACBerea commented Jul 13, 2026 • edited by ArtemKurasov Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue Description

Changes

Changes (Once PR #668 Gets Merged)

Changes (Once PR #662 Gets Merged)

To-Do List (on August 7) ❗

Manual Testing

Testing with Test Suites

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!

5 participants

ACBerea commented Jul 13, 2026 •

edited by ArtemKurasov

Loading