Michel-branch - #9

Open

Michel320670 wants to merge 250 commits into

UWIBestGroupEver:mainfrom

RiggedToEncodeCOMP3613:michel-branch

Commits on Nov 11, 2025

update: Made basic command functionality
Xn00bslayerX
authored
5bd0d6f
Controller now has working methods
Xn00bslayerX
authored
0718e04
feat: Activityhistory implemented
Xn00bslayerX
authored
6b64ed0

Commits on Nov 12, 2025

Added viewhistory command, and renamed some indexes to help clean up the code.
Xn00bslayerX
committed
a70f2e1
fix: update execute method to print student history directly
Xn00bslayerX
committed
6e52111
Merge pull request #1 from RiggedToEncodeCOMP3613/post-6ecb007
NeedRam
authored
af9281d

Commits on Nov 15, 2025

Commits on Nov 20, 2025

added postcreate command to devcontainer.json to fix env creation errors
NeedRam
committed
a068761
refactored most of student to fit new model diagram. still need History classes for a few methods
NeedRam
committed
cb3668a
refactored most of staff to fit new model diagram. still need History classes for a few methods
NeedRam
committed
c28b095
initial implementation of milestone model
NeedRam
committed
f0de61d
inital implementation of accolade model
NeedRam
committed
7e7ed09
refactored the whole controller class
NeedRam
committed
28f2c98
refactored the command class
NeedRam
committed
4e000a1
added missing models to the init
NeedRam
committed
32ae8de
implemented the Create Accolade Command
NeedRam
committed
db2b4ec

Commits on Nov 23, 2025

updated request > requestHistory class
Pubblez
committed
f1dfa7d
updated loggedhours to loggedhoursHistory class
Pubblez
committed
5e646ba
made accoladeHistory class
Pubblez
committed
c4fc65f
forgot to add in date_controller parse_date method used in requestHistory class
Pubblez
committed
d83e2ac
made milestoneHistory class
Pubblez
committed
514df9a
made activityHistory class
Pubblez
committed
e9a0a4b
added in correct file names for imports
Pubblez
committed
c9c7942
Merge pull request #2 from RiggedToEncodeCOMP3613/deen_isabella_branch
NeedRam
authored
1ca48a6
minor bugfixes to ensure compatibility with student/staff classes
NeedRam
committed
b20c486
minor bugfix
NeedRam
committed
aedd6be
properly implement methods/functions using History Classes
NeedRam
committed
7135cd8
properly implement methods/functions using History Classes
NeedRam
committed
8a513c0
rename and some changes
NeedRam
committed
1cb0cf7
inital implementation of accolade award command
NeedRam
committed
b877f6a

Commits on Nov 24, 2025

Commits on Nov 25, 2025

add CLI command for creating requests
Michel320670
committed
51de044
Add request deletion functionality
Michel320670
committed
3286009
feat(wsgi): added leaderboard commands.
Xn00bslayerX
committed
e1a25ac
fix: Leaderboard search should now correctly detect types
Xn00bslayerX
committed
b37f0d2
fix: Added the necessary helping functions in loggedHoursHistory.py to support leaderboard viewing via CLI command.
Xn00bslayerX
committed
1140322
Add create accolade functionality
Michel320670
committed
fb6f7ed

Commits on Nov 26, 2025

Commits on Nov 27, 2025

Commits on Nov 28, 2025

Commits on Nov 29, 2025

fixed import error
NeedRam
committed
cbc7a8f
organised all the cli groups after the mega merge, normalised code so everthing is displayed in a table and has some form of error handling
NeedRam
committed
fdfd74a
reorganised commands and placed funtions into their appropriate files. fixed minor naming bug
NeedRam
committed
1cfdf3e
moved direct database interactions into their controllers
NeedRam
committed
955c9b2
minor optimizations
NeedRam
committed
2fce159
reorganized functions
NeedRam
committed
203d897
changed query method
NeedRam
committed
3089e2a
fix typo and standardize error handling
NeedRam
committed
e636078
rename files
NeedRam
committed
4bfb0f1
update readme commands
NeedRam
committed
a0a1ca5
fixed wrong ids being generated
NeedRam
committed
c0bd884
fixed typo and renamed 2 commands
NeedRam
committed
50bcf7a
minor bugfix
NeedRam
committed
95d5c7f
created a proper initialize
NeedRam
committed
9b51d5c
refined initialization
NeedRam
committed
c758258
minor bugfix
NeedRam
committed
eab49d4
bugfix staff/student create after droptable and refactored outputs to display in a table
NeedRam
committed
e5bde98
refactored activity history commands
NeedRam
committed
8cf2479
added staff id column to history history commands
NeedRam
committed
4aaf039
update readme with history command changes
NeedRam
committed
75b45f7

Commits on Nov 30, 2025

Merge pull request #9 from RiggedToEncodeCOMP3613/deen-branch
Michel320670
authored
13a4dfd

Commits on Dec 1, 2025

unit tests added to loggedHoursHistory
Xn00bslayerX
committed
0af7c70
Unit tests for accolades, I'm not so sure about the interactions with students, I need a review there
Xn00bslayerX
committed
f4d74fb
unit tests added to milestone_controller
Xn00bslayerX
committed
3eb200c
unit tests for user passwords
Xn00bslayerX
committed
86ac2ed
fixed typo
NeedRam
committed
2cda4bd
fixed typo
NeedRam
committed
06e04c8
inital commit of Wireframe Code
NeedRam
committed
5650756
fix typo
NeedRam
committed
e6e934e
Add student registration tests to the test suite
Michel320670
committed
ea749fb
Add student registration tests to the test suite
Michel320670
committed
87c01df
Add delete_student to student tests
Michel320670
committed
cc33dd4
Merge branch 'michel-branch' of https://github.com/RiggedToEncodeCOMP3613/Project into michel-branch
Michel320670
committed
e151f74
Add staff registration tests to the test suite
Michel320670
committed
2765742
fix typo
NeedRam
committed
9d1167d
Add update_staff_username to staff tests
Michel320670
committed
d28b962
Add update_staff_email to staff tests
Michel320670
committed
521527a
Add update_staff_passwordl to staff tests
Michel320670
committed
e93e149
Add delete_staff test to staff tests
Michel320670
committed
1b60e48
Add integration test for staff creation and registration
Michel320670
committed
f82131c
Add fetch_all_requests test
Michel320670
committed
1210de0
Add unit test for delete_request_entry function
Michel320670
committed
08fcb56
Add unit test for updating student ID in request entry
Michel320670
committed
3ed9c87
Add unit test for updating request service
Michel320670
committed
39195db
Add unit test for updating request hours
Michel320670
committed
7db85dd
Add unit test for updating request status
Michel320670
committed
27df725
Add unit test for dropping request table
Michel320670
committed
a455962
Add test for awarding accolades
Michel320670
committed
5ee72fb
Add integration test for creating a student
Michel320670
committed
947bf0b
Add test for generating leaderboard
Michel320670
committed
27b856d
Add test for fetching approved hours and accolades
Michel320670
committed
0f669ba
Add test for student milestone achievement and logging hours
Michel320670
committed
22f5e04
Add test for viewing accolades assigned to a student
Michel320670
committed
6d6cdfb

Commits on Dec 2, 2025

created Integration Test: Activity History: test_activity_history_request_tracking()
NeedRam
committed
a323add
fixed bug
NeedRam
committed
03aba3b
created Integration Test: Activity History: test_activity_history_logged_hours_tracking()
NeedRam
committed
62eab28
create Integration Test: Activity History: test_activity_history_accolade_tracking()
NeedRam
committed
6cf6e8e
create Integration Test: Activity History: test_activity_history_milestone_tracking()
NeedRam
committed
0eaae92
fix test conflicts
NeedRam
committed
ff8cbf8
updated test_app relevancy
NeedRam
committed
9763e71
fix typo
NeedRam
committed
5bcfe19
create Integration Test: Request: test_update_pending_request()
NeedRam
committed
dc8b28d
create Integration Test: Request: test_create_student()
NeedRam
committed
86c6322
create Integration Test: Request: test_delete_request_with_activity()
NeedRam
committed
d905142
create Integration Test: Logged Hours: test_logged_hours_student_total_update()
NeedRam
committed
7a0056b
create Integration Test: Logged Hours: test_logged_hours_triggers_milestone()
NeedRam
committed
39deb7f
create Integration Test: Logged Hours: test_logged_hours_updates_rank()
NeedRam
committed
d933407
Add test for deleting accolade with history
Michel320670
committed
4fed16a
Add test for removing student from accolade
Michel320670
committed
d3de078
Add test for searching accolades by multiple criteria
Michel320670
committed
bd8ece8
create Integration Test: Milestones: test_create_milestone_retroactive_award()
NeedRam
committed
3912639
Merge pull request #11 from RiggedToEncodeCOMP3613/adam_tests
NothingWorksIDKWhy
authored
a2ba87c
Merge pull request #13 from RiggedToEncodeCOMP3613/michel-branch
NothingWorksIDKWhy
authored
f2579ea
Merge origin/main into deen-branch - combined integration and unit tests
NeedRam
committed
dfd14d7
merge requests, resolve conflicts and reorganizse tests
NeedRam
committed
8ca0881
reorganize user tests
NeedRam
committed
27bd382
reorganize student tests
NeedRam
committed
b892c7e
reorganize staff tests
NeedRam
committed
e9dd523
reorganize milestone tests
NeedRam
committed
18308a6
reorganize logged hours tests
NeedRam
committed
84d2f65
reorganize accolade tests
NeedRam
committed
59c57fe
reorganize activity history tests
NeedRam
committed
f7b5084
reorganized tests from test_app into their appropriate files. this is no longer needed
NeedRam
committed
1f00fd0
Created the following student tests: test_request_relationships, test_request_hours_confirmation, test_fetch_all_requests
Pubblez
committed
d538edf
Created the following staff tests: test_hours_approval, test_hours_denial
Pubblez
committed
62606e3
Created the following request tests: test_create_request, test_process_request_approval, test_process_request_denial
Pubblez
committed
61f1431
prepare for deploy
NeedRam
committed
e702cc3
Merge pull request #12 from RiggedToEncodeCOMP3613/deen-branch
Pubblez
authored
85ee429
Merge pull request #15 from RiggedToEncodeCOMP3613/isabella-tests-branch
NeedRam
authored
334409f
staff log hours manual page — draft
Xn00bslayerX
committed
dfadfcd

Commits on Dec 3, 2025

draft attempt at staff changeusername
Xn00bslayerX
committed
78e3070
Adds email and password change functionality for staff
Xn00bslayerX
committed
a0c35c6
profilescreen added for staff
Xn00bslayerX
committed
cd58d91
added view for staff profile
Xn00bslayerX
committed
58fc88e
merge main into branch
NeedRam
committed
c6e1454
fixed an oopsie woopsie mistake that broke the whole db
NeedRam
committed
7daed28
fix: filename problems and some typos
Xn00bslayerX
committed
f51dfb5
added client side checking to ensure user types same password
Xn00bslayerX
committed
142e748
fixed initialization issue
NeedRam
committed
043d2f4
url_for used for better routing
Xn00bslayerX
committed
d109688
Merge pull request #16 from RiggedToEncodeCOMP3613/deen-branch
Michel320670
authored
bd3f191
Merge remote-tracking branch 'origin/main' into adam-ui-attempt
Xn00bslayerX
committed
b6e1904
made leaderboard wireframe
NeedRam
committed
53bbad5
removed legacy layout features
NeedRam
committed
f064fae
added login screen
NeedRam
committed
c00507c
added student main menu
NeedRam
committed
d3b94c6
Merge remote-tracking branch 'origin/deen-branch' into adam-ui-attempt
Xn00bslayerX
committed
eb760cb
fix staff create error
NeedRam
committed
74766ef
Merge remote-tracking branch 'origin/deen-branch' into adam-ui-attempt
Xn00bslayerX
committed
8e9ffaf
fixed staff login
NeedRam
committed
5d56760
added the ability to login by email
NeedRam
committed
fc0befe
Multiple bug fixes to make the routes on staff pages work correctly
Xn00bslayerX
committed
fc2630d
added dark mode
NeedRam
committed
0ab3fb6
dark mode fixes
NeedRam
committed
7541475
fix change username
Xn00bslayerX
committed
090e8cd
added test staff/student
NeedRam
committed
6ca11c8
fixed milestones not accurately showing
NeedRam
committed
9a3b7fc
fixed clipping issue
NeedRam
committed
dfa3b07
create student profile screen
NeedRam
committed
64ddab2
added student change username screen
NeedRam
committed
f93344c
created the change email screen
NeedRam
committed
48540ab
created change password
NeedRam
committed
2209fb9
added more requests and accolades so the student screen would be more fleshed out
NeedRam
committed
aa99964
created the leaderboard screen. updated the leaderboard generation to include accolades
NeedRam
committed
965f1e3
added show password option to login screen
NeedRam
committed
992eec1
qol changes
NeedRam
committed
874c196
fixed duplicate accolades from being awarded during initialize
NeedRam
committed
0844a5b
added logo to login screen
NeedRam
committed
0937868
tried to make the login screen more in tune with the wireframe but it kind of looks ugly when too big
NeedRam
committed
bf06c15
added forgot password screen for future implementation
NeedRam
committed
5b85da9
Merge branch 'michel-branch' of https://github.com/RiggedToEncodeCOMP3613/Project into michel-branch
Michel320670
committed
784580a
add staff main menu template
Michel320670
committed
b9769d8
fixed Untrusted URL redirection depends on a user-provided value vulnerability
NeedRam
committed
3485c65
add staff milestones management functionality
Michel320670
committed
7df40ac
Merge pull request #18 from RiggedToEncodeCOMP3613/deen-branch
Michel320670
authored
a726087
Merge branch 'main' into adam-ui-attempt
NeedRam
authored
60c3ff5
Merge pull request #17 from RiggedToEncodeCOMP3613/adam-ui-attempt
NeedRam
authored
10c6f5f
add create milestone functionality
Michel320670
committed
28eacb2
add edit milestone functionality
Michel320670
committed
22286e7
add accolades management functionality for staff
Michel320670
committed
960edc0
add award accolade functionality for staff
Michel320670
committed
a626bb1
Merge branch 'main' into michel-branch
NeedRam
authored
fd575ee