From 012254762f8ef835a7c35d1bcd5023c526db3ca3 Mon Sep 17 00:00:00 2001
From: Istiak Ferdous <hello@istiakferdous.com>
Date: Thu, 5 Aug 2021 17:53:27 +0600
Subject: [PATCH] Color change

---
 .../baseTemplate/custom-js/system-status.js   |  0
 .../templates/baseTemplate/index.html         |  6 +--
 .../baseTemplate/custom-js/system-status.js   | 40 +++++++++++++++----
 3 files changed, 36 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 baseTemplate/static/baseTemplate/custom-js/system-status.js

diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js
old mode 100755
new mode 100644
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index c869268c0..990d7f3ea 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -200,17 +200,17 @@
                 <div ng-controller="loadAvg" id="header-nav-right">
                     <a class="hide-on-phone hdr-btn" style="background-color: unset;width: 33px" href="#"
                        title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                        <span class="badge bg-yellow" id="load1">{$ one $}</span>
+                        <span class="badge bg-red" id="load1">{$ one $}</span>
                     </a>
 
                     <a class="hide-on-phone hdr-btn" style="background-color: unset;width: 33px" href="#"
                        title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                        <span class="badge bg-yellow" id="load2">{$ two $}</span>
+                        <span class="badge bg-red" id="load2">{$ two $}</span>
                     </a>
 
                     <a class="hide-on-phone hdr-btn" style="background-color: unset;width: 33px" href="#"
                        title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                        <span class="badge bg-yellow" id="load3">{$ three $}</span>
+                        <span class="badge bg-red" id="load3">{$ three $}</span>
                     </a>
 
                     <div class="dropdown" id="dashnav-btn">
diff --git a/static/baseTemplate/custom-js/system-status.js b/static/baseTemplate/custom-js/system-status.js
index 00807bd6b..26e282dde 100644
--- a/static/baseTemplate/custom-js/system-status.js
+++ b/static/baseTemplate/custom-js/system-status.js
@@ -365,18 +365,17 @@ app.controller('adminController', function ($scope, $http, $timeout) {
 
 app.controller('loadAvg', function ($scope, $http, $timeout) {
 
-    //getStuff();
+    getLoadAvg();
 
-    function getStuff() {
+    function getLoadAvg() {
 
 
         url = "/base/getLoadAverage";
 
-        $http.get(url).then(ListInitialData, cantLoadInitialData);
+        $http.get(url).then(ListLoadAvgData, cantGetLoadAvgData);
 
 
-        function ListInitialData(response) {
-
+        function ListLoadAvgData(response) {
 
             $scope.one = response.data.one;
             $scope.two = response.data.two;
@@ -384,8 +383,8 @@ app.controller('loadAvg', function ($scope, $http, $timeout) {
 
         }
 
-        function cantLoadInitialData(response) {
-            console.log("not good");
+        function cantGetLoadAvgData(response) {
+            console.log("Can't get load average data");
         }
 
         //$timeout(getStuff, 2000);
@@ -398,6 +397,7 @@ app.controller('loadAvg', function ($scope, $http, $timeout) {
 app.controller('homePageStatus', function ($scope, $http, $timeout) {
 
     getStuff();
+    getLoadAvg();
 
     function getStuff() {
 
@@ -500,6 +500,32 @@ app.controller('homePageStatus', function ($scope, $http, $timeout) {
         $timeout(getStuff, 2000);
 
     }
+
+    function getLoadAvg() {
+
+        url = "/base/getLoadAverage";
+
+        $http.get(url).then(ListLoadAvgData, cantGetLoadAvgData);
+
+
+        function ListLoadAvgData(response) {
+
+            $scope.one = response.data.one;
+            $scope.two = response.data.two;
+            $scope.three = response.data.three;
+
+            document.getElementById("load1").innerHTML = $scope.one;
+            document.getElementById("load2").innerHTML = $scope.two;
+            document.getElementById("load3").innerHTML = $scope.three;
+        }
+
+        function cantGetLoadAvgData(response) {
+            console.log("Can't get load average data");
+        }
+
+        $timeout(getLoadAvg, 2000);
+
+    }
 });
 
 ////////////