Merge pull request #1288 from hargata/Hargata/realtime.sync

add timer fallback to kiosk if websocket is not enabled.

Author: hargata

Views/Shared/_Layout.cshtml

@@ -16,6 +16,7 @@
     var firstDayOfWeek = (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
     var numberFormat = CultureInfo.CurrentCulture.NumberFormat;
     var userLanguage = userConfig.UserLanguage;
+    var webSocketEnabled = config.GetWebSocketEnabled();
     shortDatePattern = shortDatePattern.ToLower();
     if (!shortDatePattern.Contains("dd"))
     {
@@ -70,6 +71,7 @@
                 currencySymbol: decodeHTMLEntities("@numberFormat.CurrencySymbol"),
                 useThreeDecimals: "@useThreeDecimals" == "True",
                 useMPG: "@useMPG" == "True",
+                webSocketEnabled: "@webSocketEnabled" == "True",
                 firstDayOfWeek: @firstDayOfWeek
             }
         }

wwwroot/js/kiosk.js

@@ -1,4 +1,5 @@
-function focusKioskVehicle(sender) {
+var kioskTimer = undefined; //fallback timer
+function focusKioskVehicle(sender) {
     let vehicleId = $(sender).attr('data-vehicleId');
     showKioskVehicle(vehicleId);
 }
@@ -145,15 +146,30 @@ async function setAccessToken(accessToken) {
             'x-api-key': accessToken
         }
     });
-    await setupEventHubForKiosk(accessToken);
+    if (getGlobalConfig().webSocketEnabled) {
+        await setupEventHubForKiosk(accessToken);
+    }
     console.log("Access Token for Kiosk Mode Configured!");
 }
 function initKiosk() {
     $("body > div").removeClass("container");
     $("body > div").css('height', '100vh');
     retrieveKioskContent();
     acquireKioskWakeLock();
-    setupEventHubForKiosk();
+    if (getGlobalConfig().webSocketEnabled) {
+        setupEventHubForKiosk();
+    } else {
+        setUpKioskTimer();
+    }
+}
+function setUpKioskTimer() {
+    if (kioskTimer != undefined) {
+        clearInterval(kioskTimer);
+        kioskTimer = undefined;
+    }
+    kioskTimer = setInterval(() => {
+        retrieveKioskContent();
+    }, 60000)
 }
 async function setupEventHubForKiosk(accessToken) {
     //initialize signalr
@@ -219,7 +235,7 @@ function retrieveKioskContent() {
                     retrieveKioskContent(); //skip until we hit a page with content.
                 }
             }
-            setTimeout(() => { retrieveKioskContent() }, 60000);
+            setUpKioskTimer();
         });
     }
 }

wwwroot/js/shared.js

@@ -2091,6 +2091,9 @@ function checkQueryParams(elemToAwait, callBack, param) {
 }
 
 async function setupEventHub(groupName, callBack, callBackParam) {
+    if (!getGlobalConfig().webSocketEnabled) {
+        return;
+    }
     //initialize signalr
     let eventHubUrl = '/api/ws';
     await resetEventHub();