diff --git a/evap/rewards/templates/rewards_reward_point_redemption_events.html b/evap/rewards/templates/rewards_reward_point_redemption_events.html index 657d3c5a8f..105637763e 100644 --- a/evap/rewards/templates/rewards_reward_point_redemption_events.html +++ b/evap/rewards/templates/rewards_reward_point_redemption_events.html @@ -7,10 +7,14 @@ {% block content %} {{ block.super }} - -

- {% trans 'Create new event' %} -

+
+
+ {% trans 'Create new event' %} +
+
+ {% trans 'Available reward points' %}: {{ total_points_available }} +
+
{% trans 'Upcoming events' as title %} diff --git a/evap/rewards/views.py b/evap/rewards/views.py index e38875a724..0dc58eee4f 100644 --- a/evap/rewards/views.py +++ b/evap/rewards/views.py @@ -2,6 +2,7 @@ from django.contrib import messages from django.core.exceptions import BadRequest, SuspiciousOperation +from django.db.models import Sum from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect, render from django.utils.translation import get_language @@ -91,7 +92,14 @@ def index(request): def reward_point_redemption_events(request): upcoming_events = RewardPointRedemptionEvent.objects.filter(redeem_end_date__gte=datetime.now()).order_by("date") past_events = RewardPointRedemptionEvent.objects.filter(redeem_end_date__lt=datetime.now()).order_by("-date") - template_data = {"upcoming_events": upcoming_events, "past_events": past_events} + total_points_granted = RewardPointGranting.objects.aggregate(Sum("value"))["value__sum"] or 0 + total_points_redeemed = RewardPointRedemption.objects.aggregate(Sum("value"))["value__sum"] or 0 + total_points_available = total_points_granted - total_points_redeemed + template_data = { + "upcoming_events": upcoming_events, + "past_events": past_events, + "total_points_available": total_points_available, + } return render(request, "rewards_reward_point_redemption_events.html", template_data)