nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-09-21 09:37:20 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[Web UI] Fix format of time+ in the process list
This commit is contained in:
Alessio Sergi 2015-05-09 14:20:56 +02:00
commit 3dc71a0606
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glances/outputs/static/css/style.css
View File

@ -49,6 +49,10 @@ body {
font-weight: bold;
color: white;
}
.highlight {
font-weight: bold;
color: magenta;
}
.ok {
color: green;
}

4
glances/outputs/static/html/plugins/processlist.html
View File

@ -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>

8
glances/outputs/static/js/filters.js
View File

@ -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);
}
});

21
glances/outputs/static/js/stats_controller.js
View File

@ -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 = '?';