Subevent list: Add meta-data filter (Z#23114466) (#3083)

Co-authored-by: Raphael Michel <michel@rami.io>
This commit is contained in:
Richard Schreiber
2023-02-06 17:51:47 +01:00
committed by GitHub
parent 6f61155deb
commit 513a90f976
5 changed files with 91 additions and 4 deletions

View File

@@ -57,8 +57,8 @@ from pretix.base.forms.widgets import (
from pretix.base.models import ( from pretix.base.models import (
Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue, Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition, Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
OrderRefund, Organizer, Question, QuestionAnswer, SubEvent, Team, OrderRefund, Organizer, Question, QuestionAnswer, SubEvent,
TeamAPIToken, TeamInvite, SubEventMetaValue, Team, TeamAPIToken, TeamInvite,
) )
from pretix.base.signals import register_payment_providers from pretix.base.signals import register_payment_providers
from pretix.control.forms.widgets import Select2 from pretix.control.forms.widgets import Select2
@@ -1116,9 +1116,25 @@ class SubEventFilterForm(FilterForm):
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.event = kwargs.pop('event')
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['date_from'].widget = DatePickerWidget() self.fields['date_from'].widget = DatePickerWidget()
self.fields['date_until'].widget = DatePickerWidget() self.fields['date_until'].widget = DatePickerWidget()
for p in self.meta_properties.all():
self.fields['meta_{}'.format(p.name)] = forms.CharField(
label=p.name,
required=False,
widget=forms.TextInput(
attrs={
'data-typeahead-url': reverse('control:event.subevents.meta.typeahead', kwargs={
'organizer': self.event.organizer.slug,
'event': self.event.slug
}) + '?' + urlencode({
'property': p.name,
})
}
)
)
def filter_qs(self, qs): def filter_qs(self, qs):
fdata = self.cleaned_data fdata = self.cleaned_data
@@ -1181,6 +1197,31 @@ class SubEventFilterForm(FilterForm):
if fdata.get('time_from'): if fdata.get('time_from'):
qs = qs.filter(date_from__time__gte=fdata.get('time_from')) qs = qs.filter(date_from__time__gte=fdata.get('time_from'))
filters_by_property_name = {}
for i, p in enumerate(self.meta_properties):
d = fdata.get('meta_{}'.format(p.name))
if d:
semv_with_value = SubEventMetaValue.objects.filter(
subevent=OuterRef('pk'),
property__pk=p.pk,
value=d
)
semv_with_any_value = SubEventMetaValue.objects.filter(
subevent=OuterRef('pk'),
property__pk=p.pk,
)
qs = qs.annotate(**{'attr_{}'.format(i): Exists(semv_with_value)})
if p.name in filters_by_property_name:
filters_by_property_name[p.name] |= Q(**{'attr_{}'.format(i): True})
else:
filters_by_property_name[p.name] = Q(**{'attr_{}'.format(i): True})
default = self.event.meta_data[p.name]
if default == d:
qs = qs.annotate(**{'attr_{}_any'.format(i): Exists(semv_with_any_value)})
filters_by_property_name[p.name] |= Q(**{'attr_{}_any'.format(i): False})
for f in filters_by_property_name.values():
qs = qs.filter(f)
if fdata.get('ordering'): if fdata.get('ordering'):
qs = qs.order_by(self.get_order_by()) qs = qs.order_by(self.get_order_by())
else: else:
@@ -1188,6 +1229,10 @@ class SubEventFilterForm(FilterForm):
return qs return qs
@cached_property
def meta_properties(self):
return self.event.organizer.meta_properties.filter(filter_allowed=True)
class OrganizerFilterForm(FilterForm): class OrganizerFilterForm(FilterForm):
orders = { orders = {

View File

@@ -50,6 +50,11 @@
<div class="col-xs-12 one-line-checkboxes"> <div class="col-xs-12 one-line-checkboxes">
{% bootstrap_field filter_form.weekday %} {% bootstrap_field filter_form.weekday %}
</div> </div>
{% for mf in meta_fields %}
<div class="col-md-3 col-sm-6 col-xs-12">
{% bootstrap_field mf %}
</div>
{% endfor %}
</div> </div>
<div class="text-right flip"> <div class="text-right flip">

View File

@@ -261,6 +261,7 @@ urlpatterns = [
re_path(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'), re_path(r'^subevents/bulk_add$', subevents.SubEventBulkCreate.as_view(), name='event.subevents.bulk'),
re_path(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'), re_path(r'^subevents/bulk_action$', subevents.SubEventBulkAction.as_view(), name='event.subevents.bulkaction'),
re_path(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'), re_path(r'^subevents/bulk_edit$', subevents.SubEventBulkEdit.as_view(), name='event.subevents.bulkedit'),
re_path(r'^subevents/typeahead/meta/$', typeahead.subevent_meta_values, name='event.subevents.meta.typeahead'),
re_path(r'^items/$', item.ItemList.as_view(), name='event.items'), re_path(r'^items/$', item.ItemList.as_view(), name='event.items'),
re_path(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'), re_path(r'^items/add$', item.ItemCreate.as_view(), name='event.items.add'),
re_path(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'), re_path(r'^items/(?P<item>\d+)/$', item.ItemUpdateGeneral.as_view(), name='event.item'),

View File

@@ -110,7 +110,7 @@ class SubEventQueryMixin:
@cached_property @cached_property
def filter_form(self): def filter_form(self):
return SubEventFilterForm(data=self.request_data, prefix='filter') return SubEventFilterForm(data=self.request_data, prefix='filter', event=self.request.event)
class SubEventList(EventPermissionRequiredMixin, PaginationMixin, SubEventQueryMixin, ListView): class SubEventList(EventPermissionRequiredMixin, PaginationMixin, SubEventQueryMixin, ListView):
@@ -125,6 +125,9 @@ class SubEventList(EventPermissionRequiredMixin, PaginationMixin, SubEventQueryM
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs) ctx = super().get_context_data(**kwargs)
ctx['filter_form'] = self.filter_form ctx['filter_form'] = self.filter_form
ctx['meta_fields'] = [
self.filter_form['meta_{}'.format(p.name)] for p in self.request.organizer.meta_properties.filter(filter_allowed=True)
]
quotas = [] quotas = []
for s in ctx['subevents']: for s in ctx['subevents']:

View File

@@ -48,7 +48,8 @@ from django.utils.translation import gettext as _, pgettext
from pretix.base.models import ( from pretix.base.models import (
EventMetaProperty, EventMetaValue, ItemMetaProperty, ItemMetaValue, EventMetaProperty, EventMetaValue, ItemMetaProperty, ItemMetaValue,
ItemVariation, ItemVariationMetaValue, Order, Organizer, User, Voucher, ItemVariation, ItemVariationMetaValue, Order, Organizer, SubEventMetaValue,
User, Voucher,
) )
from pretix.control.forms.event import EventWizardCopyForm from pretix.control.forms.event import EventWizardCopyForm
from pretix.control.permissions import ( from pretix.control.permissions import (
@@ -743,6 +744,38 @@ def meta_values(request):
}) })
def subevent_meta_values(request, organizer, event):
q = request.GET.get('q')
propname = request.GET.get('property')
matches = SubEventMetaValue.objects.filter(
value__icontains=q,
property__name=propname,
subevent__event_id=request.event.pk,
)
event_matches = EventMetaValue.objects.filter(
value__icontains=q,
property__name=propname,
event_id=request.event.pk,
)
defaults = EventMetaProperty.objects.filter(
default__icontains=q,
name=propname,
organizer_id=request.organizer.pk,
)
return JsonResponse({
'results': [
{'name': v, 'id': v}
for v in sorted(
set(defaults.values_list('default', flat=True)[:10]) |
set(matches.values_list('value', flat=True)[:10]) |
set(event_matches.values_list('value', flat=True)[:10])
)
]
})
def item_meta_values(request, organizer, event): def item_meta_values(request, organizer, event):
q = request.GET.get('q') q = request.GET.get('q')
propname = request.GET.get('property') propname = request.GET.get('property')