changes in new-allocation-card - #654
Open
conwelld wants to merge 14 commits into
Open
Conversation
fritzj2
requested changes
Jul 21, 2026
conwelld
changed the title
fritzj2
reviewed
Jul 21, 2026
Author
|
Thanks for looking into this. I have fixed the comments you have made (removed code from other branches and added comments to logic) |
fritzj2
reviewed
Jul 21, 2026
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
fritzj2
requested changes
Jul 21, 2026
Contributor
|
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
MImran2002
requested changes
Jul 22, 2026
MImran2002
requested changes
Jul 29, 2026
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Allocation card revert merge
Changes
Testing