From 010405f58d071ee895f693f88ccdde1e00a32f39 Mon Sep 17 00:00:00 2001
From: olewoy <114822024+olewoy@users.noreply.github.com>
Date: Mon, 15 May 2023 18:03:28 +0200
Subject: [PATCH 1/4] Display number of available reward points on staff page

---
 .../rewards_reward_point_redemption_events.html      | 12 ++++++++----
 evap/rewards/views.py                                | 10 +++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/evap/rewards/templates/rewards_reward_point_redemption_events.html b/evap/rewards/templates/rewards_reward_point_redemption_events.html
index 657d3c5a8f..2b06bd714f 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 }}
-
-    <p>
-        <a href="{% url 'rewards:reward_point_redemption_event_create' %}" class="btn btn-dark btn-sm">{% trans 'Create new event' %}</a>
-    </p>
+    <div class="row mb-2 align-items-center">
+        <div class="col">
+            <a href="{% url 'rewards:reward_point_redemption_event_create' %}" class="btn btn-dark btn-sm">{% trans 'Create new event' %}</a>
+        </div>
+        <div class="col" style="text-align: right">
+            {% trans 'Available reward points' %}: {{total_points_available}}
+        </div>
+    </div>
 
     <div class="card card-outline-primary mb-3">
         {% 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)
 
 

From 555d921dfeffffefa7a484e9e418b6a294d2eb48 Mon Sep 17 00:00:00 2001
From: olewoy <114822024+olewoy@users.noreply.github.com>
Date: Mon, 22 May 2023 17:09:07 +0200
Subject: [PATCH 2/4] Update
 evap/rewards/templates/rewards_reward_point_redemption_events.html

Co-authored-by: Niklas Mohrin <dev@niklasmohrin.de>
---
 .../templates/rewards_reward_point_redemption_events.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/rewards/templates/rewards_reward_point_redemption_events.html b/evap/rewards/templates/rewards_reward_point_redemption_events.html
index 2b06bd714f..caf477e1af 100644
--- a/evap/rewards/templates/rewards_reward_point_redemption_events.html
+++ b/evap/rewards/templates/rewards_reward_point_redemption_events.html
@@ -12,7 +12,7 @@
             <a href="{% url 'rewards:reward_point_redemption_event_create' %}" class="btn btn-dark btn-sm">{% trans 'Create new event' %}</a>
         </div>
         <div class="col" style="text-align: right">
-            {% trans 'Available reward points' %}: {{total_points_available}}
+            {% trans 'Available reward points' %}: {{ total_points_available }}
         </div>
     </div>
 

From b9f7f09266f72a465d0a9c5e3363f3891c8c4343 Mon Sep 17 00:00:00 2001
From: olewoy <114822024+olewoy@users.noreply.github.com>
Date: Mon, 22 May 2023 17:30:03 +0200
Subject: [PATCH 3/4] Update
 evap/rewards/templates/rewards_reward_point_redemption_events.html

Co-authored-by: Niklas Mohrin <dev@niklasmohrin.de>
---
 .../templates/rewards_reward_point_redemption_events.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/rewards/templates/rewards_reward_point_redemption_events.html b/evap/rewards/templates/rewards_reward_point_redemption_events.html
index caf477e1af..2d6bd1452b 100644
--- a/evap/rewards/templates/rewards_reward_point_redemption_events.html
+++ b/evap/rewards/templates/rewards_reward_point_redemption_events.html
@@ -7,7 +7,7 @@
 
 {% block content %}
     {{ block.super }}
-    <div class="row mb-2 align-items-center">
+    <div class="row mb-2">
         <div class="col">
             <a href="{% url 'rewards:reward_point_redemption_event_create' %}" class="btn btn-dark btn-sm">{% trans 'Create new event' %}</a>
         </div>

From 5d1844b59c9abb7649a92a8af1186efef6dff8ae Mon Sep 17 00:00:00 2001
From: olewoy <114822024+olewoy@users.noreply.github.com>
Date: Mon, 22 May 2023 17:30:22 +0200
Subject: [PATCH 4/4] Update
 evap/rewards/templates/rewards_reward_point_redemption_events.html

Co-authored-by: Niklas Mohrin <dev@niklasmohrin.de>
---
 .../templates/rewards_reward_point_redemption_events.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/rewards/templates/rewards_reward_point_redemption_events.html b/evap/rewards/templates/rewards_reward_point_redemption_events.html
index 2d6bd1452b..105637763e 100644
--- a/evap/rewards/templates/rewards_reward_point_redemption_events.html
+++ b/evap/rewards/templates/rewards_reward_point_redemption_events.html
@@ -11,7 +11,7 @@
         <div class="col">
             <a href="{% url 'rewards:reward_point_redemption_event_create' %}" class="btn btn-dark btn-sm">{% trans 'Create new event' %}</a>
         </div>
-        <div class="col" style="text-align: right">
+        <div class="col text-end">
             {% trans 'Available reward points' %}: {{ total_points_available }}
         </div>
     </div>