Merge branch '318-next-of-keen' into 'master'
Resolve "next of keen" Closes #318 See merge request NCER-PD/scheduling-system!230
Showing
- smash/web/api_views/subject.py 24 additions, 0 deletionssmash/web/api_views/subject.py
- smash/web/forms/study_subject_forms.py 1 addition, 0 deletionssmash/web/forms/study_subject_forms.py
- smash/web/migrations/0146_auto_20200320_0932.py 55 additions, 0 deletionssmash/web/migrations/0146_auto_20200320_0932.py
- smash/web/models/study_columns.py 7 additions, 4 deletionssmash/web/models/study_columns.py
- smash/web/models/study_subject.py 5 additions, 0 deletionssmash/web/models/study_subject.py
- smash/web/models/subject.py 15 additions, 0 deletionssmash/web/models/subject.py
- smash/web/models/subject_columns.py 15 additions, 0 deletionssmash/web/models/subject_columns.py
- smash/web/templates/subjects/edit.html 5 additions, 0 deletionssmash/web/templates/subjects/edit.html
Loading
Please register or sign in to comment