Changeset 9577

Timestamp:

Aug 26, 2011, 6:54:01 PM (13 years ago)

Author:

rick

Message:

Allow selecting all entries.

Location:

src/django_gheat/wlheatmap

Files:

• filters.py (modified) (2 diffs)
• static/heatmap_extensions.js (modified) (3 diffs)
• tile.py (modified) (1 diff)

src/django_gheat/wlheatmap/filters.py

@@ -11 +11 @@
   """Example json input for dynamic filter using multiple objects example:
   http://lijst.wirelessleiden.nl/pipermail/techniek/2011-May/005516.html"""
-  result = list()
+  result = []
   for user in Gebruiker.objects.all().order_by('naam'):
     entry = {'gebruiker' : user.naam}
     meetrondje_list = list()
+    meetrondje_list_total = list()
+    sum_ssid = set()
     for mr in MeetRondje.objects.filter(gebruiker=user).order_by('naam'):
       # Get list if accespoints found in the specific 'Meting', and make this is list.
@@ -23 +25 @@
       # The explicit cast to list is required as django lists are special and
       # cannot be handled by simplejson.
+      sum_ssid |= set(wirelessleiden_ssid)
       meetrondje_list.append(
         {
           'naam' : mr.naam,
           'datum' : mr.datum.strftime('%Y-%m-%d'),
-          'nodes' : list(wirelessleiden_ssid)
+          'nodes' : ['all'] + list(wirelessleiden_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)
+  result = [ {'gebruiker' : 'all', 'meetrondje' : meetrondje_list_total} ] + result
 
   # Pretty formatting, makes debugging the json responses more easy

src/django_gheat/wlheatmap/static/heatmap_extensions.js

@@ -197 +197 @@
         userlist.push(json.gebruiker);
         $.each(json.meetrondje, function(m, meetrondje){
-          $("#select_dataset").append($("<option/>").attr({"class":json.gebruiker, "value":meetrondje.naam}).text(meetrondje.naam));
+          $("#select_dataset").append($("<option/>").attr({"class":json.gebruiker, "value": json.gebruiker + "-" + meetrondje.naam}).text(meetrondje.naam));
           $.each(meetrondje.nodes, function(n, nodes){
-            $("#select_node").append($("<option/>").attr({"class":meetrondje.naam, "value":nodes}).text(nodes));
+            $("#select_node").append($("<option/>").attr({"class":json.gebruiker + "-" + meetrondje.naam, "value":nodes}).text(nodes));
             if(jQuery.inArray(nodes, nodelist)<0){
               nodelist.push(nodes);
@@ -218 +218 @@
    * If button is pressed again, layers will be deleted.
    */
+  function update_lname() {
+     $("#lname").val($("#select_user option:selected").text() + " - " + $("#select_dataset option:selected").text() + " - " + $("#select_node option:selected").text());
+  }
+  $("#select_user").change(function(){
+    update_lname();
+  });
+  $("#select_dataset").change(function(){
+    update_lname();
+  });
+  $("#select_node").change(function(){
+    update_lname();
+  });
+
   $('#user_filter').click(function(){
     if(this.text=='(Add all users)'){
@@ -299 +312 @@
     start_date = $('#start_date').val();
     end_date = $('#end_date').val();
-    colour = encodeURIComponent(document.getElementById("colour").value);
-    lname = encodeURIComponent(document.getElementById("lname").value);
+    colour = $("#colour").val();
+    lname = $("#lname").val();
 
     /**

src/django_gheat/wlheatmap/tile.py

@@ -196 +196 @@
   lon_max = 0
 
+  for key in filter.keys():
+    if filter[key] == 'all':
+      del filter[key]
+
   filter.update({
     'latitude__lte' : nw_deg.lat,