From 88a5c12bbc0f92902852ec1b14d23b2b698958bb Mon Sep 17 00:00:00 2001
From: "Adrian A. Baumann" <ade@adebaumann.com>
Date: Tue, 30 Dec 2025 01:10:40 +0100
Subject: [PATCH] Aggregated counts on front page; "Add items" page now saves
 pictures

---
 argocd/deployment.yaml                |  2 +-
 boxes/templates/boxes/add_things.html |  2 +-
 boxes/templates/boxes/index.html      |  7 +++++--
 boxes/templatetags/__init__.py        |  0
 boxes/templatetags/dict_extras.py     |  7 +++++++
 boxes/views.py                        | 10 +++++++++-
 6 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 boxes/templatetags/__init__.py
 create mode 100644 boxes/templatetags/dict_extras.py

diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml
index e67c50d..10308c6 100644
--- a/argocd/deployment.yaml
+++ b/argocd/deployment.yaml
@@ -27,7 +27,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/labhelper:0.036
+          image: git.baumann.gr/adebaumann/labhelper:0.037
           imagePullPolicy: Always
           ports:
             - containerPort: 8000
diff --git a/boxes/templates/boxes/add_things.html b/boxes/templates/boxes/add_things.html
index 93244f5..fa8494b 100644
--- a/boxes/templates/boxes/add_things.html
+++ b/boxes/templates/boxes/add_things.html
@@ -41,7 +41,7 @@
     {% endif %}
     
     {% if formset.total_form_count %}
-    <form method="post" style="overflow-x: auto;">
+    <form method="post" enctype="multipart/form-data" style="overflow-x: auto;">
         {% csrf_token %}
         <table style="width: 100%; border-collapse: collapse; margin-bottom: 20px;">
             <thead>
diff --git a/boxes/templates/boxes/index.html b/boxes/templates/boxes/index.html
index 664a3ce..4f5d1ba 100644
--- a/boxes/templates/boxes/index.html
+++ b/boxes/templates/boxes/index.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load mptt_tags %}
+{% load dict_extras %}
 
 {% block title %}LabHelper - Home{% endblock %}
 
@@ -55,9 +56,11 @@
                 <span class="toggle-handle" style="display: inline-block; width: 24px; color: #ccc;">&nbsp;</span>
                 {% endif %}
                 <a href="{% url 'thing_type_detail' node.pk %}" style="color: #667eea; text-decoration: none; font-size: 16px; font-weight: 500; transition: color 0.2s;">{{ node.name }}</a>
-                {% if node.things.exists %}
-                <span style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 3px 10px; border-radius: 20px; font-size: 12px; font-weight: 600;">{{ node.things.count }}</span>
+                {% with count=type_counts|get_item:node.pk %}
+                {% if count and count > 0 %}
+                <span style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 3px 10px; border-radius: 20px; font-size: 12px; font-weight: 600;">{{ count }}</span>
                 {% endif %}
+                {% endwith %}
             </div>
             {% if children %}
             <ul style="list-style: none; padding-left: 32px;">
diff --git a/boxes/templatetags/__init__.py b/boxes/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/boxes/templatetags/dict_extras.py b/boxes/templatetags/dict_extras.py
new file mode 100644
index 0000000..420e579
--- /dev/null
+++ b/boxes/templatetags/dict_extras.py
@@ -0,0 +1,7 @@
+from django import template
+
+register = template.Library()
+
+@register.filter
+def get_item(dictionary, key):
+    return dictionary.get(key)
\ No newline at end of file
diff --git a/boxes/views.py b/boxes/views.py
index 481fc86..16b0d49 100644
--- a/boxes/views.py
+++ b/boxes/views.py
@@ -11,9 +11,17 @@ def index(request):
     """Home page with boxes and thing types."""
     boxes = Box.objects.select_related('box_type').all().order_by('id')
     thing_types = ThingType.objects.all()
+    
+    type_counts = {}
+    for thing_type in thing_types:
+        descendants = thing_type.get_descendants(include_self=True)
+        count = Thing.objects.filter(thing_type__in=descendants).count()
+        type_counts[thing_type.pk] = count
+    
     return render(request, 'boxes/index.html', {
         'boxes': boxes,
         'thing_types': thing_types,
+        'type_counts': type_counts,
     })
 
 
@@ -90,7 +98,7 @@ def add_things(request, box_id):
     success_message = None
     
     if request.method == 'POST':
-        formset = ThingFormSet(request.POST, queryset=Thing.objects.filter(box=box))
+        formset = ThingFormSet(request.POST, request.FILES, queryset=Thing.objects.filter(box=box))
         
         if formset.is_valid():
             things = formset.save(commit=False)