Changeset 9233 for src/django_gheat/website

Timestamp:

Jun 6, 2011, 8:22:23 PM (13 years ago)

Author:

dennisw

Message:

Undid some stuff again. Filters work again, but no dependant dropdown boxes. This makes it possible to create otherwise impossible filters (e.g. user='John' & dataset='test', while 'test' actually belongs to Jane).

File:

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

src/django_gheat/website/static/heatmap_extensions_test.js

@@ -61 +61 @@
   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=filter_user()></select> User<br />';
-  var dataset = '<select id="dataset" style="width:104px" onchange=filter_node()></select> Dataset<br />';
-  var node = '<select id="node" style="width:104px" onchange=update_filters(this.id)></select> Node<br />';
+  var user = '<select id="user" style="width:104px"></select> User<br />';
+  var dataset = '<select id="dataset" style="width:104px"></select> Dataset<br />';
+  var node = '<select id="node" style="width:104px"></select> Node<br />';
   var enc = '<select id="enc" style="width:104px"></select> Encryption<br />';
-  var date = '<select id="date" style="width:104px" onchange=filter_date()></select> Date<br />';
+  var date = '<select id="date" style="width:104px"></select> Date<br />';
 
   // Write form to document
@@ -79 +79 @@
 function set_filters(responseText) {
   json=eval('(' + responseText + ')');
-  var user = '<option>Select user</option><option>All</option>';
-  var dataset = '<option>Select dataset</option><option>All</option>';
-  var date = '<option>Select date</option><option>All</option>';
-  var node = '<option>Select node</option><option>All</option>';
+  var user = '<option>All</option>';
+  var dataset = '<option>All</option>';
+  var date = '<option>All</option>';
+  var node = '<option>All</option>';
   for (var i=0; i<json.length; i++){
     user += '<option>' + json[i].gebruiker + '</option>';
@@ -104 +104 @@
   var user = $('#user option:selected').text();
   var dataset = $('#dataset option:selected').text();
-  var wlnode = $('#wlnode option:selected').text();
+  var wlnode = $('#node option:selected').text();
   var enc = $('#enc option:selected').text();
   var date = $('#date option:selected').text();
@@ -110 +110 @@
   var lname = encodeURIComponent(document.getElementById("lname").value);
 
-  if ((user != 'Select user') && (user != 'All')){user='&meetrondje__gebruiker__naam='+user;}
+  if (user != 'All'){user='&meetrondje__gebruiker__naam='+user;}
   else{user='';}
-  if ((dataset != 'Select dataset') && (dataset != 'All')){dataset='&meetrondje__naam='+dataset;} 
+  if (dataset != 'All'){dataset='&meetrondje__naam='+dataset;} 
   else{dataset='';}
-  if ((wlnode != 'Select node') && (dataset != 'All')){wlnode='&accespoint__ssid='+wlnode;} 
+  if (wlnode != 'All'){wlnode='&accespoint__ssid='+wlnode;} 
   else{wlnode='';}
   if (enc != ''){enc='&accespoint__encryptie='+enc;} 
-  if ((date != 'Select date') && (date != 'All')){date='&meetrondje__datum='+date;} 
+  if (date != 'All'){date='&meetrondje__datum='+date;} 
   else{date='';}
   if (colour != ''){colour='colour='+colour;}