From a7b35b386c9c5cc4efb93b42753115905b22bd32 Mon Sep 17 00:00:00 2001
From: Franziska <franziska.schaeffer@gmail.com>
Date: Wed, 7 Apr 2021 18:30:05 +0200
Subject: [PATCH] Id hardcoded

---
 website/javascript.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/website/javascript.js b/website/javascript.js
index 891effc..77e1344 100644
--- a/website/javascript.js
+++ b/website/javascript.js
@@ -6,7 +6,7 @@ let reloadButton = document.getElementById("reload");
 let saveButton = document.getElementById("save");
 let url = "ws://10.9.1.129:8080/";
 var players = [];
-let Id = Math.floor(Math.random()*10000000000000000).toString(16)
+let Id = "Test" //Math.floor(Math.random()*10000000000000000).toString(16)
 var ws = new WebSocket(url + Id);
 document.getElementById("p4").innerHTML = "" + Id;
 
@@ -16,7 +16,7 @@ ws.onmessage = function(evt){
         var msg = evt.data;
         var obj = JSON.parse(msg);
         var valid = false;
-
+        console.log (obj);
         /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/
         if (obj.eventType == "SetPlayerTickE") {
             valid = true;
@@ -57,17 +57,18 @@ ws.onmessage = function(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++ ){
                     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]});
+                        AddPlayer({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(obj);
+            
             PlayerList();
             CurrentPlayer();
 
@@ -107,11 +108,11 @@ addButton.onclick = function() {
                         var type = "";
                         if (document.getElementById("A2").value == "Abwarten") {
                             type = "Abwarten";
-                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
+                            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 + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
+                            ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '"  , "tick" : {"tickType" : "' + type + '"}}');
                         }
                         else {
                             type = "Tick";
@@ -211,6 +212,7 @@ function AddPlayer(player){
                                     }
                                     if (i == 1 && added == false){
                                         players.splice(0,0,player);
+                                        break;
                                     }
                                 }
                             }
@@ -259,7 +261,7 @@ function loadFile(input){
 
 
 
-function initializeJSONFormat(arr) {
+function initializeJSONFormat(arr) { // JSON ändern
                         var tick = -999;
                         var tickleiste = "";
                         var type = "";