added kyle's changes to code#25

Open

jerrelle9 wants to merge 106 commits into

uwidcit:mainfrom

CodeCraftersUWI:jerrellebranch

Commits on Sep 23, 2023

testing out commits to Codecrafters
JervalThomas
committed

Commits on Sep 28, 2023

testing

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Staff and Student Classes
JervalThomas
committed
test commit
ashleyjacob
committed
Staff and Student Classes redone
JervalThomas
committed

Commits on Sep 29, 2023

Program 90% completed

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Created Admin & Course Plan models
ashleyjacob
committed
Created Admin & Course Plan Controllers
ashleyjacob
committed
added course with some features not all

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge branch 'uwidcit:main' into Kyle
Kyle-McIntosh
authored

Commits on Sep 30, 2023

updated the program code

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Did some more updates

Jerrelle Johnson
authored and
Jerrelle Johnson
committed

Commits on Oct 2, 2023

Staff and Student Controllers
JervalThomas
committed
Staff and Student Controllers
JervalThomas
committed
mergeed ashley's branch to test our controllers

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Updates to course plan
ashleyjacob
committed
Updated Course Plan model
ashleyjacob
committed
Updated controllers
ashleyjacob
committed
Staff and Student Controllers
JervalThomas
committed
Staff and Student Controllers
JervalThomas
committed
Staff and Student Controllers
JervalThomas
committed
Staff and Student Controllers
JervalThomas
committed
Merge pull request #1 from CodeCraftersUWI/Jerval
jerrelle9
authored
Merge branch 'development' of github.com:CodeCraftersUWI/flaskmvc into jerrellebranch

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge branch 'development' into Kyle
JervalThomas
committed

Commits on Oct 4, 2023

scaled the course code to read larger files

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
changed offeredCourses and added staff view

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Updated admin - remove all courses
ashleyjacob
committed
Merged jerellebranch into Ashley
ashleyjacob
committed
adjusted code to be compatable with other classes
ashleyjacob
committed
updated relationship between student & course plan
ashleyjacob
committed
updated student controller to work w/ courseplan
ashleyjacob
committed
updated course plan - merge lvl 1&2 cores
ashleyjacob
committed
Updated requirements, wsgi, coursePlan controller and model, student controller and model, and program model
Kyle-McIntosh
committed
added kyle's changes to code

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #2 from CodeCraftersUWI/jerrellebranch
jerrelle9
authored
Merge development into Ashley's branch
ashleyjacob
committed
merged updated files
ashleyjacob
committed

Commits on Oct 5, 2023

Merge branch 'development' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
Created prerequisite model
Kyle-McIntosh
committed
added bridge tables prerequisites and programCourses

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #3 from CodeCraftersUWI/jerrellebranch
JervalThomas
authored
added alot of bridge tables

Jerrelle Johnson
authored and
Jerrelle Johnson
committed

Commits on Oct 6, 2023

Merge branch 'development' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
Merge branch 'Kyle' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
more udpates

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #4 from CodeCraftersUWI/jerrellebranch
JervalThomas
authored
Merge branch 'development' of into Ashley
ashleyjacob
committed
created staff views
ashleyjacob
committed
updated staff view
ashleyjacob
committed
Merge branch 'development' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
Development merge
Kyle-McIntosh
committed
Code not breaking at this point, just to test courseplan controller

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Student views created
Kyle-McIntosh
committed

Commits on Oct 7, 2023

Merge branch 'jerrellebranch' into Ashley
ashleyjacob
committed
created staff views
ashleyjacob
committed
addCourseToPlan method works now, but there is a bug in generate

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge branch 'jerrellebranch' into Ashley
ashleyjacob
committed
all controllers done

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #5 from CodeCraftersUWI/jerrellebranch
jerrelle9
authored
all staff views are functional
ashleyjacob
committed
Merge branch 'development' into Ashley
ashleyjacob
committed
updated staff urls
ashleyjacob
committed

Commits on Oct 8, 2023

Merge branch 'development' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
updated status codes and error responses
ashleyjacob
committed
Updated student views
Kyle-McIntosh
committed
Merge pull request #6 from CodeCraftersUWI/Kyle
jerrelle9
authored
updates to programcourses and coursesoffered model

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
corrected file paths in wsgi

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Student view status codes added
Kyle-McIntosh
committed

Commits on Oct 9, 2023

Merge branch 'development' into Ashley
jerrelle9
authored
Merge pull request #7 from CodeCraftersUWI/Ashley
jerrelle9
authored
Merge branch 'development' of https://github.com/CodeCraftersUWI/flaskmvc into Kyle
Kyle-McIntosh
committed
Merge pull request #8 from CodeCraftersUWI/Kyle
jerrelle9
authored
Merge pull request #9 from CodeCraftersUWI/jerrellebranch
jerrelle9
authored
last sttretch

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge branch 'main' into development
jerrelle9
authored
Merge pull request #10 from CodeCraftersUWI/development
jerrelle9
authored
removed adminfile and course file from views

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Student views auth
Kyle-McIntosh
committed
added create staff to index init

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
updates

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Student auth changes
Kyle-McIntosh
committed
updates

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #11 from CodeCraftersUWI/Kyle
jerrelle9
authored
Merge pull request #12 from CodeCraftersUWI/development
jerrelle9
authored

Commits on Oct 10, 2023

added create courses to idex views

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
Merge pull request #13 from CodeCraftersUWI/development
jerrelle9
authored

Commits on Oct 16, 2023

lastest pull from main

Jerrelle Johnson
authored and
Jerrelle Johnson
committed

Commits on Oct 17, 2023

did program and course tests

Jerrelle Johnson
authored and
Jerrelle Johnson
committed
staff unit tests

Jerrelle Johnson
authored and
Jerrelle Johnson
committed

Commits on Oct 19, 2023

finished staff program and course tests

Jerrelle Johnson
authored and
Jerrelle Johnson
committed