From e2c3392ff9e35602a6bca31e171fc9e1e04d8a66 Mon Sep 17 00:00:00 2001
From: jarjar <contact@jarodcajna.fr>
Date: Wed, 31 May 2023 09:07:28 +0000
Subject: [PATCH] Update readBadge JS script

---
 templates/readBadge.html | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/templates/readBadge.html b/templates/readBadge.html
index e92f76d..d204b0d 100644
--- a/templates/readBadge.html
+++ b/templates/readBadge.html
@@ -21,28 +21,25 @@
   </body>
 </html>
 <script>
-var xhr = new XMLHttpRequest();
-xhr.open('GET', '/detectBadge', true);
-xhr.onload = function() {
-    var jsonreponse = JSON.parse(xhr.response);
-    if (jsonreponse.status == "OK") {
+fetch('/detectBadge')
+.then(response => response.json())
+.then(jsonresponse => {
+    if (jsonresponse.status == "OK") {
         document.getElementById("info").textContent = "Tentative de copie du badge ...";
-
-        var xhr2 = new XMLHttpRequest();
-        xhr2.open('GET', '/readBadge', true);
-        xhr2.onload = function() {
-            var jsonreponse = JSON.parse(xhr2.response);
-            if (jsonreponse.status == "OK") {
-                window.location.href = "/wait?raison=Appuyer%20sur%20le%20bouton%20pour%20commencer%20la%20copie%20des%20badges.&redirect=/writeBadge/{{nbBadge}}/" + jsonreponse.UID;
-            } else {
-                window.location.href = "/?error=" + jsonreponse.message;
-            }
-        };
-        xhr2.send(null);
+        return fetch('/readBadge');
     } else {
-        window.location.href = "/?error=" + jsonreponse.message;
+        throw new Error(jsonresponse.message);
     }
-};
-
-xhr.send(null);
+})
+.then(response => response.json())
+.then(jsonresponse => {
+    if (jsonresponse.status == "OK") {
+        window.location.href = `/wait?raison=Appuyer%20sur%20le%20bouton%20pour%20commencer%20la%20copie%20des%20badges.&redirect=/writeBadge/{{nbBadge}}/${jsonresponse.UID}`;
+    } else {
+        throw new Error(jsonresponse.message);
+    }
+})
+.catch(error => {
+    window.location.href = `/?error=${error.message}`;
+});
 </script>