New backend logic for the Manage Departmetnts table. - #671
Open
zhytkovd wants to merge 6 commits into
Open
Conversation
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
1 participant
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.
How it looks after the changes:
Changes: I changed UI to display only current and requested allocations in the datatable. In addition, I wrote new backend logic for the table that i dependent on the department, so that we can display all of the departments, even if they don't have allocations.
A new function, getActiveDepartmentsAllocations(term,nextTerm), was created to make the Manage Department router more readable and was placed in the app/logic/manageDepartments.py. Its main goal is to create a dictionary with departmentID as a key and three Pewee objects (department, current allocations, and requested allocations) as a value. On the front end, we loop through each department ID once and can access any needed methods on those three objects.
Testing: I did surface-level testing, but did not have enough time to write test cases for the function.
I also added new allocation data to the demodata.py. Now it includes: allocations for 202500, and requested allocations for 2027.