From 31fc5ba28672c0ec8249ee3b18e402b41786009e Mon Sep 17 00:00:00 2001
From: Franziska <franziska.schaeffer@gmail.com>
Date: Tue, 30 Mar 2021 00:30:28 +0200
Subject: [PATCH] Bugs gefixt

---
 website/javascript.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/website/javascript.js b/website/javascript.js
index bb13c25..63d2a22 100644
--- a/website/javascript.js
+++ b/website/javascript.js
@@ -5,7 +5,7 @@ let changeIdButton = document.getElementById("d");
 let reloadButton = document.getElementById("e");
 var players = [];
 let Id = Math.floor(Math.random()*10000000000000000).toString(16)
-var ws = new WebSocket("ws:10.9.1.129:8080/" + Id);
+var ws = new WebSocket("ws:10.9.1.129:8080/tickLeistenID" );
 document.getElementById("p4").innerHTML = "" + Id;
 
 
@@ -64,6 +64,8 @@ ws.onmessage = function(evt){
                     players[i].Name = obj.playerName;
                 }
             }
+        PlayerList();
+        CurrentPlayer();
         }
         /*Removes one Player from players. Updates the Playerlist and current Player*/
         if (obj.eventType == "RemovePlayerE") {
@@ -96,7 +98,7 @@ addButton.onclick = function() {
                         else {
                             type = "Tick";
                         }
-                        ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
+                        ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
 }
 
 /*When the Button is clicked, a RemovePlayerR request is send to the server.*/
@@ -114,12 +116,19 @@ deleteButton.onclick = function() {
 changeTickButton.onclick = function() {
                         var UUID = "";
                         var Tick = document.getElementById("C2").value;
+                        var type = "";
                         for (i = 0; i < players.length; i++){
-                            if (players[i].Name == document.getElementById("C1")){
+                            if (players[i].Name == document.getElementById("C1").value){
                                 UUID = players[i].UUID;
+                                if (players[i].tick == "Abwarten" || players[i].tick == "Bereithalten"){
+                                    type = players[i].Tick;
+                                }
+                                else {
+                                    type = "Tick";
+                                }
                             }
                         }
-                        ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : "' + Tick + '"}');
+                        ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');
                      }
 
 /*When the Button is clicked, a new WebSocket connection is opened with the new ID*/