Fix sorting of the process list in the webui

This commit is contained in:
Floran Brutel 2017-05-30 12:35:41 +02:00
parent f2f71ef6eb
commit cadcee2abf
3 changed files with 6 additions and 6 deletions

View File

@ -6,7 +6,7 @@
<div class="table"> <div class="table">
<div class="table-row" ng-repeat="alert in vm.getAlerts()"> <div class="table-row" ng-repeat="alert in vm.getAlerts()">
<div class="table-cell text-left"> <div class="table-cell text-left">
{{alert.begin | date : 'yyyy-MM-dd H:mm:ss'}} ({{ alert.ongoing ? 'ongoing' : alert.duration }}) - <span ng-hide="alert.ongoing">{{alert.level}} on</span> <span class="{{ alert.level | lowercase }}">{{alert.name}}</span>({{alert.max}}) {{alert.begin | date : 'yyyy-MM-dd H:mm:ss'}} ({{ alert.ongoing ? 'ongoing' : alert.duration }}) - <span ng-hide="alert.ongoing">{{alert.level}} on</span> <span class="{{ alert.level | lowercase }}">{{alert.name}}</span> ({{alert.max}})
</div> </div>
</div> </div>
</div> </div>

View File

@ -14,7 +14,7 @@
<div sortable-th sorter="vm.sorter" column="io_write" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOW/s</div> <div sortable-th sorter="vm.sorter" column="io_write" class="table-cell hidden-xs hidden-sm" ng-show="vm.ioReadWritePresent">IOW/s</div>
<div sortable-th sorter="vm.sorter" column="name" class="table-cell text-left">Command</div> <div sortable-th sorter="vm.sorter" column="name" class="table-cell text-left">Command</div>
</div> </div>
<div class="table-row" ng-repeat="process in vm.processes | orderBy:sorter.column:sorter.isReverseColumn(sorter.column) | limitTo: vm.getLimit()"> <div class="table-row" ng-repeat="process in vm.processes | orderBy:vm.sorter.column:vm.sorter.isReverseColumn(vm.sorter.column) | limitTo: vm.getLimit()">
<div class="table-cell" ng-class="vm.getCpuPercentAlert(process)">{{process.cpu_percent | number:1}}</div> <div class="table-cell" ng-class="vm.getCpuPercentAlert(process)">{{process.cpu_percent | number:1}}</div>
<div class="table-cell" ng-class="vm.getMemoryPercentAlert(process)">{{process.memory_percent | number:1}}</div> <div class="table-cell" ng-class="vm.getMemoryPercentAlert(process)">{{process.memory_percent | number:1}}</div>
<div class="table-cell hidden-xs hidden-sm">{{process.memvirt | bytes}}</div> <div class="table-cell hidden-xs hidden-sm">{{process.memvirt | bytes}}</div>

File diff suppressed because one or more lines are too long