From 1a62327ae1d514cfd3f2c7767617093a415fdd4d Mon Sep 17 00:00:00 2001
From: Panagis Tselentis <p.tselentis@ime.com.gr>
Date: Thu, 1 Mar 2018 10:14:03 +0200
Subject: [PATCH] Fix issue #179

---
 assets/js/app/dashboard/02_dashboard-controller.js |  8 ++++++++
 assets/js/app/dashboard/dashboard.html             | 14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/assets/js/app/dashboard/02_dashboard-controller.js b/assets/js/app/dashboard/02_dashboard-controller.js
index 72781887..5ae34fa0 100644
--- a/assets/js/app/dashboard/02_dashboard-controller.js
+++ b/assets/js/app/dashboard/02_dashboard-controller.js
@@ -33,6 +33,14 @@
               }
           }
 
+          $scope.convert2Unit = function(number) {
+              if(number >= 1000000) {
+                return (number/1000000).toFixed(2) + "M"
+              }else{
+                  return number.toString();
+              }
+          }
+
           $scope.isEnabled = function(name) {
             for(var key in $scope.info.plugins.enabled_in_cluster) {
                 if(name === $scope.info.plugins.enabled_in_cluster[key]) {
diff --git a/assets/js/app/dashboard/dashboard.html b/assets/js/app/dashboard/dashboard.html
index 6e3bb769..932df039 100644
--- a/assets/js/app/dashboard/dashboard.html
+++ b/assets/js/app/dashboard/dashboard.html
@@ -44,34 +44,34 @@
                     <div class="panel-title">
                         <i class="mdi mdi-lan-connect"></i>&nbsp;
                         CONNECTIONS
-                        <span class="pull-right">Total Requests: <strong>{{status.server.total_requests}}</strong></span>
+                        <span class="pull-right">Total Requests: <strong>{{convert2Unit(status.server.total_requests)}}</strong></span>
                     </div>
                 </div>
                 <div class="panel-body">
                     <div class="row text-center">
                         <div class="col-sm-2">
                             <strong>ACTIVE</strong>
-                            <h3>{{status.server.connections_active}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_active)}}</h3>
                         </div>
                         <div class="col-sm-2">
                             <strong>READING</strong>
-                            <h3>{{status.server.connections_reading}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_reading)}}</h3>
                         </div>
                         <div class="col-sm-2">
                             <strong>WRITING</strong>
-                            <h3>{{status.server.connections_writing}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_writing)}}</h3>
                         </div>
                         <div class="col-sm-2">
                             <strong>WAITING</strong>
-                            <h3>{{status.server.connections_waiting}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_waiting)}}</h3>
                         </div>
                         <div class="col-sm-2">
                             <strong>ACCEPTED</strong>
-                            <h3>{{status.server.connections_accepted}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_accepted)}}</h3>
                         </div>
                         <div class="col-sm-2">
                             <strong>HANDLED</strong>
-                            <h3>{{status.server.connections_handled}}</h3>
+                            <h3>{{convert2Unit(status.server.connections_handled)}}</h3>
                         </div>
                     </div>
                 </div>
-- 
GitLab