Merge pull request #162 from jeremypoulter/loading_progress

Quick report of the loading progress.
OpenEVSE · Mar 7, 2018 · 68d6a12 · 68d6a12
2 parents fe1ce5c + f34249f
commit 68d6a12
Show file tree

Hide file tree

Showing 9 changed files with 807 additions and 800 deletions.
diff --git a/src/data/home.htm b/src/data/home.htm
diff --git a/src/data/home.js b/src/data/home.js
diff --git a/src/data/lib.js b/src/data/lib.js
diff --git a/src/html/home.htm b/src/html/home.htm
@@ -25,7 +25,7 @@ <h3>WiFi</h3>
     </div>
 
     <div class="container" data-bind="visible: !initialised()">
-      Loading, please wait...
+      Loading, please wait... (<span data-bind="text: itemsLoaded"></span>/<span data-bind="text: itemsTotal"></span>)
     </div>
 
     <div class="container" data-bind="visible: initialised" style="display: none">

diff --git a/src/html/view_models/OpenEvseViewModel.js b/src/html/view_models/OpenEvseViewModel.js
@@ -197,7 +197,8 @@ function OpenEvseViewModel(baseEndpoint, statusViewModel) {
       self.delayTimerStop(stop);
     }); },
   ];
-  var updateCount = -1;
+  self.updateCount = ko.observable(0);
+  self.updateTotal = ko.observable(updateList.length);
 
   self.updateCurrentCapacity = function () {
     return self.openevse.current_capacity_range(function (min, max) {
@@ -388,13 +389,14 @@ function OpenEvseViewModel(baseEndpoint, statusViewModel) {
   };
 
   self.update = function (after = function () { }) {
-    updateCount = 0;
+    self.updateCount(0);
     self.nextUpdate(after);
   };
   self.nextUpdate = function (after) {
-    var updateFn = updateList[updateCount];
+    var updateFn = updateList[self.updateCount()];
     updateFn().always(function () {
-      if(++updateCount < updateList.length) {
+      self.updateCount(self.updateCount() + 1);
+      if(self.updateCount() < updateList.length) {
         self.nextUpdate(after);
       } else {
         self.subscribe();

diff --git a/src/html/view_models/OpenEvseWiFiViewModel.js b/src/html/view_models/OpenEvseWiFiViewModel.js
@@ -17,7 +17,7 @@ function OpenEvseWiFiViewModel(baseHost, basePort, baseProtocol)
     }
     return endpoint;
   });
-  
+
   self.wsEndpoint = ko.pureComputed(function () {
     var endpoint = "ws://" + self.baseHost();
     if("https:" === self.baseProtocol()){
@@ -95,10 +95,17 @@ function OpenEvseWiFiViewModel(baseHost, basePort, baseProtocol)
   // -----------------------------------------------------------------------
   // Initialise the app
   // -----------------------------------------------------------------------
+  self.loadedCount = ko.observable(0);
+  self.itemsLoaded = ko.pureComputed(function () {
+    return self.loadedCount() + self.openevse.updateCount();
+  });
+  self.itemsTotal = ko.observable(2 + self.openevse.updateTotal());
   self.start = function () {
     self.updating(true);
     self.status.update(function () {
+      self.loadedCount(self.loadedCount() + 1);
       self.config.update(function () {
+        self.loadedCount(self.loadedCount() + 1);
         // If we are accessing on a .local domain try and redirect
         if(self.baseHost().endsWith(".local") && "" !== self.status.ipaddress()) {
           if("" === self.config.www_username())

diff --git a/src/web_server.home.htm.h b/src/web_server.home.htm.h
diff --git a/src/web_server.home.js.h b/src/web_server.home.js.h
diff --git a/src/web_server.lib.js.h b/src/web_server.lib.js.h