CGM_Public/pretix_cgo
3
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Calender: Always add end date (Z#23131739) (#3622)

Browse Source
This commit is contained in:
Richard Schreiber
2023-09-28 16:05:03 +02:00
committed by GitHub
parent 78fbfc9c80
commit c6cf8b6f24
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/ical.py
+12 -7
View File
@@ -68,13 +68,18 @@ def get_public_ical(events):
else: else:
vevent.add('dtstart').value = ev.date_from.astimezone(tz).date() vevent.add('dtstart').value = ev.date_from.astimezone(tz).date()
if event.settings.show_date_to and ev.date_to: # always add dtend as calendar apps otherwise have display issues
if event.settings.show_times: use_date_to = event.settings.show_date_to and ev.date_to
vevent.add('dtend').value = ev.date_to.astimezone(tz) dtend = (ev.date_to if use_date_to else ev.date_from).astimezone(tz)
else:
# with full-day events date_to in pretix is included (e.g. last day) if not event.settings.show_times:
# whereas dtend in vcalendar is non-inclusive => add one day for export # with full-day events date_to in pretix is included (e.g. last day)
vevent.add('dtend').value = ev.date_to.astimezone(tz).date() + datetime.timedelta(days=1) # whereas dtend in vcalendar is non-inclusive => add one day for export
dtend = dtend.date() + datetime.timedelta(days=1)
elif not use_date_to:
# date_from used as end-date => add 1h as a default duration
dtend = dtend + datetime.timedelta(hours=1)
vevent.add('dtend').value = dtend
descr = [] descr = []
descr.append(_('Tickets: {url}').format(url=url)) descr.append(_('Tickets: {url}').format(url=url))
src/tests/presale/test_event.py
+5 -2
View File
@@ -1418,7 +1418,10 @@ class EventIcalDownloadTest(EventTestMixin, SoupTest):
(self.event.settings.timezone, (self.event.settings.timezone,
self.event.date_from.astimezone(ZoneInfo(self.event.settings.timezone)).strftime(fmt)), self.event.date_from.astimezone(ZoneInfo(self.event.settings.timezone)).strftime(fmt)),
ical, 'incorrect start time') ical, 'incorrect start time')
self.assertNotIn('DTEND', ical, 'unexpected end time attribute') self.assertIn('DTEND;TZID=%s:%s' %
(self.event.settings.timezone,
(self.event.date_from.astimezone(ZoneInfo(self.event.settings.timezone)) + datetime.timedelta(hours=1)).strftime(fmt)),
ical, 'incorrect end time')
def test_no_date_to_and_time(self): def test_no_date_to_and_time(self):
self.event.settings.show_date_to = False self.event.settings.show_date_to = False
@@ -1426,7 +1429,7 @@ class EventIcalDownloadTest(EventTestMixin, SoupTest):
self.event.save() self.event.save()
ical = self.client.get('/%s/%s/ical/' % (self.orga.slug, self.event.slug)).content.decode() ical = self.client.get('/%s/%s/ical/' % (self.orga.slug, self.event.slug)).content.decode()
self.assertIn('DTSTART;VALUE=DATE:%s' % self.event.date_from.strftime('%Y%m%d'), ical, 'incorrect start date') self.assertIn('DTSTART;VALUE=DATE:%s' % self.event.date_from.strftime('%Y%m%d'), ical, 'incorrect start date')
self.assertNotIn('DTEND', ical, 'unexpected end time attribute') self.assertIn('DTEND;VALUE=DATE:%s' % (self.event.date_from + datetime.timedelta(days=1)).strftime('%Y%m%d'), ical, 'incorrect start date')
def test_local_date_diff_from_utc(self): def test_local_date_diff_from_utc(self):
self.event.date_from = datetime.datetime(2013, 12, 26, 21, 57, 58, tzinfo=datetime.timezone.utc) self.event.date_from = datetime.datetime(2013, 12, 26, 21, 57, 58, tzinfo=datetime.timezone.utc)