Merge branch '339-configurable-study-fields' into 'master'
Resolve "configurable study fields" Closes #339 See merge request NCER-PD/scheduling-system!265
No related branches found
No related tags found
Checking pipeline status
Showing
- CHANGELOG 2 additions, 0 deletionsCHANGELOG
- debian-files/smasch.py 1 addition, 0 deletionsdebian-files/smasch.py
- requirements-dev.txt 1 addition, 0 deletionsrequirements-dev.txt
- smash/web/api_urls.py 1 addition, 1 deletionsmash/web/api_urls.py
- smash/web/api_views/serialization_utils.py 19 additions, 4 deletionssmash/web/api_views/serialization_utils.py
- smash/web/api_views/subject.py 139 additions, 21 deletionssmash/web/api_views/subject.py
- smash/web/forms/custom_study_subject_field_forms.py 72 additions, 0 deletionssmash/web/forms/custom_study_subject_field_forms.py
- smash/web/forms/study_subject_forms.py 167 additions, 10 deletionssmash/web/forms/study_subject_forms.py
- smash/web/forms/subject_forms.py 3 additions, 2 deletionssmash/web/forms/subject_forms.py
- smash/web/migrations/0177_customstudysubjectfield_customstudysubjectvalue.py 37 additions, 0 deletions...s/0177_customstudysubjectfield_customstudysubjectvalue.py
- smash/web/migrations/0178_auto_20201116_1250.py 1356 additions, 0 deletionssmash/web/migrations/0178_auto_20201116_1250.py
- smash/web/models/constants.py 19 additions, 1 deletionsmash/web/models/constants.py
- smash/web/models/custom_data/__init__.py 4 additions, 0 deletionssmash/web/models/custom_data/__init__.py
- smash/web/models/custom_data/custom_study_subject_field.py 30 additions, 0 deletionssmash/web/models/custom_data/custom_study_subject_field.py
- smash/web/models/custom_data/custom_study_subject_value.py 20 additions, 0 deletionssmash/web/models/custom_data/custom_study_subject_value.py
- smash/web/models/study.py 10 additions, 10 deletionssmash/web/models/study.py
- smash/web/models/study_subject.py 31 additions, 0 deletionssmash/web/models/study_subject.py
- smash/web/static/js/smash.js 36 additions, 21 deletionssmash/web/static/js/smash.js
- smash/web/templates/custom_study_subject_field/add.html 9 additions, 0 deletionssmash/web/templates/custom_study_subject_field/add.html
- smash/web/templates/custom_study_subject_field/add_edit.html 105 additions, 0 deletionssmash/web/templates/custom_study_subject_field/add_edit.html
Loading
Please register or sign in to comment