Merge branch 'feature-WG-92' into development

Web-GDE/index.html

@@ -139,7 +139,11 @@
       noConfig.style.display = "block";
     }
   } else {
-    init();
+    if (performance.navigation.type == 1) {
+      refresh();
+    } else {
+      init();
+    }
   }
 </script>
 <script src="./src/endSession/endSession.js"></script>

Web-GDE/src/endSession/endSession.js

-var submitted = false;
+// var submitted = false;
 const form = document.getElementById("fields");
 const sidebar = document.getElementById("sidebar");
 let closerWindow;
 
-form.addEventListener('submit', (e)=>{
-  submitted = true;
-})
+// form.addEventListener('submit', (e)=>{
+//   submitted = true;
+// })
 
 endButton = document.createElement("button");
 endButton.id = "endBtn";
@@ -46,7 +46,7 @@ endButton.addEventListener("click", function(){
     sessionStorage.clear();
 
   //if form is submitted or fields are blank, delete database
-  if(submitted || checkForm(form)){
+  if(checkForm(form)){
     var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase");
     DBdeleteRequest.addEventListener('blocked', function(e){
       console.log("Database cleared.");

Web-GDE/src/init/init.js

@@ -15,6 +15,22 @@ const init = () => {
   }
 }
 
+const refresh = () => {
+  let started_flag = false;
+
+  displayFields("fields");
+  refreshImage();
+  window.onkeydown = (key) => {
+    if (!started_flag) {     
+      if (searchStringInArray(`${key.key}`, keyArray) == true || key.ctrlKey && key.key) {
+        console.log('Invalid key cannot Start');
+      } else {       
+        started_flag = true;
+        startMetricCapture();
+      }
+    }
+  }
+}
 
 function searchStringInArray(str, strArray) {
   for (var j = 0; j < strArray.length; j++) {