Adding an Allocation Review & an Allocation Request Pages by ArtemKurasov · Pull Request #668 · BCStudentSoftwareDevTeam/lsf

ArtemKurasov · 2026-08-05T20:59:27Z

Issue

Fixes issues #613 and #614

Changes

Added an Allocation Request page (can only be accessed via URL currently)
Added an Allocation Review page (accessed through Manage Departments > Actions > Review Allocation)
Departments can now submit allocation requests, while admins (the Labor Department) can review and approve them
Created two new logic functions: getCurrentAndNextYear() and allocationExists()
Updated the demo data

Automatic Testing

Run pytest tests/code/test_academicYearManager.py and pytest tests/code/test_allocationManger.py to make sure the newly created allocation functions work.

Manual Testing

First of all, reset the database (because there were changes to the demo data)
Try opening allocation reviews for all departments (you should not be able to open allocation reviews for the Biology and Math departments, because the Biology department have not submitted anything yet, and the Math department has already gotten its allocation approved)
Go to the Department Portal, choose a department, and /allocations/request to the end of the URL. You should appear on the Allocation Request page.
Change the numbers and submit the request.
Go Back to the Manage Departments page, and choose the 2025-2026 academic year. You should see the request appearing there.
Go back to the Department Portal, choose the same department, and /allocations/request to the end of the URL.
Edit the numbers once again and submit the request.
Go Back to the Manage Departments page, and choose the 2025-2026 academic year. You should see the updated request there.
Approve the request by submitting the Allocation Review form.

…dy approved

… allocation review + admins can no longer review allocations that has not been requested

… pages

…rrent allocation

…urrentYear instead of g.openTerm

…location requests

…orms

MImran2002 · 2026-08-06T19:25:54Z

+
+ # checking if the allocation has already been approved (in other words, if an approved allocation exists)
+ if allocationExists(nextAY.termCode, dept, isFinal=True):
+ flash(f"The allocation for the {nextAY.termName.split(" ")[1]} academic year has already been approved; therefore, you can no longer resubmit it.", "danger")


bug f string error

MImran2002 · 2026-08-07T18:36:29Z

 if not currentUser: # If the current user is not logged in
 return render_template('errors/403.html')
- if not currentUser.isLaborAdmin: 
+ if not (currentUser.isLaborAdmin or currentUser.isLaborDepartmentStudent): 


we can remove currentuser.islabordepartmentstudent as they re only given to pendingforms and we figured out yesterday that islaboradmin can be given to student workers

MImran2002 · 2026-08-07T18:47:56Z

+
+ # checking if the department has requested any allocation review 
+ if not allocationExists(nextAY.termCode, dept, isFinal=False):
+ flash(f"The {dept.DEPT_NAME} department has not requested an allocation review yet.", "danger")


a warning or an info as this is nothing related to error it cannot be danger but this is about informing so this is likely a warning or info

MImran2002 · 2026-08-19T19:20:47Z

 session['openTerm'] = model_to_dict(term)
 g.openTerm = term

+def getCurrentYear():


getCurrentAY as this is grabbing academic year not just current year

MImran2002 · 2026-08-19T19:20:59Z

+ return year, year + 1
+
+@app.before_request
+def load_currentYear():


load_currentAY

MImran2002 · 2026-08-19T19:21:17Z

+ begins from the start of July). 
+ """
+
+ currentYear = g.currentYear[0] 


currentYear, nextYear = g.currentYear

MImran2002 · 2026-08-19T19:41:47Z

+ currentAY, nextAY = getCurrentAndNextAY()
+
+ # getting the ID of the user who approves the request
+ approverID = require_login().userID


g.currentUser.userID as currentUser is expose globally and we don't want to authenticate whenever the labor approve a allocation.

MImran2002 · 2026-08-19T19:45:01Z

+ return render_template('errors/404.html'), 404
+
+
+ # cheching if the user can visit this page


MImran2002 · 2026-08-19T20:39:40Z

+
+<p align="center" id="allocationRequestSubtitle">
+ <strong>
+ Submit an allocation request to the Labor Department


Berea's work study program

MImran2002 · 2026-08-19T20:42:32Z

 def load_user():
- try: 
- g.currentUser = dict_to_model(User, session['currentUser'])
+ requestUsername = getUsernameFromEnv(request.environ)


remove these as this would not be relevant for the issue at this point

…estions

MImran2002

looks good

ArtemKurasov added 16 commits August 3, 2026 10:17

Made the Allocation Review page reflect actual requested allocations
51d34b8

Merge branch 'dep_portal_ad_ManageDepartments' into Artem-alloc-review
e19a298

Updated the layout of the Allocation Review Form + updated the database
09132b1

Add popovers for the Allocation Review page
fc21863

Forbade opening the Allocation Review page if the allocation is alrea…
4d1bd2e
…dy approved

Made the Approve button save the Allocation Review form
f3e0339

THe approvedBy and approvedOn are now saved with the submission of an…
37e6fbb
… allocation review + admins can no longer review allocations that has not been requested

Created a new Allocation Request page
aa78f71

Made the Allocation Request form get saved to the database
e4c0d29

Cleaned up the code
f3833f7

Merge branch 'dep_portal_ad_ManageDepartments' into Artem-alloc-review
083e556

Reformatted the code for the Allocation Review and Allocation Request…
73b3ac4
… pages

Updated some of the logic
5585ef0

Added tests for the newly created logic functions
e4c7895

Made the getOrUpdateRequestedAllocation function not depend on the cu…
582a393
…rrent allocation

Added a new getCurrentAndNextYear() function + tests for it
d8a6635

ArtemKurasov marked this pull request as ready for review August 5, 2026 21:21

ArtemKurasov self-assigned this Aug 5, 2026

ArtemKurasov requested review from BrianRamsay and MImran2002 August 5, 2026 21:21

ArtemKurasov added 3 commits August 6, 2026 11:26

Updated the demo data and the getCurrentAndNextAY function to use g.c…
731ab49
…urrentYear instead of g.openTerm

Fixed some backend issues + Allowed inactive departments to submit al…
5a24ad2
…location requests

Updated the styles for the Allocation Request and Allocation Review f…
1fef151
…orms

MImran2002 requested changes Aug 6, 2026
View reviewed changes

ArtemKurasov added 4 commits August 7, 2026 09:57

Allowed labor office students to access the Allocation Review page
dd23662

Allowed labor office students to access the Allocation Request page
3727d18

Allowed labor office students to access other pages for admins
0e217b9

Merge branch 'dep_portal_ad_ManageDepartments' into Artem-alloc-review
677adc0

fritzj2 mentioned this pull request Aug 7, 2026
Create a page for departments to view their allocations #667
Open

Moved from the generateAdjacentYears() function to getCurrentAndNextAY
3e83e9d

MImran2002 reviewed Aug 7, 2026
View reviewed changes

Reflected on the changes Imran had suggested
14b9365

ArtemKurasov mentioned this pull request Aug 7, 2026
Manage Departments Page Update #648
Open

Fixed the routing
215aa5b

MImran2002 requested changes Aug 19, 2026
View reviewed changes

Updated the name of the Labor Department
ca967a1

MImran2002 requested changes Aug 19, 2026
View reviewed changes

Comment threadapp/templates/main/allocationRequest.html

ArtemKurasov added 4 commits August 21, 2026 15:01

Updated the getCurrentAndNextAY() function, according to Imran's sugg…
8279dc4
…estions

Fixed other issues, suggested by Imran
08880b7

Turned g.currentYear into g.currentAY
2cc573d

Allowed the user to type numbers for break hours
d5a9f61

MImran2002 approved these changes Aug 21, 2026
View reviewed changes

MImran2002 merged commit 787f686 into dep_portal_ad_ManageDepartmentsAug 21, 2026

Navigation Menu

Uh oh!

Adding an Allocation Review & an Allocation Request Pages - #668

Adding an Allocation Review & an Allocation Request Pages#668
MImran2002 merged 31 commits into
dep_portal_ad_ManageDepartmentsfrom
Artem-alloc-review

ArtemKurasov commented Aug 5, 2026•
edited
Loading

Uh oh!

MImran2002Aug 6, 2026

Uh oh!

Uh oh!

MImran2002Aug 7, 2026

Uh oh!

MImran2002Aug 7, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

MImran2002Aug 19, 2026

Uh oh!

Uh oh!

MImran2002 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		return render_template('errors/404.html'), 404


		# cheching if the user can visit this page

Uh oh!

Conversation

ArtemKurasov commented Aug 5, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue

Changes

Automatic Testing

Manual Testing

Uh oh!

Choose a reason for hiding this comment

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!

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!

Uh oh!

MImran2002 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ArtemKurasov commented Aug 5, 2026•
edited
Loading