Changeset 9253 for src/django_gheat/website/static

Timestamp:

Jun 14, 2011, 12:21:51 PM (13 years ago)

Author:

dennisw

Message:

Fixed dateFormat bug with minDate.
Proper filtering on only start_date or end_date.

File:

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

src/django_gheat/website/static/heatmap_extensions.js

@@ -42 +42 @@
     dataset = $('#select_dataset option:selected').text();
     wlnode = $('#select_node option:selected').text();
-//    enc = $('#select_enc option:selected').text();
-//    date = $('#select_date option:selected').text();
     start_date = $('#start_date').val();
     end_date = $('#end_date').val();
@@ -56 +54 @@
     if (dataset != ''){dataset='&meetrondje__naam='+dataset;} 
     if (wlnode != ''){wlnode='&accespoint__ssid='+wlnode;}
-//    if (enc != ''){enc='&accespoint__encryptie='+enc;} 
-//    if (date != ''){date='&meetrondje__datum='+date;} 
     if (start_date && end_date){
       sd_d=start_date.substr(0,2);
@@ -68 +64 @@
 
       start_date='&meetrondje__datum__gte=' + sd_y +'-'+ sd_m +'-'+ sd_d;
+      end_date='&meetrondje__datum__lte=' + ed_y +'-'+ ed_m +'-'+ ed_d;
+    }
+    if (start_date && !end_date){
+      sd_d=start_date.substr(0,2);
+      sd_m=start_date.substr(3,2);
+      sd_y=start_date.substr(6,4);
+      start_date='&meetrondje__datum__gte=' + sd_y +'-'+ sd_m +'-'+ sd_d;
+      end_date='';
+    }
+    if (!start_date && end_date){
+      ed_d=end_date.substr(0,2);
+      ed_m=end_date.substr(3,2);
+      ed_y=end_date.substr(6,4);
+      start_date='';
       end_date='&meetrondje__datum__lte=' + ed_y +'-'+ ed_m +'-'+ ed_d;
     }