CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a donut chart to the quota view

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/control/templates/pretixcontrol/base.html
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">

7
src/pretix/control/templates/pretixcontrol/items/quota.html
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">