Changeset 9218

Timestamp:

May 27, 2011, 4:16:09 PM (13 years ago)

Author:

dennisw

Message:

Tried to make the process of getting filters a bit more dynamic. They are more dynamic now, but it's unfinished and not really working yet.

If you want working filters (that is, the working node filter), stay with older Rev.

File:

• src/django_gheat/website/static/heatmap_extensions.js (modified) (6 diffs)

src/django_gheat/website/static/heatmap_extensions.js

@@ -1 +1 @@
 // Base stolen from http://java.sun.com/developer/technicalArticles/J2EE/AJAX/RealtimeValidation/
-function AjaxRequest(url, callback) {
+function AjaxRequest(url, callback, filter) {
 
   var req = init();
@@ -16 +16 @@
     if (req.readyState == 4) {
       if (req.status == 200) {
-        if (callback) callback(req.responseText);
+        if (callback) {
+          if (filter) callback(filter, req.responseText);
+          else callback(req.responseText);
+        }
       }
     }
@@ -26 +29 @@
   }
 }
+
 
 // Uses zoomlevel en mouseposition to call the nodelist.py view. View returns nodes in json format which is read and printed in document element.
@@ -51 +55 @@
 
 
-function filter_node() {
-  var url = "/website/filter/filter_node";
-  var ajax = new AjaxRequest(url, set_filter_node); 
+function get_filters() {
+  var formstart = '<form method="get" action="">';
+  var formend = '<input type="button" value="Add filter" onClick="addFilter()"/></form>';
+
+  document.getElementById('filter_list').innerHTML+=formstart;
+
+  var filters = new Array('user', 'dataset');
+  for (var i=0; i<filters.length; i++) {
+    get_json(filters[i]);
+  }
+
+  // todo: Fix formend, it is called before the 'for' filter is completed, making the form look silly.
+  document.getElementById('filter_list').innerHTML+=formend;
+}
+
+
+function get_json(filter) {
+  var url = "/website/filter/filter_" + filter;
+  var ajax = new AjaxRequest(url, set_filter, filter); 
   ajax.doGet(); 
 }
 
 
-function set_filter_node(responseText) {
+function set_filter(filter, responseText) {
   json=eval('(' + responseText + ')');
-  list = '<form method="get" action=""><select id="wlnode" style="width:104px"><option></option>';
+  var options = '<select id=' + filter + ' style="width:104px"><option></option>';
   for (var i=0; i<json.length; i++){
-    list += '<option>' + json[i].fields.ssid + '</option>';
-  }
-  list += '</select> WLnode<br /><input type="button" value="Add filter" onClick="addFilter()"/></form>';
-  document.getElementById('filter_list').innerHTML=list;
+    options += '<option>' + json[i].fields.naam + '</option>';
+  }
+  options += '</select> ' + filter + '<br />';
+  document.getElementById('filter_list').innerHTML+=options;
 }
 
@@ -71 +91 @@
 function addFilter(){
 
-  var user = '';
+  var user = encodeURIComponent(document.getElementById("user").value);
   var dataset = '';
-  var wlnode = encodeURIComponent(document.getElementById("wlnode").value);
+  var wlnode = '';
   var enc ='';
   var date = '';
@@ -79 +99 @@
   var lname = '';
 
-  if (user != ''){user='&accespoint__id='+user;} 
+  if (user != ''){user='&gebruiker__naam='+user;} 
   if (dataset != ''){dataset='&meetrondje__naam='+dataset;} 
   if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;}