klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 06:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added forgotten column and a link in tools

Browse Source
This commit is contained in:
Antoine Bartuccio 2017-06-02 15:30:11 +02:00
parent e97135bf47
commit 1c05671784
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/templates/core/user_tools.jinja
View File

@ -16,6 +16,7 @@
{% endif %} {% endif %}
{% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root %} {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root %}
<li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li> <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
<li><a href="{{ url('subscription:stats') }}">{% trans %}Subscription stats{% endtrans %}</a></li>
<li><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></li> <li><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></li>
{% endif %} {% endif %}
</ul> </ul>

6
subscription/templates/subscription/stats.jinja
View File

@ -20,17 +20,19 @@
{% for location in locations %} {% for location in locations %}
<th>{{ location[1] }}</th> <th>{{ location[1] }}</th>
{% endfor %} {% endfor %}
<th>{% trans %}Total{% endtrans %}</th>
{% for type in subscriptions_types %} {% for type in subscriptions_types %}
<tr> <tr>
<td>{{ subscriptions_types[type]['name'] }}</td> <td>{{ subscriptions_types[type]['name'] }}</td>
{% for location in locations %} {% for location in locations %}
<td> <td>
{% trans %}Total{% endtrans %} : {{ subscriptions_total.filter(location=location[0]).count()}}<br> {% trans %}Total{% endtrans %} : {{ subscriptions_total.filter(subscription_type=type, location=location[0]).count()}}<br>
{% for p_type in payment_types %} {% for p_type in payment_types %}
{{ p_type[1] }} : {{ subscriptions_total.filter(location=location[0], payment_method=p_type[0]).count()}}<br> {{ p_type[1] }} : {{ subscriptions_total.filter(subscription_type=type, location=location[0], payment_method=p_type[0]).count()}}<br>
{% endfor %} {% endfor %}
</td> </td>
{% endfor %} {% endfor %}
<td>{{subscriptions_total.filter(subscription_type=type).count()}}
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>