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

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

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

* add missing td for sum

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
This commit is contained in:
Raphael Michel
2025-06-13 11:01:37 +02:00
committed by GitHub
parent b5f8438c18
commit 8418d03add
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/control/templates/pretixcontrol/items/question.html
View File

@@ -89,7 +89,8 @@
<tr> <tr>
<th>{% trans "Answer" %}</th> <th>{% trans "Answer" %}</th>
<th class="text-right">{% trans "Count" %}</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> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -102,6 +103,7 @@
</td> </td>
<td class="text-right">{{ stat.count }}</td> <td class="text-right">{{ stat.count }}</td>
<td class="text-right">{{ stat.percentage|floatformat:1 }} %</td> <td class="text-right">{{ stat.percentage|floatformat:1 }} %</td>
<td class="text-right">{{ stat.percentage_attendees|floatformat:1 }} %</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@@ -110,6 +112,7 @@
<td><strong>{% trans "Sum" %}</strong></td> <td><strong>{% trans "Sum" %}</strong></td>
<td class="text-right"><strong>{{ total }}</strong></td> <td class="text-right"><strong>{{ total }}</strong></td>
<td></td> <td></td>
<td></td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>

35
src/pretix/control/views/item.py
View File

@@ -64,8 +64,9 @@ from pretix.api.serializers.item import (
) )
from pretix.base.forms import I18nFormSet from pretix.base.forms import I18nFormSet
from pretix.base.models import ( from pretix.base.models import (
CartPosition, Item, ItemCategory, ItemVariation, Order, Question, CartPosition, Item, ItemCategory, ItemVariation, Order, OrderPosition,
QuestionAnswer, QuestionOption, Quota, SeatCategoryMapping, Voucher, Question, QuestionAnswer, QuestionOption, Quota, SeatCategoryMapping,
Voucher,
) )
from pretix.base.models.event import SubEvent from pretix.base.models.event import SubEvent
from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
@@ -665,36 +666,41 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
template_name_field = 'question' template_name_field = 'question'
def get_answer_statistics(self): def get_answer_statistics(self):
opqs = OrderPosition.objects.filter(
order__event=self.request.event,
)
qs = QuestionAnswer.objects.filter( qs = QuestionAnswer.objects.filter(
question=self.object, orderposition__isnull=False, question=self.object, orderposition__isnull=False,
orderposition__order__event=self.request.event
) )
if self.request.GET.get("subevent", "") != "": 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") s = self.request.GET.get("status", "np")
if s != "": if s != "":
if s == 'o': if s == 'o':
qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING, opqs = opqs.filter(order__status=Order.STATUS_PENDING,
orderposition__order__expires__lt=now().replace(hour=0, minute=0, second=0)) order__expires__lt=now().replace(hour=0, minute=0, second=0))
elif s == 'np': 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': elif s == 'pv':
qs = qs.filter( opqs = opqs.filter(
Q(orderposition__order__status=Order.STATUS_PAID) | Q(order__status=Order.STATUS_PAID) |
Q(orderposition__order__status=Order.STATUS_PENDING, orderposition__order__valid_if_pending=True) Q(order__status=Order.STATUS_PENDING, order__valid_if_pending=True)
) )
elif s == 'ne': 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: else:
qs = qs.filter(orderposition__order__status=s) opqs = opqs.filter(order__status=s)
if s not in (Order.STATUS_CANCELED, ""): if s not in (Order.STATUS_CANCELED, ""):
qs = qs.filter(orderposition__canceled=False) opqs = opqs.filter(canceled=False)
if self.request.GET.get("item", "") != "": if self.request.GET.get("item", "") != "":
i = 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: if self.object.type == Question.TYPE_FILE:
qs = [ qs = [
@@ -734,6 +740,7 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
total = sum(a['count'] for a in r) total = sum(a['count'] for a in r)
for a in r: for a in r:
a['percentage'] = (a['count'] / total * 100.) if total else 0 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 return r, total
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):