diff --git a/app_new/equipments/main.py b/app_new/equipments/main.py index 3ce9ccd..5f2b34e 100644 --- a/app_new/equipments/main.py +++ b/app_new/equipments/main.py @@ -78,7 +78,7 @@ def index(): r = z['rooms'].setdefault(room.id, {'name': room.name, 'types': {}}) key = eq.effective_category_id or f'name:{eq.name.lower().split(" #")[0]}' display_name = eq.category.name if eq.category else eq.name.split(' #')[0] - item = r['types'].setdefault(key, {'name': display_name, 'category': eq.category.name if eq.category else '—', 'quantity': 0, 'ids': []}) + item = r['types'].setdefault(key, {'name': display_name, 'category': eq.effective_category.name if eq.effective_category else '—', 'quantity': 0, 'ids': []}) item['quantity'] += eq.quantity or 1 item['ids'].append(eq.id) zone_tree = [{'id': bid, 'name': b['name'], 'zones': [{'id': zid, 'name': z['name'], 'rooms': [{'id': rid, 'name': r['name'], 'types': list(r['types'].values())} for rid, r in z['rooms'].items()]} for zid, z in b['zones'].items()]} for bid, b in grouped.items()] diff --git a/app_new/templates/equipments/index.html b/app_new/templates/equipments/index.html index 301a847..9c2c1f5 100644 --- a/app_new/templates/equipments/index.html +++ b/app_new/templates/equipments/index.html @@ -61,7 +61,7 @@ {% if view == 'zones' %}
Quantités regroupées par zone, salle et type d’équipement.
{% for building in zone_tree %}
{{ building.name }}
-{% for zone in building.zones %}
{{ zone.name }}
{% for room in zone.rooms %}
{{ room.name }}{% for item in room.types %}{% endfor %}
{{ item.name }}{{ item.category }}{{ item.quantity }}
{% endfor %}{% endfor %}
{% else %}
Aucun équipement localisé.
{% endfor %} +{% for zone in building.zones %}
{{ zone.name }} {{ zone.rooms|length }} salle(s){% for room in zone.rooms %}
{{ room.name }} {{ room.types|sum(attribute='quantity') }}{% for item in room.types %}{% endfor %}
{{ item.name }}{{ item.category }}{{ item.quantity }}
{% endfor %}
{% endfor %}{% else %}
Aucun équipement localisé.
{% endfor %} {% else %} {% if parents %}