nummi/category/templates/category/category_plot.html

@@ -58,30 +58,5 @@
                 {% endfor %}
             {% endspaceless %}
         </tbody>
-        {% if categories %}
-            <tfoot>
-                <tr>
-                    <th scope="row" colspan="2" class="l">{% translate "Total" %}</th>
-                    <td class="value">{{ total_m|pmrvalue }}</td>
-                    <td class="bar m">
-                        <div style="width: {% widthratio total_m max -100 %}%"></div>
-                        {% if total < 0 %}
-                            <div class="tot" style="width:{% widthratio total max -100 %}%">
-                                <span>{{ total|pmrvalue }}</span>
-                            </div>
-                        {% endif %}
-                    </td>
-                    <td class="bar p">
-                        <div style="width: {% widthratio total_p max 100 %}%"></div>
-                        {% if total > 0 %}
-                            <div class="tot" style="width:{% widthratio total max 100 %}%">
-                                <span>{{ total|pmrvalue }}</span>
-                            </div>
-                        {% endif %}
-                    </td>
-                    <td class="value">{{ total_p|pmrvalue }}</td>
-                </tr>
-            </tfoot>
-        {% endif %}
     </table>
 </div>

nummi/category/templatetags/category.py

@@ -1,12 +1,11 @@
 from django import template
 from django.db import models
-from django.db.models.functions import Greatest
 
 register = template.Library()
 
 
 @register.inclusion_tag("category/category_plot.html")
-def category_plot(transactions, **kwargs):
+def category_plot(transactions):
     categories = (
         transactions.filter(category__budget=True)
         .values("category", "category__name", "category__icon")
@@ -17,15 +16,12 @@ def category_plot(transactions, **kwargs):
         )
         .order_by("-sum")
     )
-    return (
+    return {
-        kwargs
+        "categories": categories,
-        | {
+        "max": max(
-            "categories": categories,
+            categories.aggregate(
-        }
+                max=models.Max("sum_p", default=0),
-        | categories.aggregate(
+                min=models.Min("sum_m", default=0),
-            max=Greatest(models.Sum("sum_m"), models.Sum("sum_p")),
+            ).values(),
-            total_m=models.Sum("sum_m"),
+        ),
-            total_p=models.Sum("sum_p"),
+    }
-            total=models.Sum("value"),
-        )
-    )

nummi/main/static/main/css/plot.css

@@ -70,7 +70,3 @@ table.full-width col.bar {
     overflow: hidden;
   }
 }
-
-.plot tfoot {
-  background: var(--bg-01);
-}

nummi/transaction/templates/transaction/transaction_archive_month.html

@@ -12,6 +12,6 @@
     {{ block.super }}
     {% if not category %}
         <h3>{% translate "Categories" %}</h3>
-        {% category_plot transactions month=month %}
+        {% category_plot transactions %}
     {% endif %}
 {% endblock %}