Merge branch 'improvements/more_options' into 'master'
Improvements/more options Closes #303, #298, #198, and #279 See merge request NCER-PD/scheduling-system!211
Showing
- smash/create_dummy_data.py 2 additions, 2 deletionssmash/create_dummy_data.py
- smash/import_file.py 8 additions, 8 deletionssmash/import_file.py
- smash/web/api_views/subject.py 6 additions, 0 deletionssmash/web/api_views/subject.py
- smash/web/forms/study_subject_forms.py 7 additions, 7 deletionssmash/web/forms/study_subject_forms.py
- smash/web/forms/voucher_forms.py 21 additions, 3 deletionssmash/web/forms/voucher_forms.py
- smash/web/forms/worker_form.py 3 additions, 3 deletionssmash/web/forms/worker_form.py
- smash/web/migrations/0137_auto_20190321_1024.py 35 additions, 0 deletionssmash/web/migrations/0137_auto_20190321_1024.py
- smash/web/migrations/0138_auto_20190321_1111.py 20 additions, 0 deletionssmash/web/migrations/0138_auto_20190321_1111.py
- smash/web/migrations/0139_auto_20190321_1400.py 20 additions, 0 deletionssmash/web/migrations/0139_auto_20190321_1400.py
- smash/web/models/constants.py 2 additions, 0 deletionssmash/web/models/constants.py
- smash/web/models/study_columns.py 4 additions, 0 deletionssmash/web/models/study_columns.py
- smash/web/models/study_subject.py 18 additions, 2 deletionssmash/web/models/study_subject.py
- smash/web/models/visit.py 2 additions, 0 deletionssmash/web/models/visit.py
- smash/web/models/worker.py 3 additions, 3 deletionssmash/web/models/worker.py
- smash/web/models/worker_study_role.py 7 additions, 2 deletionssmash/web/models/worker_study_role.py
- smash/web/static/js/smash.js 1 addition, 0 deletionssmash/web/static/js/smash.js
- smash/web/templates/appointments/edit.html 3 additions, 3 deletionssmash/web/templates/appointments/edit.html
- smash/web/templates/doctors/add.html 1 addition, 1 deletionsmash/web/templates/doctors/add.html
- smash/web/templates/doctors/add_availability.html 1 addition, 1 deletionsmash/web/templates/doctors/add_availability.html
- smash/web/templates/doctors/add_holiday.html 1 addition, 1 deletionsmash/web/templates/doctors/add_holiday.html
Loading
Please register or sign in to comment