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

Check-in list: Allow to filter by date

Browse Source
This commit is contained in:
Raphael Michel
2021-07-19 14:27:23 +02:00
parent f7e5f0b567
commit 39736ef0d4
3 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/pretix/control/forms/filter.py
View File

@@ -1352,7 +1352,7 @@ class EventFilterForm(FilterForm):
)
class CheckInFilterForm(FilterForm):
class CheckinListAttendeeFilterForm(FilterForm):
orders = {
'code': ('order__code', 'item__name'),
'-code': ('-order__code', '-item__name'),
@@ -1399,6 +1399,24 @@ class CheckInFilterForm(FilterForm):
required=False,
empty_label=_('All products')
)
subevent = forms.ModelChoiceField(
label=pgettext_lazy('subevent', 'Date'),
queryset=SubEvent.objects.none(),
required=False,
empty_label=pgettext_lazy('subevent', 'All dates')
)
subevent_from = forms.SplitDateTimeField(
widget=SplitDateTimePickerWidget(attrs={
}),
label=pgettext_lazy('subevent', 'Date start from'),
required=False,
)
subevent_until = forms.SplitDateTimeField(
widget=SplitDateTimePickerWidget(attrs={
}),
label=pgettext_lazy('subevent', 'Date start until'),
required=False,
)
def __init__(self, *args, **kwargs):
self.event = kwargs.pop('event')
@@ -1409,6 +1427,24 @@ class CheckInFilterForm(FilterForm):
else:
self.fields['item'].queryset = self.list.limit_products.all()
if self.event.has_subevents:
self.fields['subevent'].queryset = self.event.subevents.all()
self.fields['subevent'].widget = Select2(
attrs={
'data-model-select2': 'event',
'data-select2-url': reverse('control:event.subevents.select2', kwargs={
'event': self.event.slug,
'organizer': self.event.organizer.slug,
}),
'data-placeholder': pgettext_lazy('subevent', 'All dates')
}
)
self.fields['subevent'].widget.choices = self.fields['subevent'].choices
else:
del self.fields['subevent']
del self.fields['subevent_from']
del self.fields['subevent_until']
def filter_qs(self, qs):
fdata = self.cleaned_data
@@ -1455,6 +1491,14 @@ class CheckInFilterForm(FilterForm):
if fdata.get('item'):
qs = qs.filter(item=fdata.get('item'))
if fdata.get('subevent'):
qs = qs.filter(subevent_id=fdata.get('subevent').pk)
if fdata.get('subevent_from'):
qs = qs.filter(subevent__date_from__gte=fdata.get('subevent_from'))
if fdata.get('subevent_until'):
qs = qs.filter(subevent__date_from__lte=fdata.get('subevent_until'))
return qs