From 1c056717847a458182eedec4eac5bcd70691808e Mon Sep 17 00:00:00 2001 From: klmp200 Date: Fri, 2 Jun 2017 15:30:11 +0200 Subject: [PATCH] Added forgotten column and a link in tools --- core/templates/core/user_tools.jinja | 1 + subscription/templates/subscription/stats.jinja | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 7de1a633..f23cf6dd 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -16,6 +16,7 @@ {% endif %} {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root %}
  • {% trans %}Subscriptions{% endtrans %}
  • +
  • {% trans %}Subscription stats{% endtrans %}
  • {% trans %}New club{% endtrans %}
  • {% endif %} diff --git a/subscription/templates/subscription/stats.jinja b/subscription/templates/subscription/stats.jinja index 77429d92..4888e721 100644 --- a/subscription/templates/subscription/stats.jinja +++ b/subscription/templates/subscription/stats.jinja @@ -20,17 +20,19 @@ {% for location in locations %} {{ location[1] }} {% endfor %} + {% trans %}Total{% endtrans %} {% for type in subscriptions_types %} {{ subscriptions_types[type]['name'] }} {% for location in locations %} - {% trans %}Total{% endtrans %} : {{ subscriptions_total.filter(location=location[0]).count()}}
    + {% trans %}Total{% endtrans %} : {{ subscriptions_total.filter(subscription_type=type, location=location[0]).count()}}
    {% for p_type in payment_types %} - {{ p_type[1] }} : {{ subscriptions_total.filter(location=location[0], payment_method=p_type[0]).count()}}
    + {{ p_type[1] }} : {{ subscriptions_total.filter(subscription_type=type, location=location[0], payment_method=p_type[0]).count()}}
    {% endfor %} {% endfor %} + {{subscriptions_total.filter(subscription_type=type).count()}} {% endfor %}