Uh oh!
There was an error while loading. Please reload this page.
Manage Departments Page Update - #648
Open
ACBerea wants to merge 117 commits into
Open
Conversation
…rmName to academicYear in manageDepartments.html
… each department, each year
…eplacing it with accurate dummy data.
…website. Added commented out code for the pending variation of the Approved Button in manageDepartments.html.
… for Approved Allocation Status Testing.
…will now change based on if the allocation isFinal from either pending or approved.
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
… changed demo data appropriatly.
…SoftwareDevTeam/lsf into dep_portal_ad_ManageDepartments
…sition of the current AY droplist
…sition of the current AY droplist
… allocation review + admins can no longer review allocations that has not been requested
…urrentYear instead of g.openTerm
Adding an Allocation Review & an Allocation Request Pages
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue Description
Fixes Issue #623
Changes
Changes (Once PR #668 Gets Merged)
getCurrentAndNextAY()function, which returns the current and the following academic years.allocationExists()function, which checks whether an allocations matching certain criteria exist.Changes (Once PR #662 Gets Merged)
To-Do List (on August 7) ❗
If the department does not request an allocation, the table should just show “not requested.” If it requests an allocation and the allocation is approved, it should show “approved.”
On the Requested Allocations column, we must display allocations requested for the next year instead of current approved allocations.
Inactive departments can request allocations, but labor supervisors cannot see these requests and cannot approve them unless they type the URL. It is all because the Allocation Review button is only for active departments.
(Possible/Optional Change) Implementing all the functions from allocationManager.py into the Manage Departments page.
Manual Testing
In ComplianceandNot in Compliance(you can also reload the page and rerun Flask to check if the changes get saved to the database).Testing with Test Suites
pytest tests/code/test_manageDepartments.pyin the command line to run all the test suites written for the Manage Departments page.pytest tests/code/test_academicYearManager.pyin the CLI to test thegetCurrentAndNextAY()function.pytest tests/code/test_allocationManger.pyin the CLI to test theallocationExists()function.