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

…ntegration tests

…tract countWorkers/getBreakHours with FormHistory approval filter, dynamic term in departmentPortal.html, and revert environment-specific path edits in base_data.py/demo_data.py. Add integration test coverage for the new logic functions.

…ve conflicts with the new Members card feature

…llocation.py, excluding denied forms from countWorkers and the used count. Update tests to cover the new behavior.

…wording, and aligned Primary/Secondary table Replace the raw "AY 2025-2026" term name with a computed current-semester label (e.g. "Fall 2025") derived from the term's own year and today's month, matching the Fall/Spring termCode convention used elsewhere. Reword ratios as "X of Y" instead of "X/Y", rename the card title to "Current Allocation", and rebuild the Primary/Secondary breakdown as a single table so every row (term info, headers, hour buckets, break hours) shares the same column alignment and stays legible down to mobile widths.

…ment-portal-base merge The base branch (department-portal-base) moved managePositions out of main_routes.py into its own departmentPortal.py with proper permission checks (commit ee19d87), but merging that branch in and accepting both sides left the old, now-dead copy in main_routes.py alongside the new file, so Flask registered two view functions under the same endpoint name and crashed on startup with "View function mapping is overwriting an existing endpoint function: main.managePositions". Remove the stale duplicate (it also referenced an unimported Tracy class) and the duplicate departmentPortal import in __init__.py from the same merge.

…s)" format and drop Break Hours Match the supervisor's whiteboard mockup: each Primary/Secondary hour bucket now reads as two lines ("10 hr: 2 contracts" / "(out of 5 allocations)") with correct singular/plural wording, via a small Jinja macro to avoid repeating the format six times. Break Hours is removed from the card entirely. Column alignment (left edges shared across the term row, headers, and hour rows) is unchanged, and the pinch-zone media query is retuned for the new, longer per-row text so nothing clips or overflows at narrow widths.

…solidated tests - Rename allocation_summary and its snake_case keys/locals to camelCase (allocationSummary, currentSemester, usedPositions, breakHours, used10, usedSecondary5, ...) across the logic, route, template, and tests - Shorten the getCurrentSemesterLabel docstring - Reword the card to Contracted/Allocated in both the tooltip and the position count - Stack Secondary below Primary (and the count below the term) on narrow cards by splitting the paired table into two, instead of shrinking the font - Point the not-yet-built View Allocations page at "#" like the Members card, so the button no longer 404s - Collapse the per-scenario tests into one test per function, drop the leading underscore from createFormHistory, and mark the unit test so run_tests.sh stops deselecting it - Cover the used-count denial filter and make the term filter and the getBreakHours other-term assertion actually meaningful - Revert unrelated whitespace/formatting churn in main_routes.py

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.

MImran2002 · 2026-08-05T20:24:55Z

                           departments = departments,
                           department = dept,
+                           allocation = allocation,
+                           allocated = allocationSummary["allocated"],


I believe I have comment on this before if we are rendering allocationsummary with multiple variables we can just send the allocationsummary to jinja and use {{ allocatedsummary.allocated }} to access the elements inside while in the macros like {% macro allocationRow(hours, used, allocationsummary) -%}
you just use allocationsummary instead

MImran2002 · 2026-08-05T20:31:05Z

+    margin: 10px 0;
+}
+.allocation-columns {
+    display: flex;


make sure the secondary hours are on the top and not evenly space

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 Jul 29, 2026

View reviewed changes

DanielRukwasha added 3 commits July 29, 2026 14:42

Fix import after allocationUtilization rename to getAllocation, add i…

20b424c

…ntegration tests

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

6abd704

…ve conflicts with the new Members card feature

DanielRukwasha requested review from MImran2002 and removed request for fritzj2 July 30, 2026 14:21

DanielRukwasha unassigned conwelld Jul 30, 2026

DanielRukwasha and others added 5 commits July 30, 2026 11:12

Adopt approval-status filtering from UsedAllocFunction branch in getA…

8618b68

…llocation.py, excluding denied forms from countWorkers and the used count. Update tests to cover the new behavior.

Merge branch 'department-portal-base' into new-allocation-card

86bee45

MImran2002 requested changes Aug 3, 2026

View reviewed changes

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

Comment thread database/migrate_db_tracy.sh

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

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!

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!

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MImran2002 left a comment

Choose a reason for hiding this comment

Uh oh!

MImran2002 Aug 5, 2026

Choose a reason for hiding this comment

Uh oh!

MImran2002 Aug 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants