Index: src/django_gheat/website/static/heatmap_extensions_test.js
===================================================================
--- src/django_gheat/website/static/heatmap_extensions_test.js	(revision 9223)
+++ src/django_gheat/website/static/heatmap_extensions_test.js	(revision 9225)
@@ -1,4 +1,4 @@
 // Base stolen from http://java.sun.com/developer/technicalArticles/J2EE/AJAX/RealtimeValidation/
-var json_dataset;
+var json;
 function AjaxRequest(url, callback, filter, field) {
 
@@ -41,9 +41,9 @@
 
 function setNodeList(responseText) {
-  json=eval('(' + responseText + ')');
-  if (json.length>0){
+  json_nodelist=eval('(' + responseText + ')');
+  if (json_nodelist.length>0){
     list = 'Wireless Leiden nodes on mouseposition:<br /><b>';
-    for (var i=0; i<json.length; i++){
-      list += json[i].fields.ssid + '<br />';
+    for (var i=0; i<json_nodelist.length; i++){
+      list += json_nodelist[i].fields.ssid + '<br />';
     }
     list += '</b>';
@@ -63,5 +63,5 @@
   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 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 />';
@@ -72,57 +72,39 @@
   document.getElementById('filter_list').innerHTML+=(formstart + user + dataset + node + enc + date + colour + layername + formend);
   
-  // Get values for select boxes
-  // filters[] first value is what to get, second value is which field values will be shown in select box
-  get_user();
-  get_dataset();
-}
-
-
-function get_user() {
-  var url = "/website/filter/filter_user";
+  // Request JSON with filter values
+  var url = "/website/foofilter";
   var ajax = new AjaxRequest(url, set_user); 
   ajax.doGet(); 
 }
 
-function get_dataset() {
-  var url = "/website/filter/filter_dataset";
-  var ajax = new AjaxRequest(url, update_dataset); 
-  ajax.doGet(); 
+function set_user(responseText) {
+  json=eval('(' + responseText + ')');
+  var options = '<option value="All">All</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();
 
-function set_user(responseText) {
-  json_user=eval('(' + responseText + ')');
-  var options = '<option value="All">All</option>';
-  for (var i=0; i<json_user.length; i++){
-    options += '<option value="' + json_user[i].pk + '">' + json_user[i].fields.naam + '</option>';
-  }
-  document.getElementById('user').innerHTML=options;
-}
-
-
-function update_dataset(responseText){
-  if (!json_dataset){
-    json_dataset=eval('(' + responseText + ')');
-  }
-  else{
-  }
-  var options = '';
-
-  var e = document.getElementById('user');
-  var user_value = e.options[e.selectedIndex].value;
-
-  for (var i=0; i<json_dataset.length; i++){
-    if (user_value != 'All'){
-      if (json_dataset[i].fields.gebruiker == user_value){
-        options += '<option value="' + json_dataset[i].fields.gebruiker + '">' + json_dataset[i].fields.naam + '</option>';
+  for (var i=0; i<json.length; i++){
+    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{
-        continue;
+        options += '<option>' + json[i].meetrondje[m].naam + '</option>';
       }
-    }
-    else{
-      options += '<option value="' + json_dataset[i].fields.gebruiker + '">' + json_dataset[i].fields.naam + '</option>';
     }
   }
@@ -143,7 +125,7 @@
   var user = $('#user option:selected').text();
   var dataset = $('#dataset option:selected').text();
-  var wlnode = encodeURIComponent(document.getElementById("node").value);
-  var enc = encodeURIComponent(document.getElementById("enc").value);
-  var date = encodeURIComponent(document.getElementById("date").value);
+  var wlnode = $('#wlnode option:selected').text();
+  var enc = $('#enc option:selected').text();
+  var date = $('#date option:selected').text();
   var colour = encodeURIComponent(document.getElementById("colour").value);
   var lname = encodeURIComponent(document.getElementById("lname").value);