Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into 458-in-daily-planning-general-appointment-can-be-added-at-any-time
No related branches found
No related tags found
Showing
- CHANGELOG 12 additions, 1 deletionCHANGELOG
- smash/web/api_views/appointment.py 6 additions, 2 deletionssmash/web/api_views/appointment.py
- smash/web/api_views/serialization_utils.py 5 additions, 2 deletionssmash/web/api_views/serialization_utils.py
- smash/web/api_views/subject.py 3 additions, 3 deletionssmash/web/api_views/subject.py
- smash/web/api_views/voucher.py 4 additions, 4 deletionssmash/web/api_views/voucher.py
- smash/web/forms/appointment_form.py 2 additions, 2 deletionssmash/web/forms/appointment_form.py
- smash/web/forms/study_subject_list_form.py 1 addition, 1 deletionsmash/web/forms/study_subject_list_form.py
- smash/web/forms/worker_form.py 12 additions, 8 deletionssmash/web/forms/worker_form.py
- smash/web/migrations/0201_auto_20211014_1151.py 18 additions, 0 deletionssmash/web/migrations/0201_auto_20211014_1151.py
- smash/web/migrations/0201_studysubjectlist_edit.py 18 additions, 0 deletionssmash/web/migrations/0201_studysubjectlist_edit.py
- smash/web/migrations/0202_merge_20211015_1222.py 14 additions, 0 deletionssmash/web/migrations/0202_merge_20211015_1222.py
- smash/web/models/__init__.py 2 additions, 1 deletionsmash/web/models/__init__.py
- smash/web/models/study_subject_list.py 5 additions, 0 deletionssmash/web/models/study_subject_list.py
- smash/web/models/worker.py 18 additions, 3 deletionssmash/web/models/worker.py
- smash/web/static/js/appointment.js 4 additions, 1 deletionsmash/web/static/js/appointment.js
- smash/web/templates/appointments/add.html 4 additions, 19 deletionssmash/web/templates/appointments/add.html
- smash/web/templates/appointments/index.html 14 additions, 7 deletionssmash/web/templates/appointments/index.html
- smash/web/templates/doctors/index.html 2 additions, 0 deletionssmash/web/templates/doctors/index.html
- smash/web/tests/importer/test_importer.py 54 additions, 13 deletionssmash/web/tests/importer/test_importer.py
- smash/web/tests/models/test_worker.py 17 additions, 0 deletionssmash/web/tests/models/test_worker.py
Loading
Please register or sign in to comment