From fc4e0f40ced154b7242564edc3a48710c8ea80c0 Mon Sep 17 00:00:00 2001
From: Floran Brutel <contact@floran.fr>
Date: Thu, 7 Jan 2016 19:58:50 +0100
Subject: [PATCH] Optimize diskio plugin in the webui

---
 glances/outputs/static/html/plugins/diskio.html       | 10 +++++-----
 .../static/js/services/plugins/glances_diskio.js      | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/glances/outputs/static/html/plugins/diskio.html b/glances/outputs/static/html/plugins/diskio.html
index 4ec298bd..c638eb8a 100644
--- a/glances/outputs/static/html/plugins/diskio.html
+++ b/glances/outputs/static/html/plugins/diskio.html
@@ -6,11 +6,11 @@
     <div class="table-cell" ng-show="show.diskio_iops">IOR/s</div>
     <div class="table-cell" ng-show="show.diskio_iops">IOW/s</div>
 </div>
-<div class="table-row" ng-repeat="disk in statsDiskio.disks | orderBy: 'name'">
+<div class="table-row" ng-repeat="disk in statsDiskio.disks">
     <div class="table-cell text-left">{{disk.name | min_size}}</div>
-    <div class="table-cell" ng-show="!show.diskio_iops">{{disk.bitrate.txps | bytes}}</div>
-    <div class="table-cell" ng-show="!show.diskio_iops">{{disk.bitrate.rxps | bytes}}</div>
+    <div class="table-cell" ng-show="!show.diskio_iops">{{disk.bitrate.txps }}</div>
+    <div class="table-cell" ng-show="!show.diskio_iops">{{disk.bitrate.rxps }}</div>
 
-    <div class="table-cell" ng-show="show.diskio_iops">{{disk.count.txps | bytes}}</div>
-    <div class="table-cell" ng-show="show.diskio_iops">{{disk.count.rxps | bytes}}</div>
+    <div class="table-cell" ng-show="show.diskio_iops">{{disk.count.txps }}</div>
+    <div class="table-cell" ng-show="show.diskio_iops">{{disk.count.rxps }}</div>
 </div>
diff --git a/glances/outputs/static/js/services/plugins/glances_diskio.js b/glances/outputs/static/js/services/plugins/glances_diskio.js
index 85889d40..42306e5a 100644
--- a/glances/outputs/static/js/services/plugins/glances_diskio.js
+++ b/glances/outputs/static/js/services/plugins/glances_diskio.js
@@ -1,9 +1,10 @@
-glancesApp.service('GlancesPluginDiskio', function() {
+glancesApp.service('GlancesPluginDiskio', function($filter) {
     var _pluginName = "diskio";
     this.disks = [];
 
     this.setData = function(data, views) {
         data = data[_pluginName];
+        data = $filter('orderBy')(data,'disk_name');
         this.disks = [];
 
         for (var i = 0; i < data.length; i++) {
@@ -13,12 +14,12 @@ glancesApp.service('GlancesPluginDiskio', function() {
             var diskio = {
                 'name': diskioData['disk_name'],
                 'bitrate': {
-                  'txps': diskioData['read_bytes'] / timeSinceUpdate,
-                  'rxps': diskioData['write_bytes'] / timeSinceUpdate
+                  'txps': $filter('bytes')(diskioData['read_bytes'] / timeSinceUpdate),
+                  'rxps': $filter('bytes')(diskioData['write_bytes'] / timeSinceUpdate)
                 },
                 'count': {
-                  'txps': diskioData['read_count'] / timeSinceUpdate,
-                  'rxps': diskioData['write_count'] / timeSinceUpdate
+                  'txps': $filter('bytes')(diskioData['read_count'] / timeSinceUpdate),
+                  'rxps': $filter('bytes')(diskioData['write_count'] / timeSinceUpdate)
                 }
             };