Merge pull request #304 from vrockai/HAWKULAR-433

HAWKULAR-433 Refactored ht-time-interval to support millis
hawkular · Jul 8, 2015 · 4ac8f15 · 4ac8f15
2 parents 15566bf + 042d73e
commit 4ac8f15
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 26 deletions.
diff --git a/console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts b/console/src/main/scripts/plugins/directives/alert/ts/alertDirective.ts
@@ -84,26 +84,59 @@ module Alert {
     }
   }
 
+  export class HkTime {
+
+    public static $inject = [];
+
+    public humanizeTime(timeMillis: number): any {
+      var result: any = {};
+
+      var sec_num: number = Math.floor(timeMillis / 1000);
+      var hours: number   = Math.floor(sec_num / 3600);
+      var minutes: number = Math.floor((sec_num - (hours * 3600)) / 60);
+      var seconds: number = sec_num - (hours * 3600) - (minutes * 60);
+
+      if (hours !== 0) {
+        result.hours = hours;
+      }
+      if (minutes !== 0) {
+        result.minutes = minutes;
+      }
+      if (seconds !== 0) {
+        result.seconds = seconds;
+      }
+
+      return result;
+    }
+  }
+
   export class HkTimeInterval {
 
     public link: (scope: any, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) => void;
     public replace = 'true';
     public scope = {
-      hkTime: '='
+      hkTimeMillis: '=hkTime'
     };
     public templateUrl = 'plugins/directives/alert/html/timeInterval.html';
 
+    constructor(private HkTime) {
+      this.link = (scope: any, element: ng.IAugmentedJQuery, attrs: ng.IAttributes) => {
+        scope.hkTime = HkTime.humanizeTime(scope.hkTimeMillis);
+      };
+    }
+
     public static Factory() {
-      var directive = () => {
-        return new HkTimeInterval();
+      var directive = (HkTime: any) => {
+        return new HkTimeInterval(HkTime);
       };
 
-      directive['$inject'] = [];
+      directive['$inject'] = ['hkTime'];
 
       return directive;
     }
   }
 
+  _module.service('hkTime', Alert.HkTime);
   _module.directive('hkAlertPanelList', Alert.HkAlertPanelList.Factory());
   _module.directive('hkAlertPanel', Alert.HkAlertPanel.Factory());
   _module.directive('hkTimeInterval', Alert.HkTimeInterval.Factory());

diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts b/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts
@@ -274,27 +274,6 @@ module HawkularMetrics {
         headers = getHeaders();
         var momentNow = this.$moment();
 
-        var toTimeObj = (timeMillis: number) => {
-          var result: any = {};
-
-          var sec_num: number = Math.floor(timeMillis / 1000);
-          var hours: number   = Math.floor(sec_num / 3600);
-          var minutes: number = Math.floor((sec_num - (hours * 3600)) / 60);
-          var seconds: number = sec_num - (hours * 3600) - (minutes * 60);
-
-          if (hours !== 0) {
-            result.hours = hours;
-          }
-          if (minutes !== 0) {
-            result.minutes = minutes;
-          }
-          if (seconds !== 0) {
-            result.seconds = seconds;
-          }
-
-          return result;
-        };
-
         for (var i = 0; i < serverAlerts.length; i++) {
           var consoleAlert: any = {};
           var serverAlert = serverAlerts[i];
@@ -335,7 +314,7 @@ module HawkularMetrics {
 
           consoleAlert.avg = sum/count;
 
-          consoleAlert.durationTime = toTimeObj(consoleAlert.end - consoleAlert.start);
+          consoleAlert.durationTime = consoleAlert.end - consoleAlert.start;
 
           alertList.push(consoleAlert);
         }