From 088994739475ce088a16960734f11edaef47b532 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Tue, 3 Nov 2015 09:52:19 -0800
Subject: [PATCH] Clarifying time filters, small refactor

---
 panoramix/static/panoramix.js             | 56 +++++++++++++----------
 panoramix/static/widgets/viz_wordcloud.js | 10 ++--
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/panoramix/static/panoramix.js b/panoramix/static/panoramix.js
index cadcc31abc..a790d2ff58 100644
--- a/panoramix/static/panoramix.js
+++ b/panoramix/static/panoramix.js
@@ -99,44 +99,52 @@ function initializeDatasourceView() {
   function initSelectionToValue(element, callback) {
     callback({id: element.val(), text: element.val()});
   }
+  function list_data(arr) {
+    var obj = [];
+    for (var i=0; i<arr.length; i++){
+        obj.push({id: arr[i], text: arr[i]});
+    }
+    return obj;
+  }
   $(".select2_free_since").select2({
     createSearchChoice: create_choices,
     initSelection: initSelectionToValue,
     multiple: false,
-    data: [
-      {id: '-1 hour', text: '-1 hour'},
-      {id: '-12 hours', text: '-12 hours'},
-      {id: '-1 day', text: '-1 day'},
-      {id: '-7 days', text: '-7 days'},
-      {id: '-28 days', text: '-28 days'},
-      {id: '-90 days', text: '-90 days'},
-    ]
+    data: list_data([
+        '1 hour ago',
+        '12 hours ago',
+        '1 day ago',
+        '7 days ago',
+        '28 days ago',
+        '90 days ago',
+        '1 year ago'])
   });
   $(".select2_free_until").select2({
     createSearchChoice: create_choices,
     initSelection: initSelectionToValue,
     multiple: false,
-    data: [
-      {id: 'now', text: 'now'},
-      {id: '-1 day', text: '-1 day'},
-      {id: '-7 days', text: '-7 days'},
-      {id: '-28 days', text: '-28 days'},
-      {id: '-90 days', text: '-90 days'},
-    ]
+    data: list_data([
+        'now',
+        '1 day ago',
+        '7 days ago',
+        '28 days ago',
+        '90 days ago',
+        '1 year ago'])
   });
   $(".select2_free_granularity").select2({
     createSearchChoice: create_choices,
     initSelection: initSelectionToValue,
     multiple: false,
-    data: [
-      {id: 'all', text: 'all'},
-      {id: '5 seconds', text: '5 seconds'},
-      {id: '30 seconds', text: '30 seconds'},
-      {id: '1 minute', text: '1 minute'},
-      {id: '5 minutes', text: '5 minutes'},
-      {id: '1 day', text: '1 day'},
-      {id: '7 days', text: '7 days'},
-    ]
+    data: list_data([
+        'all',
+        '5 seconds',
+        '30 seconds',
+        '1 minute',
+        '5 minutes',
+        '1 hour',
+        '6 hour',
+        '1 day',
+        '7 days'])
   });
 }
 
diff --git a/panoramix/static/widgets/viz_wordcloud.js b/panoramix/static/widgets/viz_wordcloud.js
index 3e7c07e81b..afb28a41c9 100644
--- a/panoramix/static/widgets/viz_wordcloud.js
+++ b/panoramix/static/widgets/viz_wordcloud.js
@@ -6,6 +6,11 @@ px.registerWidget('word_cloud', function(data_attribute) {
 
   function refresh() {
     d3.json(json_callback, function(error, json) {
+      if (error != null){
+        var err = '<div class="alert alert-danger">' + error.responseText  + '</div>';
+        token.html(err);
+        return '';
+      }
       var data = json.data;
       var range = [
         json.form_data.size_from,
@@ -24,11 +29,6 @@ px.registerWidget('word_cloud', function(data_attribute) {
       var box = token.node().getBoundingClientRect();
       var size = [box.width, box.height - 25];
 
-      if (error != null){
-        var err = '<div class="alert alert-danger">' + error.responseText  + '</div>';
-        token.html(err);
-        return '';
-      }
       scale = d3.scale.linear()
         .range(range)
         .domain(d3.extent(data, function(d) { return d.size; }));