Browse Source

HUE-2612 [search] Update daterange picker values on timeline select and zoom out

Enrico Berti 10 years ago
parent
commit
ffa8f9c1ba
1 changed files with 16 additions and 7 deletions
  1. 16 7
      apps/search/src/search/static/search/js/search.ko.js

+ 16 - 7
apps/search/src/search/static/search/js/search.ko.js

@@ -159,7 +159,7 @@ var Query = function (vm, query) {
     _toggleSingleTermFacet(data, false);
   }
   self.removeSingleTermFacet = function(data) {
-  _toggleSingleTermFacet(data, true);
+    _toggleSingleTermFacet(data, true);
   }
 
   self.selectRangeFacet = function (data) {
@@ -593,7 +593,7 @@ var Collection = function (vm, collection) {
         return false;
       }
     });
-    return _facets;	
+    return _facets;
   }
 
   self.template.fields = ko.computed(function () {
@@ -809,8 +809,10 @@ var Collection = function (vm, collection) {
   self.selectTimelineFacet = function (data) {
     var facet = self.getFacetById(data.widget_id);
 
-    facet.properties.start(data.from);
-    facet.properties.end(data.to);
+    facet.properties.start(moment(data.from).utc().format("YYYY-MM-DD[T]HH:mm:ss[Z]"));
+    facet.properties.end(moment(data.to).utc().format("YYYY-MM-DD[T]HH:mm:ss[Z]"));
+    facet.properties.min(moment(data.from).utc().format("YYYY-MM-DD[T]HH:mm:ss[Z]"));
+    facet.properties.max(moment(data.to).utc().format("YYYY-MM-DD[T]HH:mm:ss[Z]"));
 
     vm.query.selectRangeFacet({widget_id: data.widget_id, from: data.from, to: data.to, cat: data.cat, no_refresh: true, force: true});
 
@@ -834,7 +836,7 @@ var Collection = function (vm, collection) {
   }
 
   self.rangeZoomOut = function (facet_json) {
-	var facet_id = ko.mapping.toJS(facet_json).id;
+    var facet_id = ko.mapping.toJS(facet_json).id;
     var facet = self.getFacetById(facet_id);
 
     vm.query.removeFilter(ko.mapping.fromJS({'id': facet_id}));
@@ -844,6 +846,8 @@ var Collection = function (vm, collection) {
     if (facet.properties.initial_start() != null) { // Bar and line charts
       facet.properties.start(facet.properties.initial_start());
       facet.properties.end(facet.properties.initial_end());
+      facet.properties.min(facet.properties.initial_start());
+      facet.properties.max(facet.properties.initial_end());
     }
 
     vm.search();
@@ -1082,6 +1086,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
 
   self.search = function (callback) {
     self.isRetrievingResults(true);
+
     $(".jHueNotify").hide();
     logGA('search');
 
@@ -1118,12 +1123,14 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       self.getFieldAnalysis().update();
     }
 
+
     $.when.apply($, [
       $.post("/search/search", {
         collection: ko.mapping.toJSON(self.collection),
         query: ko.mapping.toJSON(self.query),
         layout: ko.mapping.toJSON(self.columns)
       }, function (data) {
+
         if (typeof callback != undefined && callback != null){
           callback(data);
         }
@@ -1183,18 +1190,20 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
           }
           self.isRetrievingResults(false);
         }
+
+
       })
       ].concat(multiQs)
     )
     .done(function() {
       if (arguments[0] instanceof Array) { // If multi queries
-    	$.each(self.collection.getHistogramFacets(), function(index, histoFacet) {
+        $.each(self.collection.getHistogramFacets(), function(index, histoFacet) {
           var histoFacetId = histoFacet.id();
           var histoFacet = self.getFacetFromQuery(histoFacetId);
           for (var i = 1; i < arguments.length; i++) {
             histoFacet.extraSeries.push(arguments[i][0]['series']);
           }
-    	});
+        });
         self.response.valueHasMutated();
       }
     })