Merge pull request #292 from ammendonca/HAWKULAR-336

HAWKULAR-336 : Normalize all dates and time to the same format
hawkular · Jul 2, 2015 · 66fc439 · 66fc439
2 parents b387195 + 6b6266e
commit 66fc439
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/ui/console/src/main/scripts/plugins/directives/plugins/alert/html/alert.html b/ui/console/src/main/scripts/plugins/directives/plugins/alert/html/alert.html
@@ -4,15 +4,15 @@
       <i class="fa fa-flag"></i>
     </div>
     <div class="hk-date">
-      {{alert.start | date:'medium' }}
+      {{alert.start | date:'d MMM y HH:mm:ss' }}
     </div>
     <div class="hk-event">
       Server <strong>down</strong> for
       <hk-time-interval hk-time="alert.durationTime"></hk-time-interval>
       (until
-      <span ng-show="alert.isThisYear && alert.isToday">{{alert.end | date:'shortTime' }}).</span>
-      <span ng-show="alert.isThisYear && !alert.isToday">{{alert.end | date:'MMM d, h:mm:ss a' }}).</span>
-      <span ng-show="!alert.isThisYear">{{alert.end | date:'medium' }}).</span>
+      <span ng-show="alert.isThisYear && alert.isToday">{{alert.end | date:'HH:mm' }}).</span>
+      <span ng-show="alert.isThisYear && !alert.isToday">{{alert.end | date:'d MMM HH:mm:ss' }}).</span>
+      <span ng-show="!alert.isThisYear">{{alert.end | date:'d MMM y HH:mm:ss' }}).</span>
     </div>
 
     <div class="alert-resolver">
@@ -33,17 +33,17 @@
       <i class="fa fa-flag"></i>
     </div>
     <div class="hk-date">
-      {{alert.start | date:'medium' }}
+      {{alert.start | date:'d MMM y HH:mm:ss' }}
     </div>
     <div class="hk-event">
       <strong>Response time</strong> was above the threshold ({{alert.threshold | number: 0}} ms) for
 
       <hk-time-interval hk-time="alert.durationTime"></hk-time-interval>
 
       (until
-      <span ng-show="alert.isThisYear && alert.isToday">{{alert.end | date:'shortTime' }}).</span>
-      <span ng-show="alert.isThisYear && !alert.isToday">{{alert.end | date:'MMM d, h:mm:ss a' }}).</span>
-      <span ng-show="!alert.isThisYear">{{alert.end | date:'medium' }}).</span>
+      <span ng-show="alert.isThisYear && alert.isToday">{{alert.end | date:'HH:mm' }}).</span>
+      <span ng-show="alert.isThisYear && !alert.isToday">{{alert.end | date:'d MMM HH:mm:ss' }}).</span>
+      <span ng-show="!alert.isThisYear">{{alert.end | date:'d MMM y HH:mm:ss' }}).</span>
       The average response time was {{alert.avg  | number: 0}} ms.
     </div>
 

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/add-url.html
@@ -38,7 +38,7 @@ <h2 ng-show="vm.resourceList.length > 0" class="text-center hk-fade-in">Current
       </button>
     </div>
     <div class="col-sm-6 text-right">
-      <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.lastUpdateTimestamp | date:'mediumTime'}}</span>
+      <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.lastUpdateTimestamp | date:'HH:mm:ss'}}</span>
     </div>
   </div>
 

diff --git a/...src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-datasources.html b/...src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-datasources.html
@@ -3,7 +3,7 @@
   <div class="hk-resource-container" ng-repeat="ds in vm.resourceList">
 
     <h3 class="pull-left">{{ds.properties.name}}</h3>
-    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
     <div class="panel panel-default hk-summary">
       <div class="row">
         <div class="col-sm-4 hk-summary-item">

diff --git a/...src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-deployments.html b/...src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-deployments.html
@@ -1,7 +1,7 @@
 <section id="hk-deployments" class="hk-tab-content">
 
   <h3 class="pull-left">Deployment Status</h3>
-  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
   <div class="panel panel-default hk-summary">
     <div class="row">
       <div class="col-sm-3 hk-summary-item">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-jms.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-jms.html
@@ -1,7 +1,7 @@
 <section id="hk-jms" class="hk-tab-content">
 
   <h3 class="pull-left">JMS</h3>
-  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
   <div class="panel panel-default hk-summary">
     <div class="row">
       <div class="col-sm-3 hk-summary-item">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-jvm.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-jvm.html
@@ -2,7 +2,7 @@
 
   <h3 class="pull-left">JVM Status</h3>
 
-  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
   <div class="panel panel-default hk-summary">
     <div class="row">
       <div class="col-sm-3 hk-summary-item">

diff --git a/...rc/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-transactions.html b/...rc/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-transactions.html
@@ -1,7 +1,7 @@
 <section id="hk-transactions" class="hk-tab-content">
 
   <h3 class="pull-left">Transactions</h3>
-  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
   <div class="panel panel-default hk-summary">
     <div class="row">
       <div class="col-sm-3 hk-summary-item">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-web.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-details/detail-web.html
@@ -1,7 +1,7 @@
 <section id="hk-web" class="hk-tab-content">
 
   <h3 class="pull-left">Web</h3>
-  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+  <span class="hk-update pull-right" tooltip-trigger tooltip-placement="bottom" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
   <div class="panel panel-default hk-summary">
     <div class="row">
       <div class="col-sm-3 hk-summary-item">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/app-server-list.html
@@ -9,7 +9,7 @@
     <h1 class="text-center">{{userDetails.firstName}}'s application servers</h1>
 
     <h3 class="pull-left">Current Status</h3>
-    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.lastUpdateTimestamp | date:'mediumTime'}}</span>
+    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.lastUpdateTimestamp | date:'HH:mm:ss'}}</span>
 
     <div class="panel panel-default hk-summary">
       <div class="row">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/availability.html
@@ -15,7 +15,7 @@
 
     <!-- Summary -->
     <h3 class="pull-left">Availability Status</h3>
-    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
     <div class="panel panel-default hk-summary">
       <div class="row">
         <div class="col-sm-3 hk-summary-item">

diff --git a/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html b/ui/console/src/main/scripts/plugins/metrics/plugins/metrics/html/response-time.html
@@ -16,7 +16,7 @@
 
     <!-- Summary -->
     <h3 class="pull-left">Response Time Status</h3>
-    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'mediumTime'}}</span>
+    <span class="hk-update pull-right" tooltip-trigger tooltip-placement="top" tooltip="Last update"><i class="fa fa-clock-o"></i>{{vm.endTimeStamp | date:'HH:mm:ss'}}</span>
     <div class="panel panel-default hk-summary">
       <div class="row">
         <div class="col-sm-4 hk-summary-item">