Commits on Source (63)
-
Carlos Vega authored
Fixes 204. Not sure if it's the best solution but it makes sense to call the web.views.workers the same way it's done in the sidebar
501166a6 -
Carlos Vega authoredfdda1c34
-
Carlos VEGA MORENO authored15ff974e
-
Carlos Vega authored0352c773
-
Carlos Vega authored96fcdb3a
-
Carlos Vega authored8d58cac6
-
Carlos Vega authoredc80060e5
-
Carlos Vega authored03b1b1c7
-
Carlos Vega authored52d051eb
-
Carlos Vega authored587db018
-
Carlos Vega authored089b2ce7
-
Carlos Vega authored
moved function to utils.py (future code will also need the midnight function) and added utils module
28e729d2 -
Carlos Vega authored
removed appointments reference from model. Filter out extra availabilities for the method is_on_leave
159aa27b -
Carlos Vega authored271f1c1a
-
Carlos Vega authored56aa5522
-
Carlos Vega authored963116ab
-
Carlos Vega authored
Avoid possibility to change the worker when adding holidays or extra availabilities. Changed the header
b08e4034 -
Carlos Vega authored410581cc
-
Carlos Vega authored9fcb1f96
-
Carlos Vega authoredda31fb1b
-
Carlos Vega authored4edb1329
-
Carlos Vega authored8b5e0312
-
Carlos Vega authored00697f87
-
Carlos Vega authored9964ad90
-
Carlos Vega authored43522abe
-
Carlos Vega authoredbd96ff85
-
Carlos Vega authored453e4e33
-
Carlos Vega authoredef6f8d91
-
Carlos Vega authored
added order in daily planning based on officeAvailability which considers holidays, extra_availabilities, general appointments from Appointment, and subject assesments from AppointmentTypeLink
b846e242 -
Carlos Vega authoredb0c7809c
-
Carlos Vega authoredca9b4787
-
Carlos Vega authoredc3d95e68
-
Carlos Vega authorede5d54970
-
Carlos Vega authored3b5e4ae7
-
Carlos Vega authored4cff52c3
-
Carlos Vega authored8a852c7a
-
Carlos Vega authoredc7625a5d
-
Carlos Vega authored04b79bd1
-
Carlos Vega authored5f8d49a4
-
Carlos Vega authored705db9e2
-
Carlos Vega authored4c46d010
-
Carlos Vega authoredccef9140
-
Carlos Vega authored3225847d
-
Carlos Vega authoredd50bee3c
-
Carlos Vega authored234d6617
-
Carlos Vega authored90aa2cc9
-
Carlos Vega authoredbdefa62d
-
Carlos Vega authored2007672d
-
Carlos Vega authored2264d7d9
-
Carlos Vega authored145bb048
-
Carlos Vega authored4ac0768d
-
Carlos Vega authored73426726
-
Carlos Vega authoredb35b4301
-
Carlos Vega authored690e7cab
-
Piotr Gawron authored
Feature/daily availability See merge request NCER-PD/scheduling-system!171
a2336c82 -
Piotr Gawron authored
Feature/export selected columns See merge request NCER-PD/scheduling-system!173
1828caf1 -
Carlos Vega authored5f01a5ce
-
Carlos Vega authored20c39d1b
-
Carlos Vega authored446ddc77
-
Carlos Vega authored8aa8f537
-
Piotr Gawron authored
improved text message in button to go back Closes #244 See merge request NCER-PD/scheduling-system!175
6e08448a -
Carlos Vega authoredd6d992e2
-
Piotr Gawron authored
Bug/hide vouchers if not set in study Closes #246 See merge request NCER-PD/scheduling-system!174
bbe5d91b
Showing
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- requirements.txt 3 additions, 0 deletionsrequirements.txt
- smash/web/api_urls.py 3 additions, 0 deletionssmash/web/api_urls.py
- smash/web/api_views/daily_planning.py 3 additions, 1 deletionsmash/web/api_views/daily_planning.py
- smash/web/api_views/worker.py 38 additions, 3 deletionssmash/web/api_views/worker.py
- smash/web/debug_utils.py 19 additions, 0 deletionssmash/web/debug_utils.py
- smash/web/forms/appointment_form.py 4 additions, 0 deletionssmash/web/forms/appointment_form.py
- smash/web/forms/forms.py 8 additions, 0 deletionssmash/web/forms/forms.py
- smash/web/migrations/0119_auto_20181002_0908.py 20 additions, 0 deletionssmash/web/migrations/0119_auto_20181002_0908.py
- smash/web/migrations/0119_auto_20181015_1324.py 25 additions, 0 deletionssmash/web/migrations/0119_auto_20181015_1324.py
- smash/web/migrations/0120_holiday_kind.py 20 additions, 0 deletionssmash/web/migrations/0120_holiday_kind.py
- smash/web/migrations/0121_auto_20181003_1256.py 20 additions, 0 deletionssmash/web/migrations/0121_auto_20181003_1256.py
- smash/web/migrations/0122_remove_worker_appointments.py 19 additions, 0 deletionssmash/web/migrations/0122_remove_worker_appointments.py
- smash/web/migrations/0123_merge_20181017_1532.py 16 additions, 0 deletionssmash/web/migrations/0123_merge_20181017_1532.py
- smash/web/migrations/0124_auto_20181017_1532.py 20 additions, 0 deletionssmash/web/migrations/0124_auto_20181017_1532.py
- smash/web/models/constants.py 8 additions, 0 deletionssmash/web/models/constants.py
- smash/web/models/holiday.py 3 additions, 0 deletionssmash/web/models/holiday.py
- smash/web/models/study.py 16 additions, 0 deletionssmash/web/models/study.py
- smash/web/models/worker.py 55 additions, 5 deletionssmash/web/models/worker.py
- smash/web/officeAvailability.py 225 additions, 0 deletionssmash/web/officeAvailability.py
smash/web/debug_utils.py
0 → 100644
smash/web/migrations/0120_holiday_kind.py
0 → 100644
smash/web/officeAvailability.py
0 → 100644