Add comment why we logout after pressing "A" key

[coffee/coffee-flask.git] / templates / main.js

diff --git a/templates/main.js b/templates/main.js
index 9add69a76b3bf2afe7de6b845bbcd82f3360d9e5..793c590f9c5e090374543762b75c45173dfe5bd9 100644 (file)
--- a/templates/main.js
+++ b/templates/main.js
@@ -73,7 +73,7 @@ function hiddenUpdateRemote(json, time = new Date()) {
             break;
         case "rfid":
             if (identifier_registration) {
-                ajax("POST", "user/identifier/add", JSON.stringify({ id: msg.uid }), "user");
+                ajax("POST", "user/identifier/add", JSON.stringify({ id: msg.uid }), "content");
 
                 addIdentifier_finish();
             } else {
@@ -85,6 +85,10 @@ function hiddenUpdateRemote(json, time = new Date()) {
                 var flavor = getFlavor(msg.key);
                 if (flavor !== "") {
                     addCoffee(flavor, time);
+                } else if (msg.key == "A") {
+                    // When pressing 'Menu' key, logout to not count
+                    // subsequent keys as coffee orders.
+                    logout();
                 }
             }
             break;
@@ -106,6 +110,10 @@ function loadRemote(string) {
                 replayOfflineQueue();
                 updateUI();
                 clearTimeout(reloadTimer);
+                if (id_user)
+                    logout();
+                else
+                    ajax("GET", "home", "", "content"); // Load home screen on first load or reload
             } else {
                 // Cancel current timer for the case when loadRemote()
                 // was called multiple times (e.g. multiple ajax()
@@ -165,14 +173,14 @@ function ajax(method, route, data, id) {
 
 
 function login(id) {
-    ajax("POST", "login", id, "user");
+    ajax("POST", "login", id, "content");
     id_user = id;
     countingTimeLogout(120);
 }
 
 function logout() {
     sendReset();
-    ajax("GET", "logout", "", "user");
+    ajax("GET", "logout", "", "content");
     id_user = undefined;
     timeToLogout = undefined;
     identifier_registration = false;
@@ -192,7 +200,7 @@ function countingTimeLogout(count_time)
 }
 
 function renameUser() {
-    ajax("GET", "user/rename?name=" +  document.getElementById("username").value, "", "user");
+    ajax("GET", "user/rename?name=" +  document.getElementById("username").value, "", "content");
 }
 
 function getFlavor(letter) {
@@ -211,7 +219,7 @@ function addCoffee(flavor, time = new Date()) {
         flavor: flavor
     });
     if (id_user) {
-        ajax("POST", "coffee/add", data, "user");
+        ajax("POST", "coffee/add", data, "content");
         flavorChosen = flavor;
         id_user = undefined;
         countingTimeLogout(10); //mean 10 seconds
@@ -227,7 +235,7 @@ function addEvent(event_name, action_msg, time = new Date()) {
     });
     if (id_user) {
         eventMsg = "You have " + action_msg + ". Thanks!"
-        ajax("POST", "event", data, "user");
+        ajax("POST", "event", data, "content");
         window.scrollTo(0, 0); // Scroll up
     }
 }
@@ -248,7 +256,7 @@ function addIdentifier_finish() {
 }
 
 function disableIdentifier(id) {
-    ajax("POST", "user/identifier/disable", JSON.stringify({ id: id }), "user");
+    ajax("POST", "user/identifier/disable", JSON.stringify({ id: id }), "content");
 }
 
 function renameIdentifier(i) {
@@ -257,7 +265,7 @@ function renameIdentifier(i) {
         name: document.getElementById("identifier_name_" + i).value
     });
 
-    ajax("POST", "user/identifier/rename", data, "user");
+    ajax("POST", "user/identifier/rename", data, "content");
 }
 
 function sendLog(json) {