From 3e0be11835c12b893a3192c5e0ab5053a73a21f8 Mon Sep 17 00:00:00 2001
From: Franziska <franziska.schaeffer@gmail.com>
Date: Wed, 7 Apr 2021 20:00:13 +0200
Subject: [PATCH] =?UTF-8?q?logs=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/Tickleiste.html |  2 +-
 website/javascript.js   | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/website/Tickleiste.html b/website/Tickleiste.html
index 6dc1814..be179c6 100644
--- a/website/Tickleiste.html
+++ b/website/Tickleiste.html
@@ -13,7 +13,7 @@
                 
                 <img src="tickleiste.png" width= "100%" height= "auto">
                 <form>
-                        <input type="text" pattern="[0-9a-f]" placeholder="TickleistenID" id="D">
+                        <input type="text" pattern="[a-f0-9]" placeholder="TickleistenID" id="D">
                         <input type="button" class="sub" value="Tickleiste ändern" id="tickLeistenId">
                 </form>
                 <form>
diff --git a/website/javascript.js b/website/javascript.js
index 9046ebb..1a2aa81 100644
--- a/website/javascript.js
+++ b/website/javascript.js
@@ -60,13 +60,18 @@ function messageHandling(evt){
         if (obj.eventType == "InitializeTickLeisteE") {
             valid = true;
             players = [];
+            console.log(obj);
             for (i = 0; i<obj.tickLeiste.length;i++){
-                for (j =0;j<obj.tickLeiste[i][1].length;j++ ){
+                for (j =0;j<obj.tickLeiste[i][1].length;j++){
+                    console.log(i);
+                    console.log(j);
                     if (obj.tickLeiste[i][0].tickType == "Tick"){
                         AddPlayer({Tick: obj.tickLeiste[i][0].tickValue, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
+                        console.log({Tick: obj.tickLeiste[i][0].tickValue, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
                     }
                     else {
                         AddPlayer({Tick: obj.tickLeiste[i][0].tickType, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
+                        console.log({Tick: obj.tickLeiste[i][0].tickType, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
                     }
                 }
             }
@@ -112,13 +117,15 @@ addButton.onclick = function() {
                             type = "Abwarten";
                             ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '"}}');
                         }
-                        if (document.getElementById("A2").value == "Bereithalten") {
-                            type = "Bereithalten";
-                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '"}}');
-                        }
                         else {
-                            type = "Tick";
-                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
+                            if (document.getElementById("A2").value == "Bereithalten") {
+                                type = "Bereithalten";
+                                ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '"}}');
+                            }
+                            else {
+                                type = "Tick";
+                                ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
+                            }
                         }
                         
 }