Changeset 9778 for src/django_gheat/wlheatmap

Timestamp:

Dec 14, 2011, 6:51:55 PM (13 years ago)

Author:

rick

Message:

Fix the filter to get rid of duplicates

File:

• src/django_gheat/wlheatmap/filters.py (modified) (3 diffs)

src/django_gheat/wlheatmap/filters.py

@@ -2 +2 @@
 #
 # View serving filter values.
-
 from django.core.management import setup_environ
 from django.http import HttpResponse
@@ -13 +12 @@
   result = []
   meetrondje_list_total = list()
+  all_ssids = set()
   for user in Gebruiker.objects.all().order_by('naam'):
     entry = {'gebruiker' : user.naam}
@@ -33 +33 @@
         }
       )
+
+    # Hack to gather totals, used for the ``all'' filter
+    meetrondje_list_total += meetrondje_list
+    all_ssids |= sum_ssid
+
     meetrondje_list = [{ 'naam' : 'all', 'datum' : 'any', 'nodes' : ['all'] + sorted(sum_ssid) }] + meetrondje_list
-    meetrondje_list_total += meetrondje_list
     entry['meetrondje'] = meetrondje_list
     result.append(entry)
+
+  # Hack the ``all'' user filter in the results
+  meetrondje_list_total = [{'naam' : 'all', 'datum' : 'any', 'nodes' : ['all'] + sorted(all_ssids)}] + sorted(meetrondje_list_total, key=lambda x: x['naam'])
   result = [ {'gebruiker' : 'all', 'meetrondje' : meetrondje_list_total} ] + result