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

Check-in export: Fix filter options

Browse Source
This commit is contained in:
Raphael Michel
2023-06-22 09:04:05 +02:00
parent 3f47cf785c
commit 1eb1d8df5f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1754,9 +1754,9 @@ class CheckinListAttendeeFilterForm(FilterForm):
label=_('Check-in status'), label=_('Check-in status'),
choices=( choices=(
('', _('All attendees')), ('', _('All attendees')),
('3', pgettext_lazy('checkin state', 'Checked in but left')),
('2', pgettext_lazy('checkin state', 'Present')),
('1', _('Checked in')), ('1', _('Checked in')),
('2', pgettext_lazy('checkin state', 'Present')),
('3', pgettext_lazy('checkin state', 'Checked in but left')),
('0', _('Not checked in')), ('0', _('Not checked in')),
), ),
required=False, required=False,

7
src/pretix/plugins/checkinlists/exporters.py
View File

@@ -104,11 +104,12 @@ class CheckInListMixin(BaseExporter):
label=_('Check-in status'), label=_('Check-in status'),
choices=( choices=(
('', _('All attendees')), ('', _('All attendees')),
('3', pgettext_lazy('checkin state', 'Checked in but left')),
('2', pgettext_lazy('checkin state', 'Present')),
('1', _('Checked in')), ('1', _('Checked in')),
('2', pgettext_lazy('checkin state', 'Present')),
('3', pgettext_lazy('checkin state', 'Checked in but left')),
('0', _('Not checked in')), ('0', _('Not checked in')),
), ),
required=False,
)), )),
('sort', ('sort',
forms.ChoiceField( forms.ChoiceField(
@@ -190,7 +191,7 @@ class CheckInListMixin(BaseExporter):
qs = qs.filter(pk__in=cl.positions_inside.values_list('pk')) qs = qs.filter(pk__in=cl.positions_inside.values_list('pk'))
elif s == '3': elif s == '3':
qs = qs.filter(last_checked_in__isnull=False).filter( qs = qs.filter(last_checked_in__isnull=False).filter(
Q(last_checked_out__isnull=False) & Q(last_exit__gte=F('last_checked_in')) Q(last_checked_out__isnull=False) & Q(last_checked_out__gte=F('last_checked_in'))
) )
elif s == '0': elif s == '0':
qs = qs.filter(last_checked_in__isnull=True) qs = qs.filter(last_checked_in__isnull=True)