From 646d5ef89e0993939a794ff0b8385652e3a397bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Hu=CC=88llmandel?= <alx91@me.com>
Date: Sun, 25 Aug 2019 12:01:10 +0200
Subject: [PATCH] Show final scores feature

---
 web/index.html      | 12 ++++++++----
 web/js/main.js      | 24 ++++++++++++++++++++++++
 web/js/websocket.js |  6 ++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/web/index.html b/web/index.html
index 1e4c2df..63ef05b 100644
--- a/web/index.html
+++ b/web/index.html
@@ -40,8 +40,8 @@
 		    	</div>
 				<div id="resultFinal" style="position:absolute; bottom:95px; width:100%; font-size: 1.5em; display: none;">
 					<div style="display: flex;justify-content: center;">
-						<div class="noIntro" style="width:6%; float: left; text-align:center;" id="SumRes_player1"></div>
-						<div class="noIntro" style="width:6%; float: right; text-align:center;" id="SumRes_player2"></div>
+						<div class="noIntro" style="width:6%; float: left; text-align:center;" id="SumRes_player1">10</div>
+						<div class="noIntro" style="width:6%; float: right; text-align:center;" id="SumRes_player2">20</div>
 					</div>
 				</div>
 				<div id="timer" style="position:absolute; top: 50%; left: 50%; width: 400px; margin-left: -200px; margin-top: -143px; text-align: center; padding: 0px 30px 10px 30px; font-size: 200px; display: none;">
@@ -68,6 +68,7 @@
 							<td><b>Schweinchen</b></td>
 							<td><b>Optionen</b></td>
 							<td><b><label for="modeFinal">Finalmodus</b> </label><input id="modeFinal" type="checkbox" style="vertical-align: text-bottom" /> <button style="float:right;" id="finalmodusInfoBtn">Info</button></td>
+							<td><b>Spielende</b></td>
 						</tr>
 						<tr>
 							<!-- <td><img id="toggleSoundImg" style="cursor:pointer;" width="35px;" src="./img/soundOn.png"></td>
@@ -105,10 +106,10 @@
 								</table>
 							</td>
 							<td>
-								<button id="startAnswerDuplicateBtn"><i class="fa fa-play"></i> Antwort doppelt</button><br>
+								<!-- <button id="startAnswerDuplicateBtn"><i class="fa fa-play"></i> Antwort doppelt</button><br>
 								<img width="20px;" src="./img/noSound.png"> 
 								<input id="answerFailVolume" style="width: 50px;" type="range" value="10" name="points" min="0" max="10"> 
-								<img width="20px;" src="./img/soundOn.png">
+								<img width="20px;" src="./img/soundOn.png"> -->
 								<div>
 									<label for="spieler1">Spieler 1:</label> <input class="playerTgl finalElement" disabled="true" checked="true" type="radio" value="1" name="fmod" id="spieler1" style="vertical-align: text-bottom" /> <button id="showTimerBtn" disabled="true" class="finalElement">Timer anzeigen</button><br>
 									<label for="spieler2">Spieler 2:</label> <input class="playerTgl finalElement" disabled="true" type="radio" value="2" name="fmod" id="spieler2" style="vertical-align: text-bottom" /> <button id="startTimerBtn" disabled="true" class="finalElement"><i class="fa fa-play"></i> Timer starten</button><br>
@@ -122,6 +123,9 @@
 									Alternative Antwort:<br> <input class="finalElement" id="alternateAnswer" maxlength="20" disabled="true" type="text" name=""><button class="finalElement" id="alternateAnswerBtn" disabled="true">setzen</button><br><input type="number" class="finalElement" id="altPointsFinal" disabled="true" placeholder="Alt. Punkte" value=""><button class="finalElement" id="alternateAnswerPBtn" disabled="true">setzen</button>
 								</div>
 							</td>
+							<td>
+								<button id="showFinalScores">Show Final Scores</button><br><br>
+							</td>
 						</tr>
 					</table>
 					<table>
diff --git a/web/js/main.js b/web/js/main.js
index d431d57..e991096 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -5,6 +5,9 @@ var answerFail = null;
 var schweinchenVolume = 1;
 var answerFailVolume = 1;
 var schweinchen = null;
+// when the points for a round are assigned, we still want to show the other answers but no points should be calculated by that time
+// reset when changing a question
+var currentRoundPointsResolved = false;
 
 $(document).ready(function() {
 	$( "#fragenListe" ).sortable();
@@ -384,6 +387,7 @@ function changeFrage() {
 	var index = $("#questionsSelect>option:selected").index();
 	wsSend("loadQuestion", index);
 	wsSend("clearAllFailsBtn", "");
+	wsSend("resetPointsResolvedFlag", "false");
 }
 
 function loadQuestionToGui(index) {
@@ -555,6 +559,26 @@ function recalcSum(s) {
     }
 }
 
+// Add the scores from the final rounds to the current scores from previous rounds
+function showFinalScores() {
+	$("#answers").hide();
+	$("#displayQuestions").hide();
+	$("#result").hide();
+	$("#resultFinal").hide();
+	$("#pointsCenter").hide();
+	$(".pointsLeft").show();
+	$(".pointsRight").show();
+
+	const leftFinalScore = parseFloat($("#SumRes_player1").text());
+	const rightFinalScore = parseFloat($("#SumRes_player2").text());
+
+	$(".pointsLeft").text(parseFloat($(".pointsLeft").text()) + leftFinalScore);
+	$(".pointsRight").text(parseFloat($(".pointsRight").text()) + rightFinalScore);
+
+	// show final scores with blinds
+	$(".footer").show("blind", { direction: "left" }, 1500);
+}
+
 function getAnswerString(str) {
 	if (isFinalMode){
 		while(str.length < 24) {
diff --git a/web/js/websocket.js b/web/js/websocket.js
index 4e140a2..f759ba3 100644
--- a/web/js/websocket.js
+++ b/web/js/websocket.js
@@ -53,6 +53,10 @@ $(document).ready(function() {
 		wsSend("clearAllFailsBtn", "");
 	});
 
+	$("#showFinalScores").click(function() {
+		wsSend("showFinalScores", "");
+	});
+
 	$("#toggleSoundImg").click(function() {
 		wsSend("toggleSound", "");
 	});
@@ -129,6 +133,8 @@ var connectWs = function() {
 				$("#toggleSoundImg").attr("src", "./img/soundOn.png");
 				sounds = true;
 			}
+		} else if(key == "showFinalScores") {
+			showFinalScores()
 		} else if(key == "file") {
 			if(value == "fragen.txt") {
 				try {