forked from CGM_Public/pretix_original
This commit is contained in:
@@ -848,12 +848,18 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
|
|||||||
).distinct()
|
).distinct()
|
||||||
for q in self.event.questions.all():
|
for q in self.event.questions.all():
|
||||||
if fdata.get(f'question_{q.pk}'):
|
if fdata.get(f'question_{q.pk}'):
|
||||||
if q.type == Question.TYPE_BOOLEAN:
|
if q.type in (Question.TYPE_BOOLEAN, Question.TYPE_NUMBER):
|
||||||
answers = QuestionAnswer.objects.filter(
|
answers = QuestionAnswer.objects.filter(
|
||||||
question_id=q.pk,
|
question_id=q.pk,
|
||||||
orderposition__order_id=OuterRef('pk'),
|
orderposition__order_id=OuterRef('pk'),
|
||||||
answer__exact=fdata.get(f'question_{q.pk}')
|
answer__exact=fdata.get(f'question_{q.pk}')
|
||||||
)
|
)
|
||||||
|
elif q.type in (Question.TYPE_DATE, Question.TYPE_TIME, Question.TYPE_DATETIME):
|
||||||
|
answers = QuestionAnswer.objects.filter(
|
||||||
|
question_id=q.pk,
|
||||||
|
orderposition__order_id=OuterRef('pk'),
|
||||||
|
answer__exact=str(fdata.get(f'question_{q.pk}'))
|
||||||
|
)
|
||||||
elif q.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
|
elif q.type in (Question.TYPE_CHOICE, Question.TYPE_CHOICE_MULTIPLE):
|
||||||
answers = QuestionAnswer.objects.filter(
|
answers = QuestionAnswer.objects.filter(
|
||||||
question_id=q.pk,
|
question_id=q.pk,
|
||||||
|
|||||||
Reference in New Issue
Block a user