From f5a39cd25a5d5be796acd61d0f03766a36738c32 Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Fri, 18 Aug 2017 10:53:18 +0800
Subject: [PATCH 1/2] route mydashboard to metrics

---
 ui/index.html                         |  2 +-
 ui/js/controllers/mydashboard-ctrl.js | 38 +++++++++++++--------------
 ui/js/controllers/sidebar-ctrl.js     |  2 +-
 ui/js/routes.js                       |  6 +++--
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 5dcf58af0..bf623c861 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -80,7 +80,7 @@
                 <!-- <li><a href="#/undercons"><i class="icon-calendar icon-white"></i> Data Profiling</a></li> -->
                 <li ng-class="{active:isActive('/jobs') || isActive('/jobs')}"><a href="#!/jobs"><i class="icon-calendar icon-white"></i> Jobs</a></li>
 
-                <li ng-class="{active:isActive('/mydashboard') || isActive('/subscribemodel')}"><a href="#!/mydashboard"><i class="icon-calendar icon-white"></i> My Dashboard</a></li>
+                <li ng-class="{active:isActive('/mydashboard')}"><a href="#!/mydashboard"><i class="icon-calendar icon-white"></i> My Dashboard</a></li>
             </ul>
 
             <ul class="nav navbar-nav navbar-right">
diff --git a/ui/js/controllers/mydashboard-ctrl.js b/ui/js/controllers/mydashboard-ctrl.js
index 13672bd07..1e18f5bb5 100644
--- a/ui/js/controllers/mydashboard-ctrl.js
+++ b/ui/js/controllers/mydashboard-ctrl.js
@@ -29,22 +29,22 @@ define(['./module'], function(controllers) {
           $scope.$emit('initReq');
 
           var url_dashboard = $config.uri.getmydashboard + $scope.ntAccount;
-          $http.get(url_dashboard).success(function(res) {
-              $scope.dashboard = res;
-              angular.forEach(res, function(sys) {
-                angular.forEach(sys.metrics, function(metric) {
-                  var chartData = metric.details;
-                  chartData.sort(function(a, b){
-                    return a.timestamp - b.timestamp;
-                  });
-
-                });
-              });
-              $scope.originalData = angular.copy(res);
-              $timeout(function() {
-                redraw($scope.dashboard);
-              }, 0);
-          });
+//          $http.get(url_dashboard).success(function(res) {
+//              $scope.dashboard = res;
+//              angular.forEach(res, function(sys) {
+//                angular.forEach(sys.metrics, function(metric) {
+//                  var chartData = metric.details;
+//                  chartData.sort(function(a, b){
+//                    return a.timestamp - b.timestamp;
+//                  });
+//
+//                });
+//              });
+//              $scope.originalData = angular.copy(res);
+//              $timeout(function() {
+//                redraw($scope.dashboard);
+//              }, 0);
+//          });
 
         }
 
@@ -75,9 +75,9 @@ define(['./module'], function(controllers) {
         $scope.showBig = function(t){
           var metricDetailUrl = $config.uri.metricdetail + '/' + t.name;
           // var metricDetailUrl = '/js/mock_data/anom.json';
-          $http.get(metricDetailUrl).success(function (data){
-            $rootScope.showBigChart($barkChart.getOptionBig(data));
-          });
+//          $http.get(metricDetailUrl).success(function (data){
+//            $rootScope.showBigChart($barkChart.getOptionBig(data));
+//          });
 
         }
 
diff --git a/ui/js/controllers/sidebar-ctrl.js b/ui/js/controllers/sidebar-ctrl.js
index d280b913e..07938c452 100644
--- a/ui/js/controllers/sidebar-ctrl.js
+++ b/ui/js/controllers/sidebar-ctrl.js
@@ -144,7 +144,7 @@ define(['./module'], function(controllers) {
             } else {
               $('#rightbar').css('display', 'block');
               resizePieChart();
-              $scope.dataAssetPieChart.resize();
+//              $scope.dataAssetPieChart.resize();
               resizeSideChart();
             }
         });
diff --git a/ui/js/routes.js b/ui/js/routes.js
index eba554471..3a8bc1fb2 100644
--- a/ui/js/routes.js
+++ b/ui/js/routes.js
@@ -112,8 +112,10 @@ define(['./app'], function(app) {
         });
 
         $routeProvider.when('/mydashboard', {
-            templateUrl: '/pages/mydashboard/mydashboard.html',
-            controller: 'MyDashboardCtrl'
+            // templateUrl: '/pages/mydashboard/mydashboard.html',
+            // controller: 'MyDashboardCtrl'
+            templateUrl: '/pages/metrics/dashboard.html',
+            controller: 'MetricsCtrl'
         });
 
         $routeProvider.when('/subscribemodel', {

From 8c5eb015e9d14126892d9a9a1f1f9db8236096c7 Mon Sep 17 00:00:00 2001
From: Yang <xiaoryang@ebay.com>
Date: Fri, 18 Aug 2017 14:35:19 +0800
Subject: [PATCH 2/2] fix issue about value 0 in dashboard

---
 ui/js/controllers/createrule-ac-ctrl.js | 9 +++++----
 ui/js/services/bark-chart.js            | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js
index 7d6617a1e..1ddbcfe36 100644
--- a/ui/js/controllers/createrule-ac-ctrl.js
+++ b/ui/js/controllers/createrule-ac-ctrl.js
@@ -294,11 +294,12 @@ define(['./module'], function(controllers) {
                     $(stepSelection).css({
                         height: window.innerHeight - $(stepSelection).offset().top - $('#footerwrap').outerHeight()
                     });
+                    //to fix this bug later
 //                    $('fieldset').height($(stepSelection).height() - $(stepSelection + '>.stepDesc').height() - $('.btn-container').height() - 80);
-                    document.getElementByTag('fieldset').style.minHeight = $(stepSelection).height() - $(stepSelection + '>.stepDesc').height() - $('.btn-container').height() - 80;
-                    $('.y-scrollable').css({
-                        'max-height': $('fieldset').height()- $('.add-dataset').outerHeight()
-                    });
+//                    document.getElementByTag('fieldset').style.minHeight = $(stepSelection).height() - $(stepSelection + '>.stepDesc').height() - $('.btn-container').height() - 80;
+//                    $('.y-scrollable').css({
+//                        'max-height': $('fieldset').height()- $('.add-dataset').outerHeight()
+//                    });
 
         }
 
diff --git a/ui/js/services/bark-chart.js b/ui/js/services/bark-chart.js
index 186b23a09..1f69029d3 100644
--- a/ui/js/services/bark-chart.js
+++ b/ui/js/services/bark-chart.js
@@ -257,7 +257,10 @@ define(['./module'], function (services) {
     var data = [];
     var chartData = metric.details;
     for(var i = 0; i < chartData.length; i++){
-        data.push([formatTimeStamp(chartData[i]._source.tmst), parseFloat((chartData[i]._source.matched/chartData[i]._source.total*100).toFixed(2))]);
+          if(chartData[i]._source.total!=0)
+            data.push([formatTimeStamp(chartData[i]._source.tmst), parseFloat((chartData[i]._source.matched/chartData[i]._source.total*100).toFixed(2))]);
+          else
+            data.push([formatTimeStamp(chartData[i]._source.tmst), parseFloat((0).toFixed(2))]);
     }
 
     data.sort(function(a, b){