Merge pull request #109 from rashidkpc/master

Fixes for trend panel
12 years ago · 6555829499
parent 0dd0cfeb2e eb965c4c00
commit 6555829499
3 changed files with 46 additions and 47 deletions
--- a/index.html
+++ b/index.html
@ -20,13 +20,6 @@
    <link rel="stylesheet" href="common/css/elasticjs.css">
    <link rel="stylesheet" href="common/css/timepicker.css">

-  <!-- project dependency libs -->
-  <script src="common/lib/LAB.min.js"></script>
-  <script src="common/lib/underscore.min.js"></script>
-  <script src="common/lib/settings.js"></script>
-  <script src="config.js"></script>
-  <script src="js/app.js"></script>
-
  </head>

  <body ng-controller="DashCtrl" ng-cloak>
@ -49,4 +42,12 @@
      </div>
    </div>
  </body>
+
+  <!-- project dependency libs -->
+  <script src="common/lib/LAB.min.js"></script>
+  <script src="common/lib/underscore.min.js"></script>
+  <script src="common/lib/settings.js"></script>
+  <script src="config.js"></script>
+  <script src="js/app.js"></script>
+
 </html>
--- a/panels/trends/editor.html
+++ b/panels/trends/editor.html
@ -15,7 +15,7 @@
    </div>
    <div class="span3">
       <label class="small">Time Ago</label>
-        <input type="text" class="input-small" ng-model="panel.ago">
+        <input type="text" class="input-small" ng-model="panel.ago" ng-change="set_refresh(true)">
    </div>
    <div class="span2">
      <label class="small">Font Size</label> 
@ -52,10 +52,7 @@
      </form>
    </div>
    <div class="span8">
-      <form class="input-append" style="margin-bottom: 0px">
        <input type="text" style="width:80%" ng-model="q.query" ng-change="set_refresh(true)">
-        <button class="btn" ng-click="get_data()"><i class="icon-search"></i></button>
-      </form>
    </div>
    <div class="span1">
      <i class="icon-remove pointer" ng-click="remove_query(q)"></i>
--- a/panels/trends/module.js
+++ b/panels/trends/module.js
@ -147,7 +147,8 @@ angular.module('kibana.trends', [])
            $scope.hits.new += n;
            $scope.hits.old += o;

-            var percent = Math.round(percentage(hits.old,hits.new)*100)/100
+            var percent = percentage(hits.old,hits.new) == null ? 
+              '?' : Math.round(percentage(hits.old,hits.new)*100)/100
            // Create series
            $scope.data[i] = { 
              label: $scope.panel.query[i].label || "query"+(parseInt(i)+1), 
@ -155,7 +156,7 @@ angular.module('kibana.trends', [])
                new : hits.new,
                old : hits.old
              },
-              percent: _.isNull(percent) ? 0 : percent
+              percent: percent
            };

            i++;
@ -171,7 +172,7 @@ angular.module('kibana.trends', [])
  }

  function percentage(x,y) {
-    return 100*(y-x)/x
+    return x == 0 ? null : 100*(y-x)/x
  }

  $scope.remove_query = function(q) {