|
|
@@ -199,8 +199,10 @@ def public(request):
|
|
|
# Initialisiere ein Dictionary für die Schichten der Mitarbeiter
|
|
|
shifts_by_employee = {}
|
|
|
events_by_location = {}
|
|
|
+ helpers_by_date = {}
|
|
|
employees = Employee.objects.all()
|
|
|
locations = Location.objects.all()
|
|
|
+ helpers = Helper.objects.all()
|
|
|
|
|
|
for employee in employees:
|
|
|
shifts_by_employee[employee] = {day: None for day in range(7)}
|
|
|
@@ -208,11 +210,16 @@ def public(request):
|
|
|
for location in locations:
|
|
|
events_by_location[location] = {day: None for day in range(7)}
|
|
|
|
|
|
+ for helper in helpers:
|
|
|
+ helpers_by_date = {day: None for day in range(7)}
|
|
|
+
|
|
|
# Hole alle Schichten für die aktuelle Woche
|
|
|
shifts = Shift.objects.filter(date__range=[start_of_week, end_of_week])
|
|
|
|
|
|
events = Event.objects.filter(date__range=[start_of_week, end_of_week])
|
|
|
|
|
|
+ helpers = Helper.objects.filter(date__range=[start_of_week, end_of_week])
|
|
|
+
|
|
|
print(events)
|
|
|
# Fülle das Dictionary mit den Schichtdaten
|
|
|
for shift in shifts:
|
|
|
@@ -225,6 +232,10 @@ def public(request):
|
|
|
day_of_week = (event.date - start_of_week).days
|
|
|
events_by_location[location][day_of_week] = event
|
|
|
|
|
|
+ for helper in helpers:
|
|
|
+ day_of_week = (helper.date - start_of_week).days
|
|
|
+ helpers_by_date[day_of_week] = helper
|
|
|
+
|
|
|
# Bereite die Daten der Woche für das Template vor
|
|
|
week_dates = [(start_of_week + timedelta(days=i)).strftime("%d.%m.%Y") for i in range(7)]
|
|
|
days_of_week = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So']
|
|
|
@@ -233,6 +244,7 @@ def public(request):
|
|
|
context = {
|
|
|
'shifts_by_employee': shifts_by_employee,
|
|
|
'events_by_location': events_by_location,
|
|
|
+ 'helpers_by_date': helpers_by_date,
|
|
|
'start_of_week': start_of_week,
|
|
|
'end_of_week': end_of_week,
|
|
|
'days_with_dates': days_with_dates,
|
root