Skip to content
Snippets Groups Projects

Resolve "possibility to remove worker"

Merged Piotr Gawron requested to merge 151-possibility-to-remove-worker into master
11 files
+ 121
27
Compare changes
  • Side-by-side
  • Inline
Files
11
@@ -235,8 +235,7 @@ def events(request, date):
availabilities = []
holidays = []
workers = Worker.objects.filter(locations__in=get_filter_locations(request.user)).exclude(
role=Worker.ROLE_CHOICES_SECRETARY).distinct()
workers = get_workers_for_daily_planning(request)
for worker in workers:
availabilities = availabilities + get_availabilities(worker, date)
@@ -249,12 +248,18 @@ 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).exclude(
role=Worker.ROLE_CHOICES_SECRETARY).distinct()
return result
def availabilities(request, date):
availabilities = []
holidays = []
conflicts = []
workers = Worker.objects.filter(locations__in=get_filter_locations(request.user)).exclude(
role=Worker.ROLE_CHOICES_SECRETARY).distinct()
workers = get_workers_for_daily_planning(request)
for worker in workers:
availabilities = availabilities + get_availabilities(worker, date)
Loading