Merge pull request #590 from notFloran/web-ui-fix-time+

[Web UI] Fix format of time+ in the process list

4 files changed, 23 insertions, 14 deletions

diff --git a/glances/outputs/static/css/style.css b/glances/outputs/static/css/style.css
index 4bb9e6f8..2947de8c 100644
--- a/glances/outputs/static/css/style.css
+++ b/glances/outputs/static/css/style.css
@@ -49,6 +49,10 @@ body {
     font-weight: bold;
     color: white;
 }
+.highlight {
+    font-weight: bold;
+    color: magenta;
+}
 .ok {
     color: green;
 }
diff --git a/glances/outputs/static/html/plugins/processlist.html b/glances/outputs/static/html/plugins/processlist.html
index 6b1e7bb6..db51faa7 100644
--- a/glances/outputs/static/html/plugins/processlist.html
+++ b/glances/outputs/static/html/plugins/processlist.html
@@ -22,7 +22,9 @@
         <div class="table-cell text-left">{{process.username}}</div>
         <div class="table-cell" ng-class="{nice: isNice(process.nice)}">{{process.nice | exclamation}}</div>
         <div class="table-cell" ng-class="{status: process.status == 'R'}">{{process.status}}</div>
-        <div class="table-cell hidden-xs hidden-sm">{{process.timeformatted}}</div>
+        <div class="table-cell hidden-xs hidden-sm">
+            <span ng-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span>{{ process.timeplus.minutes | leftPad:2:'0' }}:{{ process.timeplus.seconds | leftPad:2:'0' }}<span ng-show="process.timeplus.hours <= 0">.{{ process.timeplus.milliseconds | leftPad:2:'0' }}</span>
+        </div>
         <div class="table-cell hidden-xs hidden-sm">{{process.io_read}}</div>
         <div class="table-cell hidden-xs hidden-sm">{{process.io_write}}</div>
         <div class="table-cell text-left" ng-if="show.short_process_name">{{process.name}}</div>
diff --git a/glances/outputs/static/js/filters.js b/glances/outputs/static/js/filters.js
index 78472a24..cab65529 100644
--- a/glances/outputs/static/js/filters.js
+++ b/glances/outputs/static/js/filters.js
@@ -76,3 +76,11 @@ glancesApp.filter('bits', function($filter) {
       return $filter('bytes')(bits, low_precision) + 'b';
     }
 });
+
+glancesApp.filter('leftPad', function($filter) {
+    return function (value, length, chars) {
+      length = length || 0;
+      chars = chars || ' ';
+      return _.padLeft(value, length, chars);
+    }
+});
diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js
index 1720491a..344dae1e 100644
--- a/glances/outputs/static/js/stats_controller.js
+++ b/glances/outputs/static/js/stats_controller.js
@@ -85,21 +85,16 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q,
                 }
                 return sum;
             }
-            function leftpad(input) {
-                if (input < 10) {
-                    return "0" + input
-                }
-                return input
-            }
             function timedelta(input) {
                 var sum = timemillis(input);
                 var d = new Date(sum);
-                var hour = leftpad(d.getUTCHours()) // TODO : multiple days ( * (d.getDay() * 24)))
-                var minutes = leftpad(d.getUTCMinutes())
-                var seconds = leftpad(d.getUTCSeconds())
-                var milliseconds = parseInt("" + d.getUTCMilliseconds() / 10)
-                var millisecondsStr = leftpad(milliseconds)
-                return hour +":" + minutes + ":" + seconds + "." + millisecondsStr
+
+                return {
+                  hours: d.getUTCHours(), // TODO : multiple days ( * (d.getDay() * 24)))
+                  minutes: d.getUTCMinutes(),
+                  seconds: d.getUTCSeconds(),
+                  milliseconds: parseInt("" + d.getUTCMilliseconds() / 10)
+                };
             };
 
             function durationBetweenTwoDates(startDate, endDate) {
@@ -115,7 +110,7 @@ glancesApp.controller('statsController', function($scope, $http, $interval, $q,
                 var process = response['processlist'][i]
                 process.memvirt = process.memory_info[1]
                 process.memres  = process.memory_info[0]
-                process.timeformatted = timedelta(process.cpu_times)
+                process.timeplus = timedelta(process.cpu_times)
                 process.timemillis = timemillis(process.cpu_times)
 
                 process.io_read = '?';