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

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

Changes

Added summary to the view allocation card that changes based on demo data
Added more CSS styling to the HTML file
An additional function to getTerms.py for handling current term
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

Rationale

Originally, this PR contained 2 additional files -> getAllocation.py and its test case.
- These were removed as the new logic for getting allocations was merged into the main branch.
- These files were unnecessarily adding more confusion to the code
Additional removals were decided based on being unnecessary
- These include the information icon displaying the contracted / allocated, which is now fully demonstrated
- 3 Additional file changes, such as migrate_db_tracy.sh, which were deemed unnecessary for the issue

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: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

…ve conflicts

MImran2002

make sure the 5 hours and 10 hours stick to the top too instead of spread out

…SoftwareDevTeam/lsf into new-allocation-card # Conflicts: # database/demo_data.py

getDepartmentAllocationSummary now calls allocationManager's getTotalAllocations/getContractedAllocations instead of reimplementing the same counts, removing countWorkers/getBreakHours and the manual Allocation SUM query. Falls back to zeroed defaults for a most-recent term that only has a draft allocation (no final row yet), and coalesces getContractedAllocations' break_hours since its SQL SUM() can return None. Updated test_getAllocation.py to match: removed the now-redundant countWorkers/ getBreakHours unit tests, updated the multi-row-allocation expectation to reflect final-only summing, and added coverage for the draft-only fallback.

database/demo_data.py called LaborReleaseForm.insert(...) but never imported the model, so any fresh database/reset_database.sh run failed with a NameError partway through seeding demo data. Pre-existing bug from the department-portal-base merge, unrelated to the allocation card changes.

…llocation Root cause: allocationManager's getContractedAllocations called getAllocation (isFinal=True only) for a value it never used, so any department whose most recent term only has a draft (not yet final) Allocation row raised DoesNotExist. getAllocation.py's earlier try/except caught that and fell back to zeroed defaults, which is why real demo data (departments with only draft allocations) started rendering 0s instead of their actual numbers. - allocationManager.py: removed the dead getAllocation() call from getContractedAllocations. Also folded its break-hours query to filter by department directly in SQL instead of fetching every department's totals and picking the first match after grouping by (department, termCode) - that grouping meant a department with approved break hours under both the specific term and the academic-year "00" bucket term would silently keep only whichever row came back first instead of summing them. Coalesces the SQL SUM() to 0 instead of leaving it None. - getAllocation.py: "allocated" is now summed directly from the Allocation rows already fetched for the most recent term (draft + final, matching the original pre-refactor behavior) instead of going through getTotalAllocations, which only looks at the final row. Dropped the DoesNotExist fallback - no longer needed now that the crash source is fixed at the root. - Updated test_getAllocation.py's multi-row and draft-only cases to expect the correct summed/draft values instead of the zeroed fallback. - Added two regression tests to test_allocationManger.py: getContractedAllocations without any Allocation row present, and break hours summed across a specific term and its academic-year bucket term.

…SoftwareDevTeam/lsf into new-allocation-card

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 Outdated

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 Outdated

BetterRocket reviewed Jul 21, 2026

View reviewed changes

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

Comment thread database/demo_data.py Outdated

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

fix the review comment from Minran, all of them

7584ffa

DanielRukwasha requested review from MImran2002 and fritzj2 July 27, 2026 17:11

Merge branch 'department-portal-base' into new-allocation-card, resol…

e9a4415

…ve conflicts

MImran2002 requested changes Aug 4, 2026

View reviewed changes

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

Comment thread app/logic/getAllocation.py Outdated

Comment thread database/migrate_db_tracy.sh Outdated

Comment thread tests/code/test_getAllocation.py Outdated

MImran2002 requested changes Aug 4, 2026

View reviewed changes

munsakad added 4 commits August 5, 2026 10:26

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

c7ef1ec

…SoftwareDevTeam/lsf into new-allocation-card # Conflicts: # database/demo_data.py

munsakad force-pushed the new-allocation-card branch from 102ee32 to 77eabdf Compare August 5, 2026 18:53

removed unneccesary comments

f3b43c6

munsakad force-pushed the new-allocation-card branch from 77eabdf to f3b43c6 Compare August 5, 2026 19:10

removed department information in main routes

6ae3931

MImran2002 requested changes Aug 5, 2026

View reviewed changes

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

Comment thread app/static/css/departmentPortal.css

fritzj2 assigned Jonimz and fritzj2 and unassigned munsakad and DanielRukwasha Aug 27, 2026

fritzj2 added 2 commits August 27, 2026 08:21

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

6f9486f

…SoftwareDevTeam/lsf into new-allocation-card

removed merge conflict fragment

6d6997c

fritzj2 assigned Jonimz and fritzj2 and unassigned Jonimz and fritzj2 Aug 27, 2026

fritzj2 added 9 commits August 27, 2026 09:44

fixed broken icons in css

ded0a5e

added smaller logic for the allocation card

ba90482

HTML now uses new variables

300b7b0

added the current semester

10fdda4

fixed syntax when no value it given

02a100d

removed out of scope change

9bb3197

removed out of scope database issue

fd86d2a

removed unused dateTime import

0b0324a

removed unused logic file

db6f90a

Uh oh!

Conversation

conwelld commented Jul 21, 2026 • edited by fritzj2 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Rationale

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!

Uh oh!

Uh oh!

BetterRocket commented Jul 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MImran2002 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

conwelld commented Jul 21, 2026 •

edited by fritzj2

Loading