Skip to content

Manage Departments Page Update#648

Open
ACBerea wants to merge 40 commits into
department-portal-basefrom
dep_portal_ad_ManageDepartments
Open

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

Conversation

@ACBerea

@ACBerea ACBerea commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Issue Description

Fixes for Issue #623

  • Display Current Department Allocation on the Manage Departments Page

Changes

  • Added current break hour out of a maximum break hours.
  • Added primary and secondary position allocation information.
  • Linked the department name to portal.
  • Added Academic Year Dropdown.
  • Added pending and approved elements to allocation approval status.

Testing

  • Testing was done using SQL, looking at tables for information about the database.
  • Testing was done using print statements in python files.

zhytkovd and others added 30 commits July 2, 2026 20:56
@zhytkovd
Started working on HTML design
9d4acbf
@zhytkovd
Finished initial design of the department page
8deecb5
@zhytkovd
Fixed current year button position
9a14e6d
@zhytkovd
centered data in the table and div container
6a5fec7
@ACBerea
Merge branch 'PeeWeeAttribute' into dep_portal_ad
20e8718
@zhytkovd
Merge branch 'development' into dep_portal_ad
cde15a7
@zhytkovd
Fixed actions button: made it similar to the other dropdown menus
7341b74
@zhytkovd
Finished requested UI changes: renaming some elements
25b6251
@zhytkovd
Added brake hours from the database to the UI
c6c7293
@zhytkovd
Fixed brake hours given: removed double loop and filtered by AY
636dd71
@ACBerea
Added accurate academic year to manage_department.py by allocating te…
b615974 
…rmName to academicYear in manageDepartments.html
@zhytkovd
Changed test data to include break hours in the:changed them to secon…
ac35d1e 
…dary
@zhytkovd
Created a separate function for calculating total break hours used by…
d68e73f 
… each department, each year
@ACBerea
Began implementing logic for current year. Committing now for merging…
d87910c 
… purposes.
@ACBerea
Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…
b900ff1 
…ments
@ACBerea
Fixed dummy data issues for testing purposes.
22d77f9
@ACBerea
Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…
e977ecb 
…ments
@ACBerea
Fixed dummy data error regarding left over current_year variable by r…
54021ef 
…eplacing it with accurate dummy data.
@zhytkovd
Added new demo data and improved sql joins.
56bd437
@ACBerea
Applied break hours used/give to HTML and fixed extracted data for us…
978b098 
…ed breakHours
@ACBerea
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.
@ACBerea
Added demo data for inactive departments in demo_data.py
20aa6e8
@ACBerea
Changed isFinal from False to True for some demo-data in demo-data.py…
5747cd2 
… for Approved Allocation Status Testing.
@zhytkovd
Added current year dropdown
11dd7ed
@ACBerea
Added functionality to Allocation Approval Status. The status button …
d1844b7 
…will now change based on if the allocation isFinal from either pending or approved.
@ACBerea
Merge branch 'department-portal-base' of https://github.com/BCStudent…
f2d9266 
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
@ACBerea
Fixed primary and secondary positions to use database information and…
dfcf6f7 
… changed demo data appropriatly.
@ACBerea
Merge branch 'department-portal-base' of https://github.com/BCStudent…
f90dd7e 
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
@zhytkovd
Fixed the bug with the active/inactive departments and changed the po…
1796ba8 
…sition of the current AY droplist
@zhytkovd
Fixed the bug with the active/inactive departments and changed the po…
86683f9 
…sition of the current AY droplist
@ACBerea ACBerea requested a review from MImran2002 July 13, 2026 22:49
@ACBerea ACBerea self-assigned this Jul 13, 2026
@ACBerea ACBerea added the draft label Jul 13, 2026
ACBerea and others added 9 commits July 13, 2026 19:23
@ACBerea
Changed the Allocation Approval Status to a label instead of a button…
c5d61d1 
… for uniformity with the rest of the website.
@ACBerea
Added additional demo data for testing for positions on the manage de…
2417c95 
…partments page.
@zhytkovd
Fixed allocation approval status bittons
9daec6b
@ACBerea
Improved year dropdown label text and commented out print statements.
28dfb5d
@ACBerea
Merge branch 'department-portal-base' of https://github.com/BCStudent…
f87ccce 
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
@ACBerea
Merge branch 'department-portal-base' of https://github.com/BCStudent…
924c56e 
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
@MImran2002
Merge branch 'department-portal-base' into dep_portal_ad_ManageDepart…
fb2356e 
…ments
@ACBerea
Merge branch 'dep_portal_ad_ManageDepartments' of https://github.com/…
4ee93d2 
…BCStudentSoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
@ACBerea
Fixed breakHourByDepartments issue and adjusted duplicate dummy data.
f6fa196
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MImran2002 MImran2002 Awaiting requested review from MImran2002

Assignees

@ACBerea ACBerea

Labels

draft

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ACBerea @zhytkovd @MImran2002