Added boot time and up time

web/SystemAO/info/index.html

@@ -85,13 +85,13 @@
         <h3 class="ui header">Operation Time</h3>
         <div class="ui grid">
             <div class="six wide column">
-                Start Up Time:
+                Boot Time:
             </div>
             <div class="ten wide column" id="startup">
                 Loading...
             </div>
             <div class="six wide column">
-                Operation Time :
+                Up Time :
             </div>
             <div class="ten wide column" id="operation">
                 Loading...
@@ -146,7 +146,7 @@
         $.getJSON("../../system/info/getRuntimeInfo", function(data){
             $("#startup").text(ao_module_utils.timeConverter(data.StartupTime));
             $("#operation").text(ao_module_utils.durationConverter(data.ContinuesRuntime));
-            $("#operation").attr("unixsec", data.ContinuesRuntime);
+            $("#operation").attr("startunix", data.StartupTime);
             accumulateOperationTime();
         });
     }
@@ -154,11 +154,10 @@
     function accumulateOperationTime(){
         setTimeout(function(){
             if ($("#operation").length > 0){
-                var unixSec = $("#operation").attr("unixsec");
-                unixSec = parseInt(unixSec);
-                unixSec++;
-                $("#operation").text(ao_module_utils.durationConverter(unixSec));
-                $("#operation").attr("unixsec", unixSec);
+                var startUnix = $("#operation").attr("startunix");
+                startUnix = parseInt(startUnix);
+                var newOprTime = parseInt(Date.now()/1000) - startUnix
+                $("#operation").text(ao_module_utils.durationConverter(newOprTime));
                 accumulateOperationTime();
             }
         }, 1000);

web/script/ao_module.js

@@ -832,15 +832,40 @@ class ao_module_utils{
         seconds -= minutes * 60;
         var seconds = seconds % 60;
 
+        var resultDuration = "";
         if (days > 0){
-            return days + " days " + hours + " hours " + minutes + " minutes " + seconds + " seconds";
-        }else if (hours > 0){
-            return hours + " hours " + minutes + " minutes " + seconds + " seconds";
-        }else if (minutes > 0){
-            return minutes + " minutes " + seconds + " seconds";
-        }else{
-            return seconds + " seconds";
+            resultDuration += days + " Day";
+            if (days > 1){
+                resultDuration+= "s"
+            }
+            resultDuration += " "
+        }
+
+        if (hours > 0){
+            resultDuration += hours + " Hour"
+            if (hours > 1){
+                resultDuration += "s"
+            }
+            resultDuration += " "
+        }
+
+        if (minutes > 0){
+            resultDuration += minutes + " Minute"
+            if (minutes > 1){
+                resultDuration += "s"
+            }
+            resultDuration += " "
+        }
+
+        if (seconds > 0){
+            resultDuration += seconds + " Secound"
+            if (seconds > 1){
+                resultDuration += "s"
+            }
+            resultDuration += " "
         }
+        
+        return resultDuration;
     }
 
     static timeConverter(UNIX_timestamp){