ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Added two new statistics about all users: 'order sum' visible for users having the 'view_order' permission and 'deposit sum' visible for users having the 'view_registertransaction' permission, improved the layout of the statistics page, updated translations

Browse source
This commit is contained in:
Julian Müller (ChaoticByte) 2023-11-01 19:07:07 +01:00
parent 4eb2911150
commit e4acc5c101
5 changed files with 109 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

51
app/templates/statistics.html
View file

@ -20,12 +20,14 @@
{% for key, values in orders_per_drink.items %}
<tr>
<td>{{ key }}</td>
<td>{{ values.a|default:"0" }}</td>
<td>{{ values.b|default:"0" }}</td>
<td>{{ values.a|default:0 }}</td>
<td>{{ values.b|default:0 }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<div class="statistics-container">
<div class="flex flex-column">
<h3>{% translate "orders / month" %}</h3>
<table>
@ -37,8 +39,8 @@
{% for key, values in orders_per_month.items %}
<tr>
<td>{{ key }}</td>
<td>{{ values.a|default:"0" }}</td>
<td>{{ values.b|default:"0" }}</td>
<td>{{ values.a|default:0 }}</td>
<td>{{ values.b|default:0 }}</td>
</tr>
{% endfor %}
</table>
@ -54,11 +56,48 @@
{% for values in orders_per_weekday %}
<tr>
<td>{{ values.0 }}</td>
<td>{{ values.1|default:"0" }}</td>
<td>{{ values.2|default:"0" }}</td>
<td>{{ values.1|default:0 }}</td>
<td>{{ values.2|default:0 }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<div class="statistics-container">
{% if user.is_superuser or perms.app.view_order %}
<div class="flex flex-column">
<h3>{% translate "order sum" %}</h3>
<table>
<tr>
<th>{% translate "user" %}</th>
<th>{% translate "sum" %}</th>
</tr>
{% for values in order_sum_per_user %}
<tr>
<td>{{ values.0 }}</td>
<td>{{ values.1|default:0.0 }} {{ currency_suffix }}</td>
</tr>
{% endfor %}
</table>
</div>
{% endif %}
{% if user.is_superuser or perms.app.view_registertransaction %}
<div class="flex flex-column">
<h3>{% translate "deposit sum" %}</h3>
<table>
<tr>
<th>{% translate "user" %}</th>
<th>{% translate "sum" %}</th>
</tr>
{% for values in deposit_sum_per_user %}
<tr>
<td>{{ values.0 }}</td>
<td>{{ values.1|default:0.0 }} {{ currency_suffix }}</td>
</tr>
{% endfor %}
</table>
</div>
{% endif %}
</div>
<script src="/static/js/autoreload.js"></script>
{% endblock %}