Changeset 9229 for src/django_gheat/website/static

Timestamp:

Jun 6, 2011, 11:25:40 AM (13 years ago)

Author:

dennisw

Message:

Progress on filters.

File:

• src/django_gheat/website/static/heatmap_extensions_test.js (modified) (4 diffs)

src/django_gheat/website/static/heatmap_extensions_test.js

@@ -18 +18 @@
       if (req.status == 200) {
         if (callback) {
-          if (filter) callback(filter, field, req.responseText);
-          else callback(req.responseText);
+          callback(req.responseText);
         }
       }
@@ -63 +62 @@
   var layername = '<input type="text" id="lname" name="lname" size="10"/> Layername<br />';
   var colour = '<input type="text" id="colour" name="colour" size="10"/> Colour<br />';
-  var user = '<select id="user" style="width:104px" onchange=update_dataset()><option></option></select> User<br />';
-  var dataset = '<select id="dataset" style="width:104px"><option></option></select> Dataset<br />';
-  var node = '<select id="node" style="width:104px"><option></option></select> Node<br />';
+  var user = '<select id="user" style="width:104px" onchange=update_filters(this.id)><option></option></select> User<br />';
+  var dataset = '<select id="dataset" style="width:104px" onchange=update_filters(this.id)><option></option></select> Dataset<br />';
+  var node = '<select id="node" style="width:104px" onchange=update_filters(this.id)><option></option></select> Node<br />';
   var enc = '<select id="enc" style="width:104px"><option></option></select> Encryption<br />';
-  var date = '<select id="date" style="width:104px"><option></option></select> Date<br />';
+  var date = '<select id="date" style="width:104px" onchange=update_filters(this.id)><option></option></select> Date<br />';
 
   // Write form to document
-  document.getElementById('filter_list').innerHTML+=(formstart + user + dataset + node + enc + date + colour + layername + formend);
+  document.getElementById('filter_list').innerHTML+=(formstart + date + user + dataset + node + enc + colour + layername + formend);
   
   // Request JSON with filter values
   var url = "/website/foofilter";
-  var ajax = new AjaxRequest(url, set_user); 
+  var ajax = new AjaxRequest(url, set_filters); 
   ajax.doGet(); 
 }
 
-function set_user(responseText) {
+function set_filters(responseText) {
   json=eval('(' + responseText + ')');
-  var options = '<option value="All">All</option>';
+  var user = '<option value="empty"></option>';
+  var dataset = '<option value="empty"></option>';
+  var date = '<option value="empty"></option>';
   for (var i=0; i<json.length; i++){
-    options += '<option>' + json[i].gebruiker + '</option>';
-  }
-  document.getElementById('user').innerHTML=options;
-
-  update_dataset();
-}
-
-
-function update_dataset(){
-  var options = '';
-  var user_value = $('#user option:selected').text();
-
-  for (var i=0; i<json.length; i++){
+    user += '<option value="user">' + json[i].gebruiker + '</option>';
     for (m in json[i].meetrondje){
-      if (user_value != 'All'){
-        if (json[i].gebruiker == user_value){
-          options += '<option>' + json[i].meetrondje[m].naam + '</option>';
-        }
-        else{
-          continue;
-        }
-      }
-      else{
-        options += '<option>' + json[i].meetrondje[m].naam + '</option>';
-      }
+      dataset += '<option value="dataset">' + json[i].meetrondje[m].naam + '</option>';
+      date += '<option value="date">' + json[i].meetrondje[m].datum + '</option>';
     }
   }
-  document.getElementById('dataset').innerHTML=options;
+  document.getElementById('user').innerHTML=user;
+  document.getElementById('dataset').innerHTML=dataset;
+  document.getElementById('date').innerHTML=date;
 }
 
 
 
-function update_filters(id){
-  var filtervalue = id.options[id.selectedIndex].value;
-  var d = document.getElementById('dataset');
-  var ds = d.options[id.selectedIndex].value;
+
+function update_filters(filter_id){
+  var user_text = $('#user option:selected').text();
+  var user_val = $('#user option:selected').val();
+  var dataset_text = $('#dataset option:selected').text();
+  var user = '<option value="empty"></option>';
+  var dataset = '<option value="empty"></option>';
+
+  if (filter_id=='user'){
+    if (!user_text){
+      for (var i=0; i<json.length; i++){
+        for (m in json[i].meetrondje){
+          dataset += '<option value="dataset">' + json[i].meetrondje[m].naam + '</option>';
+        }
+      }
+    }
+    else{
+      for (var i=0; i<json.length; i++){
+        for (m in json[i].meetrondje){
+          if (json[i].gebruiker == user_text){
+            dataset += '<option value="dataset">' + json[i].meetrondje[m].naam + '</option>';
+          }
+        }
+      }
+    }
+  document.getElementById('dataset').innerHTML=dataset;
+  }
 }
+
+
+
 
 
@@ -131 +139 @@
   var lname = encodeURIComponent(document.getElementById("lname").value);
 
-  if ((user != '') && (user != 'All')){user='&meetrondje__gebruiker__naam='+user;}
-  else {user='';}
+  if (user != ''){user='&meetrondje__gebruiker__naam='+user;}
   if (dataset != ''){dataset='&meetrondje__naam='+dataset;} 
   if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;} 
@@ -159 +166 @@
   map.addLayer(filterlayer);
 }
-
-