Skip to content

Creating a Manage Staff page#629

Draft
ArtemKurasov wants to merge 218 commits into
developmentfrom
Bright_Artem_manage_people
Draft

Creating a Manage Staff page#629
ArtemKurasov wants to merge 218 commits into
developmentfrom
Bright_Artem_manage_people

Conversation

@ArtemKurasov

@ArtemKurasov ArtemKurasov commented Jul 6, 2026

Copy link
Copy Markdown

The Manage Staff page is accessed from the Department Portal.

BetterRocket and others added 30 commits June 30, 2026 18:45
@BetterRocket
edited supervisorDepartment
4a7be6c
@BetterRocket
edited supervisorDepartment
12d8d41
@brightfietsop-ux
added the position history file
a868455
@johnlolonga19
added the allocation model
83c8c92
@nahom70
Added dummy data: weren't able to check if they work though
caad7d3
@conwelld
changed migrate_db.sh data to add PositionHistory, and added dummy da…
bea1a8c 
…ta to demo_data.py
@johnlolonga19
allocation table added
2978b55
@BetterRocket
dummy allocations added
912f50f
@ArtemKurasov
Successfully added dummy data for the SupervisorDepartment class
a61ff1d
@BhushanSah
Inserted the demo data
cebf62e
@fritzj2
added a second round of demo data to the allocation
539efde
We added more data for position history
6d58afd
@conwelld
fixed the demo_data to make it easier to merge, and fixed the positio…
e670c2f 
…nhistory info to change the primary key field so position code shows
@conwelld
fixed demo data to fit pre existing format
4c3f875
fixed formating
6666512
fixed formating again
0d517a9
fixed merge conflict
e5869bb
@munsakad
Merge branch 'PeeWeeAttribute_PosHis' into Nahom_Dee_Alpha_peeweeAttr…
ad3c194 
…ibute
@munsakad
Merge pull request #597 from BCStudentSoftwareDevTeam/Nahom_Dee_Alpha…
c953725 
…_peeweeAttribute

Nahom dee alpha peewee attribute
@BhushanSah
Modified allocation
49b5eac
@BhushanSah
Merge branch 'allocation_demoData_JJ' into PeeWeeAttribute-CG-BS
ea12fae
@BhushanSah
Merge pull request #600 from BCStudentSoftwareDevTeam/PeeWeeAttribute…
5545996 
…-CG-BS

Pee wee attribute cg bs
@conwelld
fixed the format issue on demo data and made the composite key on pos…
30c5fe9 
…itionhistory
@BhushanSah
Merge pull request #601 from BCStudentSoftwareDevTeam/allocation_demo…
364a5e3 
…Data_JJ

Allocation demo data jj
@conwelld
changed meta class in position history adn fixed identifiers in demo …
9b7e778 
…data
@ArtemKurasov
Resolved the merge conflict with the demo data
5c027e3
@BrianRamsay
Add base for department portal
a52eeca
@BrianRamsay
Fix menu item highlighting for dept portal
0ebcfd7
@BrianRamsay
Add empty file for common routes
ba5a40b
@brightfietsop-ux
added an HTML file for manage people added the main routes to the page
65c6b03
conwelld and others added 30 commits July 13, 2026 20:08
@conwelld
removed redundant code
8252f0d
@BetterRocket
collapsed supervisorDepartments definition
2fbb322
@BhushanSah
fixed the for loop so it won't run more than 3 times
71d5fd7
@BhushanSah
Merge branch 'MembersCard' of https://github.com/BCStudentSoftwareDev…
3482c4e 
…Team/lsf into MembersCard
@BhushanSah
Fixed the loop for postion card
1f68174
@MImran2002
Merge pull request #645 from BCStudentSoftwareDevTeam/MembersCard
60ada1e 
Members card
@conwelld
fixed merge conflict member card
79e47a6
@ArtemKurasov
Tried Merging development-portal-base into Bright_Artem_manage_people…
e373a5b 
… once again
@brightfietsop-ux
fixed the merge conflict
4f3c76a
@brightfietsop-ux
added a route to the manage supervisor button
d2d74f6
@conwelld
fixed some pr problems
d03906c
@brightfietsop-ux
added an import statement to fix add members
a663d78
@brightfietsop-ux
fixed a bug on add with b-number
135d43a
@MImran2002
Merge pull request #642 from BCStudentSoftwareDevTeam/Bright_Artem_ma…
6b98e02 
…nage_people

Adding the Manage Members Page + Fixing the Demo Data Discrepancies
@conwelld
fixed all merge conflicts
6eedbfa
@conwelld
fixed format in managemembers
b0ba70d
@MImran2002
Merge pull request #647 from BCStudentSoftwareDevTeam/allocation_card
7f8358c 
added allocation card to department portal page
@nahom70
fixed issue for route and can merge successsfully
9afb2c6
@MImran2002
Revert allocation card PR #647
7328dbc
@MImran2002
Revert "Merge pull request #642 from BCStudentSoftwareDevTeam/Bright_…
9c716f5 
…Artem_manage_people"

This reverts commit 6b98e02, reversing
changes made to 60ada1e.
@MImran2002
Revert "Merge pull request #645 from BCStudentSoftwareDevTeam/Members…
78e8786 
…Card"

This reverts commit 60ada1e, reversing
changes made to 3f443be.
@MImran2002
Revert position card PR #639
3e5a529
@ArtemKurasov
Reverted the merges
dad0a49
@ArtemKurasov
Got all of the changes from the Manage_Members_Bright_Artem branch
0684323
@brightfietsop-ux
made the portal to work
8bcd89b
@brightfietsop-ux
made the isBanned banner to display a popup
24d7ca1
@ArtemKurasov
Fixed the Assign Coordinator switch + moved some of the logic to mana…
194ff1c 
…geMembers.py
@ArtemKurasov
Used functions from app/logic/manageMembers..py
52b7efc
@brightfietsop-ux
removed a duplicate function
c2052a7
@brightfietsop-ux
broke down the mangeMembers into samller functions and moved it app/l…
a649439 
…ogic
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BrianRamsay BrianRamsay Awaiting requested review from BrianRamsay
@MImran2002 MImran2002 Awaiting requested review from MImran2002
@ACBerea ACBerea Awaiting requested review from ACBerea

At least 1 approving review is required to merge this pull request.

Assignees

@brightfietsop-ux brightfietsop-ux

@ArtemKurasov ArtemKurasov

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.