From 1d579cc16c4f17965b29f0891b6e3002a0d104ce Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 13 Dec 2017 11:14:37 +0100
Subject: [PATCH] workers in daily planning limited to staff
---
smash/web/api_views/daily_planning.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/smash/web/api_views/daily_planning.py b/smash/web/api_views/daily_planning.py
index 9d2dd0cf..ad3c0a94 100644
--- a/smash/web/api_views/daily_planning.py
+++ b/smash/web/api_views/daily_planning.py
@@ -4,13 +4,11 @@ import logging
from operator import itemgetter
from django.contrib.auth.decorators import login_required
-from django.db.models import Q
from django.http import JsonResponse
from django.shortcuts import get_object_or_404
-from web.models.constants import GLOBAL_STUDY_ID
-from web.models.worker_study_role import ROLE_CHOICES_DOCTOR, ROLE_CHOICES_NURSE, ROLE_CHOICES_PSYCHOLOGIST
from web.models import Appointment, AppointmentTypeLink, Worker, Availability, Holiday
+from web.models.worker_study_role import WORKER_STAFF
from web.views import e500_error
from web.views.notifications import get_filter_locations
@@ -303,10 +301,9 @@ def events(request, date):
def get_workers_for_daily_planning(request):
- result = Worker.objects.filter(locations__in=get_filter_locations(request.user)).filter(
- user__is_active=True).filter(
- Q(roles__study_id=GLOBAL_STUDY_ID) & Q(
- roles__role__in=[ROLE_CHOICES_DOCTOR, ROLE_CHOICES_NURSE, ROLE_CHOICES_PSYCHOLOGIST])).distinct()
+ result = Worker.get_workers_by_worker_type(WORKER_STAFF).filter(
+ locations__in=get_filter_locations(request.user)).filter(
+ user__is_active=True).distinct()
return result
--
GitLab