From 4e587026e1a8498e13274d57a0eadd4782edc3df Mon Sep 17 00:00:00 2001
From: Flo Ha <flo.ha@posteo.net>
Date: Sun, 17 Jul 2022 14:55:11 +0200
Subject: [PATCH] handle estimated payments in the finance view and template

---
 gaehsnitz/templates/gaehsnitz/finance.html | 12 +++++++++---
 gaehsnitz/views.py                         |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gaehsnitz/templates/gaehsnitz/finance.html b/gaehsnitz/templates/gaehsnitz/finance.html
index 1d38bcb..28c4e23 100644
--- a/gaehsnitz/templates/gaehsnitz/finance.html
+++ b/gaehsnitz/templates/gaehsnitz/finance.html
@@ -17,8 +17,11 @@
     <h2>aktueller Stand</h2>
 
     <ul>
-        {% for topic, amount in balance_dict.items %}
-            <li>{{ amount }}€ {{ topic }}</li>
+        {% for topic, amounts in balance_dict.items %}
+            <li>
+                {{ amounts.total }}€ {{ topic }}
+                {% if amounts.estimated %}(davon {{ amounts.estimated }}€ geschätzt){% endif %}
+            </li>
         {% endfor %}
     </ul>
     <p><b>Summe: {{ overall_sum }}€</b></p>
@@ -33,7 +36,10 @@
                     <td>{{ payment.date|date:"d.m." }}</td>
                     <td>{{ payment.amount }}€</td>
                     <td>{{ payment.other_party }}</td>
-                    <td>{{ payment.note }}</td>
+                    <td>
+                        {% if payment.is_estimated %}(geschätzt){% endif %}
+                        {{ payment.note }}
+                    </td>
                 </tr>
             {% endfor %}
         </table>
diff --git a/gaehsnitz/views.py b/gaehsnitz/views.py
index e1004c4..2952562 100644
--- a/gaehsnitz/views.py
+++ b/gaehsnitz/views.py
@@ -38,13 +38,15 @@ class FinanceView(GaehsnitzTemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        balance_dict = defaultdict(int)
+        balance_dict = defaultdict(lambda: defaultdict(int))
         detailed_payments = defaultdict(list)
         overall_sum = 0
         for payment in Payment.objects.filter(date__year=timezone.now().year).order_by("topic", "date"):
             topic_name = Payment.Topic(payment.topic).label
             sign = 1 if payment.is_incoming() else -1
-            balance_dict[topic_name] += sign * payment.amount
+            balance_dict[topic_name]["total"] += sign * payment.amount
+            if payment.is_estimated:
+                balance_dict[topic_name]["estimated"] += sign * payment.amount
             overall_sum += sign * payment.amount
             if payment.is_outgoing() and payment.topic != Payment.Topic.bands:
                 detailed_payments[topic_name].append(payment)