entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

manager: fix day view for partial bookings and recurring event (#80851)

This commit is contained in:
Lauréline Guérin 2023-09-05 09:02:56 +02:00
parent fbe2deea93
commit d16b35067e
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrono/manager/views.py
View File

@ -1604,7 +1604,9 @@ class AgendaDayView(EventChecksMixin, AgendaDateView, DayArchiveView):
def fill_partial_bookings_context(self, context):
try:
event = self.agenda.event_set.get(start_datetime__date=self.date.date())
event = self.agenda.event_set.get(
start_datetime__date=self.date.date(), recurrence_days__isnull=True
)
except Event.DoesNotExist:
return

15
tests/manager/test_partial_bookings.py
View File

@ -133,6 +133,21 @@ def test_manager_partial_bookings_day_view(app, admin_user, freezer):
resp = resp.click('Next day')
assert 'No opening hours this day.' in resp.text
Event.objects.all().delete()
event = Event.objects.create(
label='Other Event',
start_datetime=start_datetime,
end_time=datetime.time(18, 00),
places=10,
agenda=agenda,
recurrence_days=[1, 2, 3, 4, 5, 6, 7],
recurrence_end_date=start_datetime + datetime.timedelta(days=7),
)
event.create_all_recurrences()
resp = app.get('/manage/agendas/%s/day/%d/%d/%d/' % (agenda.pk, today.year, today.month, today.day))
assert resp.pyquery('.partial-booking--hour')[0].text == '07\u202fh'
assert resp.pyquery('.partial-booking--hour')[-1].text == '19\u202fh'
def test_manager_partial_bookings_day_view_24_hours(app, admin_user, freezer):
agenda = Agenda.objects.create(label='Foo bar', kind='events', partial_bookings=True)