From 8418d03add85e6623fbd0509eb141b2fbdc686b4 Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Fri, 13 Jun 2025 11:01:37 +0200
Subject: [PATCH] Questions: Express percentage of tickets (Z#23196542) (#5239)

* Questions: Express percentage of tickets (Z#23196542)

* add missing td for sum

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
---
 .../pretixcontrol/items/question.html         |  5 ++-
 src/pretix/control/views/item.py              | 35 +++++++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/items/question.html b/src/pretix/control/templates/pretixcontrol/items/question.html
index 18aab8d094..9dfe84023a 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question.html
@@ -89,7 +89,8 @@
                     <tr>
                         <th>{% trans "Answer" %}</th>
                         <th class="text-right">{% trans "Count" %}</th>
-                        <th class="text-right">{% trans "Percentage" %}</th>
+                        <th class="text-right">{% trans "% of answers" %}</th>
+                        <th class="text-right">{% trans "% of tickets" %}</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -102,6 +103,7 @@
                             </td>
                             <td class="text-right">{{ stat.count }}</td>
                             <td class="text-right">{{ stat.percentage|floatformat:1 }} %</td>
+                            <td class="text-right">{{ stat.percentage_attendees|floatformat:1 }} %</td>
                         </tr>
                     {% endfor %}
                     </tbody>
@@ -110,6 +112,7 @@
                             <td><strong>{% trans "Sum" %}</strong></td>
                             <td class="text-right"><strong>{{ total }}</strong></td>
                             <td></td>
+                            <td></td>
                         </tr>
                     </tfoot>
                 </table>
diff --git a/src/pretix/control/views/item.py b/src/pretix/control/views/item.py
index 9c4b51ef73..7c9c39b86f 100644
--- a/src/pretix/control/views/item.py
+++ b/src/pretix/control/views/item.py
@@ -64,8 +64,9 @@ from pretix.api.serializers.item import (
 )
 from pretix.base.forms import I18nFormSet
 from pretix.base.models import (
-    CartPosition, Item, ItemCategory, ItemVariation, Order, Question,
-    QuestionAnswer, QuestionOption, Quota, SeatCategoryMapping, Voucher,
+    CartPosition, Item, ItemCategory, ItemVariation, Order, OrderPosition,
+    Question, QuestionAnswer, QuestionOption, Quota, SeatCategoryMapping,
+    Voucher,
 )
 from pretix.base.models.event import SubEvent
 from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
@@ -665,36 +666,41 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
     template_name_field = 'question'
 
     def get_answer_statistics(self):
+        opqs = OrderPosition.objects.filter(
+            order__event=self.request.event,
+        )
         qs = QuestionAnswer.objects.filter(
             question=self.object, orderposition__isnull=False,
-            orderposition__order__event=self.request.event
         )
 
         if self.request.GET.get("subevent", "") != "":
-            qs = qs.filter(orderposition__subevent=self.request.GET["subevent"])
+            opqs = opqs.filter(subevent=self.request.GET["subevent"])
 
         s = self.request.GET.get("status", "np")
         if s != "":
             if s == 'o':
-                qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING,
-                               orderposition__order__expires__lt=now().replace(hour=0, minute=0, second=0))
+                opqs = opqs.filter(order__status=Order.STATUS_PENDING,
+                                   order__expires__lt=now().replace(hour=0, minute=0, second=0))
             elif s == 'np':
-                qs = qs.filter(orderposition__order__status__in=[Order.STATUS_PENDING, Order.STATUS_PAID])
+                opqs = opqs.filter(order__status__in=[Order.STATUS_PENDING, Order.STATUS_PAID])
             elif s == 'pv':
-                qs = qs.filter(
-                    Q(orderposition__order__status=Order.STATUS_PAID) |
-                    Q(orderposition__order__status=Order.STATUS_PENDING, orderposition__order__valid_if_pending=True)
+                opqs = opqs.filter(
+                    Q(order__status=Order.STATUS_PAID) |
+                    Q(order__status=Order.STATUS_PENDING, order__valid_if_pending=True)
                 )
             elif s == 'ne':
-                qs = qs.filter(orderposition__order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED])
+                opqs = opqs.filter(order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED])
             else:
-                qs = qs.filter(orderposition__order__status=s)
+                opqs = opqs.filter(order__status=s)
 
         if s not in (Order.STATUS_CANCELED, ""):
-            qs = qs.filter(orderposition__canceled=False)
+            opqs = opqs.filter(canceled=False)
         if self.request.GET.get("item", "") != "":
             i = self.request.GET.get("item", "")
-            qs = qs.filter(orderposition__item_id__in=(i,))
+            opqs = opqs.filter(item_id__in=(i,))
+
+        qs = qs.filter(orderposition__in=opqs)
+        op_cnt = opqs.filter(item__in=self.object.items.all()).count()
 
         if self.object.type == Question.TYPE_FILE:
             qs = [
@@ -734,6 +740,7 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
         total = sum(a['count'] for a in r)
         for a in r:
             a['percentage'] = (a['count'] / total * 100.) if total else 0
+            a['percentage_attendees'] = (a['count'] / op_cnt * 100.) if op_cnt else 0
         return r, total
 
     def get_context_data(self, **kwargs):