CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Week calendar and more improvements to subevent calendars (#1672)

Browse Source
This commit is contained in:
Raphael Michel
2020-05-07 15:48:47 +02:00
committed by GitHub
parent 6a4c81ff3c
commit de9c450648
28 changed files with 796 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html Normal file
View File

@@ -0,0 +1,42 @@
{% load i18n %}
{% load eventurl %}
{% load urlreplace %}
<form class="form-inline" method="get" id="monthselform" action="{% eventurl event "presale:event.index" cart_namespace=cart_namespace %}">
{% for f, v in request.GET.items %}
{% if f != "week" and f != "year" %}
<input type="hidden" name="{{ f }}" value="{{ v }}">
{% endif %}
{% endfor %}
<div class="row">
<div class="col-sm-4 hidden-xs text-left flip">
<a href="?{% url_replace request "year" before.isocalendar.0 "week" before.isocalendar.1 %}"
class="btn btn-default">
<span class="fa fa-arrow-left"></span>
{{ before|date:week_format }}
</a>
</div>
<div class="col-sm-4 col-xs-12 text-center">
<select name="week" class="form-control">
{% for w in weeks %}
<option value="{{ w }}" {% if w == date.isocalendar.1 %}selected{% endif %}>{{ w }}</option>
{% endfor %}
</select>
<select name="year" class="form-control">
{% for y in years %}
<option value="{{ y }}" {% if y == date.isocalendar.0 %}selected{% endif %}>{{ y }}</option>
{% endfor %}
</select>
<button type="submit" class="js-hidden btn btn-default">
{% trans "Go" %}
</button>
</div>
<div class="col-sm-4 hidden-xs text-right flip">
<a href="?{% url_replace request "year" after.isocalendar.0 "week" after.isocalendar.1 %}"
class="btn btn-default">
{{ after|date:week_format }}
<span class="fa fa-arrow-right"></span>
</a>
</div>
</div>
</form>
{% include "pretixpresale/fragment_week_calendar.html" with show_avail=event.settings.event_list_availability %}

2
src/pretix/presale/templates/pretixpresale/event/index.html
View File

@@ -117,6 +117,8 @@
<div>
{% if list_type == "calendar" %}
{% include "pretixpresale/event/fragment_subevent_calendar.html" %}
{% elif list_type == "week" %}
{% include "pretixpresale/event/fragment_subevent_calendar_week.html" %}
{% else %}
{% include "pretixpresale/event/fragment_subevent_list.html" %}
{% endif %}

40
src/pretix/presale/templates/pretixpresale/fragment_calendar.html
View File

@@ -22,16 +22,44 @@
<h3>{{ day.day }}</h3>
<div class="events">
{% for event in day.events %}
<a class="event {% if event.continued %}continued{% endif %}"
<a class="event {% if event.continued %}continued{% else %} {% spaceless %}
{% if event.event.presale_is_running and show_avail %}
{% if event.event.best_availability_state == 100 %}
available
{% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
waitinglist
{% elif event.event.best_availability_state == 20 %}
reserved
{% elif event.event.best_availability_state < 20 %}
soldout
{% endif %}
{% elif event.event.presale_is_running %}
running
{% elif event.event.presale_has_ended %}
over
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
soon
{% else %}
soon
{% endif %}
{% endspaceless %}{% endif %}"
href="{{ event.url }}">
<span class="event-name">
{{ event.event.name }}
</span>
{% if show_names|default_if_none:True %}
<span class="event-name">
{{ event.event.name }}
</span>
{% endif %}
{% if not event.continued %}
{% if event.time %}
<span class="event-time">
<span class="fa fa-clock-o"></span>
{{ event.time|date:"TIME_FORMAT" }}
<span class="fa fa-clock-o"></span>
{% if not show_names|default_if_none:True %}
<strong>
{% endif %}
{{ event.time|date:"TIME_FORMAT" }}
{% if not show_names|default_if_none:True %}
</strong>
{% endif %}
{% if multiple_timezones %}
{{ event.timezone }}
{% endif %}

82
src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html Normal file
View File

@@ -0,0 +1,82 @@
{% load i18n %}
<div class="week-calendar">
{% for day in days %}
<div class="weekday {% if day.events %}has-events{% else %}no-events{% endif %}"
data-date="{{ day.date|date:"SHORT_DATE_FORMAT" }}">
<h3>{{ day.day_formatted }}</h3>
<div class="events">
{% for event in day.events %}
<a class="event {% if event.continued %}continued{% else %} {% spaceless %}
{% if event.event.presale_is_running and show_avail %}
{% if event.event.best_availability_state == 100 %}
available
{% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
waitinglist
{% elif event.event.best_availability_state == 20 %}
reserved
{% elif event.event.best_availability_state < 20 %}
soldout
{% endif %}
{% elif event.event.presale_is_running %}
running
{% elif event.event.presale_has_ended %}
over
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
soon
{% else %}
soon
{% endif %}
{% endspaceless %}{% endif %}"
href="{{ event.url }}">
{% if show_names|default_if_none:True %}
<span class="event-name">
{{ event.event.name }}
</span>
{% endif %}
{% if not event.continued %}
{% if event.time %}
<span class="event-time">
<span class="fa fa-clock-o"></span>
{% if not show_names|default_if_none:True %}
<strong>
{% endif %}
{{ event.time|date:"TIME_FORMAT" }}
{% if not show_names|default_if_none:True %}
</strong>
{% endif %}
{% if multiple_timezones %}
{{ event.timezone }}
{% endif %}
</span>
{% endif %}
<span class="event-status">
{% if event.event.presale_is_running and show_avail %}
{% if event.event.best_availability_state == 100 %}
<span class="fa fa-ticket"></span> {% trans "Book now" %}
{% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
<span class="fa fa-ticket"></span> {% trans "Waiting list" %}
{% elif event.event.best_availability_state == 20 %}
<span class="fa fa-ticket"></span> {% trans "Reserved" %}
{% elif event.event.best_availability_state < 20 %}
<span class="fa fa-ticket"></span> {% trans "Sold out" %}
{% endif %}
{% elif event.event.presale_is_running %}
<span class="fa fa-ticket"></span> {% trans "Book now" %}
{% elif event.event.presale_has_ended %}
<span class="fa fa-ticket"></span> {% trans "Sale over" %}
{% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
<span class="fa fa-ticket"></span>
{% blocktrans with start_date=event.event.presale_start|date:"SHORT_DATE_FORMAT" %}
from {{ start_date }}
{% endblocktrans %}
{% else %}
<span class="fa fa-ticket"></span> {% trans "Soon" %}
{% endif %}
</span>
{% endif %}
</a>
{% endfor %}
</div>
</div>
{% endfor %}
</div>

7
src/pretix/presale/templates/pretixpresale/organizers/calendar.html
View File

@@ -24,11 +24,16 @@
<span class="fa fa-list"></span>
{% trans "List" %}
</a>
<a href="?{% url_replace request "style" "week" %}" type="button"
class="btn btn-default">
<span class="fa fa-calendar"></span>
{% trans "Week" %}
</a>
<a href="?{% url_replace request "style" "calendar" %}"
type="button"
class="btn btn-default active">
<span class="fa fa-calendar"></span>
{% trans "Calendar" %}
{% trans "Month" %}
</a>
</div>
<a href="{% eventurl request.organizer "presale:organizer.ical" %}?{% url_replace request "locale" request.LANGUAGE_CODE "style" "" "month" "" "year" "" %}"

88
src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html Normal file
View File

@@ -0,0 +1,88 @@
{% extends "pretixpresale/organizers/base.html" %}
{% load i18n %}
{% load rich_text %}
{% load eventurl %}
{% load urlreplace %}
{% block title %}{% trans "Event overview" %}{% endblock %}
{% block content %}
{% if organizer_homepage_text %}
<div>
{{ organizer_homepage_text | rich_text }}
</div>
{% endif %}
<h3>{{ date|date:"F Y" }}</h3>
<form class="form-inline" method="get" id="monthselform" action="{% eventurl request.organizer "presale:organizer.index" %}">
{% for f, v in request.GET.items %}
{% if f != "week" and f != "year" %}
<input type="hidden" name="{{ f }}" value="{{ v }}">
{% endif %}
{% endfor %}
<div class="row">
<div class="col-sm-4 hidden-xs text-left flip">
<div class="btn-group" role="group">
<a href="?{% url_replace request "style" "list" %}" type="button" class="btn btn-default">
<span class="fa fa-list"></span>
{% trans "List" %}
</a>
<a href="?{% url_replace request "style" "week" %}" type="button"
class="btn btn-default active">
<span class="fa fa-calendar"></span>
{% trans "Week" %}
</a>
<a href="?{% url_replace request "style" "calendar" %}"
type="button"
class="btn btn-default">
<span class="fa fa-calendar"></span>
{% trans "Month" %}
</a>
</div>
<a href="{% eventurl request.organizer "presale:organizer.ical" %}?{% url_replace request "locale" request.LANGUAGE_CODE "style" "" "month" "" "year" "" %}"
class="btn btn-default">
<span class="fa fa-calendar-plus-o"></span>
{% trans "iCal" %}
</a>
</div>
<div class="col-sm-4 col-xs-12 text-center">
<select name="week" class="form-control">
{% for w in weeks %}
<option value="{{ w }}" {% if w == date.isocalendar.1 %}selected{% endif %}>{{ w }}</option>
{% endfor %}
</select>
<select name="year" class="form-control">
{% for y in years %}
<option value="{{ y }}" {% if y == date.isocalendar.0 %}selected{% endif %}>{{ y }}</option>
{% endfor %}
</select>
<button type="submit" class="js-hidden btn btn-default">
{% trans "Go" %}
</button>
</div>
<div class="col-sm-4 hidden-xs text-right flip">
<a href="?{% url_replace request "year" before.isocalendar.0 "week" before.isocalendar.1 %}"
class="btn btn-default">
<span class="fa fa-arrow-left"></span>
{{ before|date:week_format }}
</a>
<a href="?{% url_replace request "year" after.isocalendar.0 "week" after.isocalendar.1 %}"
class="btn btn-default">
{{ after|date:week_format }}
<span class="fa fa-arrow-right"></span>
</a>
</div>
</div>
{% for f, v in request.GET.items %}
{% if f != "month" and f != "year" %}
<input type="hidden" name="{{ f }}" value="{{ v }}">
{% endif %}
{% endfor %}
</form>
{% include "pretixpresale/fragment_week_calendar.html" with show_avail=request.organizer.settings.event_list_availability %}
{% if multiple_timezones %}
<div class="alert alert-info">
{% blocktrans trimmed %}
Note that the events in this view are in different timezones.
{% endblocktrans %}
</div>
{% endif %}
{% endblock %}

7
src/pretix/presale/templates/pretixpresale/organizers/index.html
View File

@@ -33,10 +33,15 @@
<span class="fa fa-list"></span>
{% trans "List" %}
</a>
<a href="?{% url_replace request "style" "week" %}" type="button"
class="btn btn-default">
<span class="fa fa-calendar"></span>
{% trans "Week" %}
</a>
<a href="?{% url_replace request "style" "calendar" %}" type="button"
class="btn btn-default">
<span class="fa fa-calendar"></span>
{% trans "Calendar" %}
{% trans "Month" %}
</a>
</div>
<a href="{% eventurl request.organizer "presale:organizer.ical" %}?{% eventurl request.organizer "presale:organizer.ical" %}?{% url_replace request "locale" request.LANGUAGE_CODE "style" "" "month" "" "year" "" %}"

46
src/pretix/presale/views/event.py
View File

@@ -5,6 +5,7 @@ from datetime import date, datetime, timedelta
from decimal import Decimal
from importlib import import_module
import isoweek
import pytz
from django.conf import settings
from django.core.exceptions import PermissionDenied
@@ -12,6 +13,7 @@ from django.db.models import Count, Exists, OuterRef, Prefetch
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.utils.decorators import method_decorator
from django.utils.formats import get_format
from django.utils.timezone import now
from django.utils.translation import gettext_lazy as _, pgettext_lazy
from django.views import View
@@ -27,10 +29,11 @@ from pretix.multidomain.urlreverse import eventreverse
from pretix.presale.ical import get_ical
from pretix.presale.signals import item_description
from pretix.presale.views.organizer import (
EventListMixin, add_subevents_for_days, filter_qs_by_attr,
weeks_for_template,
EventListMixin, add_subevents_for_days, days_for_template,
filter_qs_by_attr, weeks_for_template,
)
from ...helpers.formats.en.formats import WEEK_FORMAT
from . import (
CartMixin, EventViewMixin, allow_frame_if_namespaced, get_cart,
iframe_entry_view_wrapper,
@@ -370,6 +373,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
context['frontpage_text'] = str(self.request.event.settings.frontpage_text)
context['list_type'] = self.request.GET.get("style", self.request.event.settings.event_list_type)
if context['list_type'] not in ("calendar", "week") and self.request.event.subevents.count() > 100:
if self.request.event.settings.event_list_type not in ("calendar", "week"):
self.request.event.settings.event_list_type = "calendar"
context['list_type'] = "calendar"
if context['list_type'] == "calendar" and self.request.event.has_subevents:
self._set_month_year()
@@ -389,9 +396,44 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
kwargs.get('cart_namespace')
)
context['show_names'] = ebd.get('_subevents_different_names', False) or sum(
len(i) for i in ebd.values() if isinstance(i, list)
) < 2
context['weeks'] = weeks_for_template(ebd, self.year, self.month)
context['months'] = [date(self.year, i + 1, 1) for i in range(12)]
context['years'] = range(now().year - 2, now().year + 3)
elif context['list_type'] == "week" and self.request.event.has_subevents:
self._set_week_year()
tz = pytz.timezone(self.request.event.settings.timezone)
week = isoweek.Week(self.year, self.week)
before = datetime(
week.monday().year, week.monday().month, week.monday().day, 0, 0, 0, tzinfo=tz
) - timedelta(days=1)
after = datetime(
week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz
) + timedelta(days=1)
context['date'] = week.monday()
context['before'] = before
context['after'] = after
ebd = defaultdict(list)
add_subevents_for_days(
filter_qs_by_attr(self.request.event.subevents_annotated(self.request.sales_channel.identifier).using(settings.DATABASE_REPLICA), self.request),
before, after, ebd, set(), self.request.event,
kwargs.get('cart_namespace')
)
context['show_names'] = ebd.get('_subevents_different_names', False) or sum(
len(i) for i in ebd.values() if isinstance(i, list)
) < 2
context['days'] = days_for_template(ebd, week)
context['weeks'] = [date(self.year, i + 1, 1) for i in range(12)]
context['weeks'] = [i + 1 for i in range(53)]
context['years'] = range(now().year - 2, now().year + 3)
context['week_format'] = get_format('WEEK_FORMAT')
if context['week_format'] == 'WEEK_FORMAT':
context['week_format'] = WEEK_FORMAT
elif self.request.event.has_subevents:
context['subevent_list'] = self.request.event.subevents_sorted(
filter_qs_by_attr(self.request.event.subevents_annotated(self.request.sales_channel.identifier).using(settings.DATABASE_REPLICA), self.request)

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

@@ -2,12 +2,14 @@ import calendar
from collections import defaultdict
from datetime import date, datetime, timedelta
import isoweek
import pytz
from django.conf import settings
from django.db.models import Exists, Max, Min, OuterRef, Q
from django.db.models.functions import Coalesce, Greatest
from django.http import Http404, HttpResponse
from django.utils.decorators import method_decorator
from django.utils.formats import date_format, get_format
from django.utils.timezone import now
from django.views import View
from django.views.decorators.cache import cache_page
@@ -20,6 +22,7 @@ from pretix.base.models import (
)
from pretix.base.services.quotas import QuotaAvailability
from pretix.helpers.daterange import daterange
from pretix.helpers.formats.de.formats import WEEK_FORMAT
from pretix.multidomain.urlreverse import eventreverse
from pretix.presale.ical import get_ical
from pretix.presale.views import OrganizerViewMixin
@@ -193,6 +196,72 @@ class EventListMixin:
else:
self._set_month_to_next_event()
def _set_week_to_next_subevent(self):
tz = pytz.timezone(self.request.event.settings.timezone)
next_sev = self.request.event.subevents.using(settings.DATABASE_REPLICA).filter(
active=True,
is_public=True,
date_from__gte=now()
).select_related('event').order_by('date_from').first()
if next_sev:
datetime_from = next_sev.date_from
self.year = datetime_from.astimezone(tz).isocalendar()[0]
self.week = datetime_from.astimezone(tz).isocalendar()[1]
else:
self.year = now().isocalendar()[0]
self.week = now().isocalendar()[1]
def _set_week_to_next_event(self):
next_ev = filter_qs_by_attr(Event.objects.using(settings.DATABASE_REPLICA).filter(
organizer=self.request.organizer,
live=True,
is_public=True,
date_from__gte=now(),
has_subevents=False
), self.request).order_by('date_from').first()
next_sev = filter_qs_by_attr(SubEvent.objects.using(settings.DATABASE_REPLICA).filter(
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
active=True,
is_public=True,
date_from__gte=now()
), self.request).select_related('event').order_by('date_from').first()
datetime_from = None
if (next_ev and next_sev and next_sev.date_from < next_ev.date_from) or (next_sev and not next_ev):
datetime_from = next_sev.date_from
next_ev = next_sev.event
elif next_ev:
datetime_from = next_ev.date_from
if datetime_from:
tz = pytz.timezone(next_ev.settings.timezone)
self.year = datetime_from.astimezone(tz).isocalendar()[0]
self.week = datetime_from.astimezone(tz).isocalendar()[1]
else:
self.year = now().isocalendar()[0]
self.week = now().isocalendar()[1]
def _set_week_year(self):
if hasattr(self.request, 'event') and self.subevent:
tz = pytz.timezone(self.request.event.settings.timezone)
self.year = self.subevent.date_from.astimezone(tz).year
self.month = self.subevent.date_from.astimezone(tz).month
if 'year' in self.request.GET and 'week' in self.request.GET:
try:
self.year = int(self.request.GET.get('year'))
self.week = int(self.request.GET.get('week'))
except ValueError:
self.year = now().isocalendar()[0]
self.week = now().isocalendar()[1]
else:
if hasattr(self.request, 'event'):
self._set_week_to_next_subevent()
else:
self._set_week_to_next_event()
class OrganizerIndex(OrganizerViewMixin, EventListMixin, ListView):
model = Event
@@ -206,6 +275,10 @@ class OrganizerIndex(OrganizerViewMixin, EventListMixin, ListView):
cv = CalendarView()
cv.request = request
return cv.get(request, *args, **kwargs)
elif style == "week":
cv = WeekCalendarView()
cv.request = request
return cv.get(request, *args, **kwargs)
else:
return super().get(request, *args, **kwargs)
@@ -281,6 +354,7 @@ def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_n
if not q.cache_is_hot(now() + timedelta(seconds=5))
]
name = None
if quotas_to_compute:
qa = QuotaAvailability()
qa.queue(*quotas_to_compute)
@@ -297,6 +371,10 @@ def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_n
tz = pytz.timezone(settings.timezone)
datetime_from = se.date_from.astimezone(tz)
date_from = datetime_from.date()
if name is None:
name = str(se.name)
elif str(se.name) != name:
ebd['_subevents_different_names'] = True
if se.event.settings.show_date_to and se.date_to:
date_to = se.date_to.astimezone(tz).date()
d = max(date_from, before.date())
@@ -321,6 +399,20 @@ def add_subevents_for_days(qs, before, after, ebd, timezones, event=None, cart_n
})
def days_for_template(ebd, week):
day_format = get_format('WEEK_DAY_FORMAT')
if day_format == 'WEEK_DAY_FORMAT':
day_format = 'SHORT_DATE_FORMAT'
return [
{
'day_formatted': date_format(day, day_format),
'date': day,
'events': ebd.get(day)
}
for day in week.days()
]
def weeks_for_template(ebd, year, month):
calendar.setfirstweekday(0) # TODO: Configurable
return [
@@ -382,6 +474,56 @@ class CalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
return ebd
class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
template_name = 'pretixpresale/organizers/calendar_week.html'
def get(self, request, *args, **kwargs):
self._set_week_year()
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
ctx = super().get_context_data()
week = isoweek.Week(self.year, self.week)
before = datetime(
week.monday().year, week.monday().month, week.monday().day, 0, 0, 0, tzinfo=UTC
) - timedelta(days=1)
after = datetime(
week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=UTC
) + timedelta(days=1)
ctx['date'] = week.monday()
ctx['before'] = before
ctx['after'] = after
ebd = self._events_by_day(before, after)
ctx['days'] = days_for_template(ebd, week)
ctx['weeks'] = [date(self.year, i + 1, 1) for i in range(12)]
ctx['weeks'] = [i + 1 for i in range(53)]
ctx['years'] = range(now().year - 2, now().year + 3)
ctx['week_format'] = get_format('WEEK_FORMAT')
if ctx['week_format'] == 'WEEK_FORMAT':
ctx['week_format'] = WEEK_FORMAT
ctx['multiple_timezones'] = self._multiple_timezones
return ctx
def _events_by_day(self, before, after):
ebd = defaultdict(list)
timezones = set()
add_events_for_days(self.request, Event.annotated(self.request.organizer.events, 'web').using(settings.DATABASE_REPLICA), before, after, ebd, timezones)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
).prefetch_related(
'event___settings_objects', 'event__organizer___settings_objects'
)), self.request).using(settings.DATABASE_REPLICA), before, after, ebd, timezones)
self._multiple_timezones = len(timezones) > 1
return ebd
@method_decorator(cache_page(300), name='dispatch')
class OrganizerIcalDownload(OrganizerViewMixin, View):
def get(self, request, *args, **kwargs):

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

@@ -6,6 +6,7 @@ from collections import defaultdict
from datetime import date, datetime, timedelta
from urllib.parse import urljoin
import isoweek
import pytz
from django.conf import settings
from django.contrib.staticfiles import finders
@@ -43,7 +44,7 @@ from pretix.presale.views.event import (
)
from pretix.presale.views.organizer import (
EventListMixin, add_events_for_days, add_subevents_for_days,
filter_qs_by_attr, weeks_for_template,
days_for_template, filter_qs_by_attr, weeks_for_template,
)
logger = logging.getLogger(__name__)
@@ -360,6 +361,12 @@ class WidgetAPIProductList(EventListMixin, View):
list_type = self.request.GET.get("style", o.settings.event_list_type)
data['list_type'] = list_type
if hasattr(self.request, 'event') and data['list_type'] not in ("calendar", "week"):
if self.request.event.subevents.count() > 100:
if self.request.event.settings.event_list_type not in ("calendar", "week"):
self.request.event.settings.event_list_type = "calendar"
data['list_type'] = list_type = 'calendar'
cache_key = ':'.join([
'widget.py',
'eventlist',
@@ -414,6 +421,48 @@ class WidgetAPIProductList(EventListMixin, View):
if not d:
continue
d['events'] = self._serialize_events(d['events'] or [])
elif list_type == "week":
self._set_week_year()
if hasattr(self.request, 'event'):
tz = pytz.timezone(self.request.event.settings.timezone)
else:
tz = pytz.UTC
week = isoweek.Week(self.year, self.week)
data['week'] = [self.year, self.week]
before = datetime(
week.monday().year, week.monday().month, week.monday().day, 0, 0, 0, tzinfo=tz
) - timedelta(days=1)
after = datetime(
week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz
) + timedelta(days=1)
ebd = defaultdict(list)
if hasattr(self.request, 'event'):
add_subevents_for_days(
filter_qs_by_attr(self.request.event.subevents_annotated('web'), self.request),
before, after, ebd, set(), self.request.event,
kwargs.get('cart_namespace')
)
else:
timezones = set()
add_events_for_days(
self.request,
filter_qs_by_attr(Event.annotated(self.request.organizer.events, 'web'), self.request),
before, after, ebd, timezones
)
add_subevents_for_days(filter_qs_by_attr(SubEvent.annotated(SubEvent.objects.filter(
event__organizer=self.request.organizer,
event__is_public=True,
event__live=True,
).prefetch_related(
'event___settings_objects', 'event__organizer___settings_objects'
)), self.request), before, after, ebd, timezones)
data['days'] = days_for_template(ebd, week)
for d in data['days']:
d['events'] = self._serialize_events(d['events'] or [])
else:
if hasattr(self.request, 'event'):
evs = self.request.event.subevents_sorted(