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

Show time slot end time in calendars

Browse Source
This commit is contained in:
Raphael Michel
2020-09-24 10:58:12 +02:00
parent 0e405d2327
commit c74e7fd4fb
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
View File

@@ -41,6 +41,9 @@
<strong> <strong>
{% endif %} {% endif %}
{{ event.time|date:"TIME_FORMAT" }} {{ event.time|date:"TIME_FORMAT" }}
{% if event.time_end %}
– {{ event.time_end|date:"TIME_FORMAT" }}
{% endif %}
{% if not show_names|default_if_none:True %} {% if not show_names|default_if_none:True %}
</strong> </strong>
{% endif %} {% endif %}

4
src/pretix/presale/views/organizer.py
View File

@@ -313,6 +313,7 @@ def add_events_for_days(request, baseqs, before, after, ebd, timezones):
datetime_from = event.date_from.astimezone(tz) datetime_from = event.date_from.astimezone(tz)
date_from = datetime_from.date() date_from = datetime_from.date()
if event.settings.show_date_to and event.date_to: if event.settings.show_date_to and event.date_to:
datetime_to = event.date_to.astimezone(tz)
date_to = event.date_to.astimezone(tz).date() date_to = event.date_to.astimezone(tz).date()
d = max(date_from, before.date()) d = max(date_from, before.date())
while d <= date_to and d <= after.date(): while d <= date_to and d <= after.date():
@@ -321,6 +322,7 @@ def add_events_for_days(request, baseqs, before, after, ebd, timezones):
'event': event, 'event': event,
'continued': not first, 'continued': not first,
'time': datetime_from.time().replace(tzinfo=None) if first and event.settings.show_times else None, 'time': datetime_from.time().replace(tzinfo=None) if first and event.settings.show_times else None,
'time_end': datetime_to.time().replace(tzinfo=None) if date_to == date_from and event.settings.show_times else None,
'url': eventreverse(event, 'presale:event.index'), 'url': eventreverse(event, 'presale:event.index'),
'timezone': event.settings.timezone, 'timezone': event.settings.timezone,
}) })
@@ -374,6 +376,7 @@ def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_n
elif str(se.name) != name: elif str(se.name) != name:
ebd['_subevents_different_names'] = True ebd['_subevents_different_names'] = True
if se.event.settings.show_date_to and se.date_to: if se.event.settings.show_date_to and se.date_to:
datetime_to = se.date_to.astimezone(tz)
date_to = se.date_to.astimezone(tz).date() date_to = se.date_to.astimezone(tz).date()
d = max(date_from, before.date()) d = max(date_from, before.date())
while d <= date_to and d <= after.date(): while d <= date_to and d <= after.date():
@@ -382,6 +385,7 @@ def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_n
'continued': not first, 'continued': not first,
'timezone': settings.timezone, 'timezone': settings.timezone,
'time': datetime_from.time().replace(tzinfo=None) if first and settings.show_times else None, 'time': datetime_from.time().replace(tzinfo=None) if first and settings.show_times else None,
'time_end': datetime_to.time().replace(tzinfo=None) if date_to == date_from and settings.show_times else None,
'event': se, 'event': se,
'url': eventreverse(se.event, 'presale:event.index', kwargs=kwargs) 'url': eventreverse(se.event, 'presale:event.index', kwargs=kwargs)
}) })

6
src/pretix/presale/views/widget.py
View File

@@ -344,10 +344,12 @@ class WidgetAPIProductList(EventListMixin, View):
else: else:
event = ev event = ev
tz = pytz.timezone(e['timezone']) tz = pytz.timezone(e['timezone'])
time = date_format(ev.date_from.astimezone(tz), 'TIME_FORMAT') if e.get('time') and event.settings.show_times else None
if time and ev.date_to and ev.date_from.astimezone(tz).date() == ev.date_to.astimezone(tz).date() and event.settings.show_date_to:
time += ' – ' + date_format(ev.date_to.astimezone(tz), 'TIME_FORMAT')
events.append({ events.append({
'name': str(ev.name), 'name': str(ev.name),
'time': date_format(ev.date_from.astimezone(tz), 'TIME_FORMAT') if e.get('time') and event.settings.show_times else 'time': time,
None,
'continued': e['continued'], 'continued': e['continued'],
'location': str(ev.location), 'location': str(ev.location),
'date_range': ev.get_date_range_display() + ( 'date_range': ev.get_date_range_display() + (