Added a donut chart to the quota view

Moved morris.js out of the statistics plugin
This commit is contained in:
Raphael Michel
2016-09-18 19:11:44 +02:00
parent ebbd9aaee9
commit f8ce3523dc
13 changed files with 74 additions and 33 deletions

View File

@@ -17,9 +17,12 @@
<script type="text/javascript" src="{% static "bootstrap/js/bootstrap.js" %}"></script>
<script type="text/javascript" src="{% static "moment/moment-with-locales.js" %}"></script>
<script type="text/javascript" src="{% static "datetimepicker/bootstrap-datetimepicker.js" %}"></script>
<script type="text/javascript" src="{% static "charts/raphael-min.js" %}"></script>
<script type="text/javascript" src="{% static "charts/morris.min.js" %}"></script>
<script type="text/javascript" src="{% static "pretixcontrol/js/metisMenu.min.js" %}"></script>
<script type="text/javascript" src="{% static "pretixcontrol/js/sb-admin-2.js" %}"></script>
<script type="text/javascript" src="{% static "pretixcontrol/js/ui/main.js" %}"></script>
<script type="text/javascript" src="{% static "pretixcontrol/js/ui/quota.js" %}"></script>
{% endcompress %}
{{ html_head|safe }}
<meta name="viewport" content="width=device-width, initial-scale=1">

View File

@@ -46,9 +46,13 @@
</fieldset>
</div>
{% if quota.pk and quota.size != None %}
<div class="col-xs-12 col-lg-3">
<div class="col-xs-12 col-lg-3" id="quota-stats">
<fieldset>
<legend>{% trans "Availability calculation" %}</legend>
<div class="chart" id="quota_chart">
</div>
<div class="row">
<div class="col-xs-9">{% trans "Total quota" %}</div>
<div class="col-xs-3 text-right">{{ quota.size }}</div>
@@ -75,6 +79,7 @@
</div>
</fieldset>
</div>
<script type="application/json" id="quota-chart-data">{{ quota_chart_data|safe }}</script>
{% endif %}
</div>
<div class="form-group submit-group">

View File

@@ -26,3 +26,12 @@ class UpdateView(EventBasedFormMixin, edit.UpdateView):
properly.
"""
pass
class ChartContainingView:
def get(self, request, *args, **kwargs):
resp = super().get(request, *args, **kwargs)
# required by raphael.js
resp['Content-Security-Policy'] = "script-src {static} 'unsafe-eval'; style-src {static} 'unsafe-inline'"
return resp

View File

@@ -1,3 +1,5 @@
import json
from django.contrib import messages
from django.core.files import File
from django.core.urlresolvers import resolve, reverse
@@ -6,7 +8,7 @@ from django.forms.models import ModelMultipleChoiceField, inlineformset_factory
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import redirect
from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext, ugettext_lazy as _
from django.views.generic import ListView
from django.views.generic.base import TemplateView
from django.views.generic.detail import SingleObjectMixin
@@ -24,7 +26,7 @@ from pretix.control.permissions import (
EventPermissionRequiredMixin, event_permission_required,
)
from . import CreateView, UpdateView
from . import ChartContainingView, CreateView, UpdateView
class ItemList(ListView):
@@ -525,13 +527,39 @@ class QuotaCreate(EventPermissionRequiredMixin, QuotaEditorMixin, CreateView):
return ret
class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, UpdateView):
class QuotaUpdate(EventPermissionRequiredMixin, QuotaEditorMixin, ChartContainingView, UpdateView):
model = Quota
form_class = QuotaForm
template_name = 'pretixcontrol/items/quota.html'
permission = 'can_change_items'
context_object_name = 'quota'
def get_context_data(self, *args, **kwargs):
ctx = super().get_context_data()
ctx['quota_chart_data'] = json.dumps([
{
'label': ugettext('Paid orders'),
'value': self.object.count_paid_orders()
},
{
'label': ugettext('Pending orders'),
'value': self.object.count_pending_orders()
},
{
'label': ugettext('Vouchers'),
'value': self.object.count_blocking_vouchers()
},
{
'label': ugettext('Current user\'s carts'),
'value': self.object.count_in_cart()
},
{
'label': ugettext('Current availability'),
'value': self.object.availability()[1]
}
])
return ctx
def get_object(self, queryset=None) -> Quota:
try:
return self.request.event.quotas.get(