raphael/Familienduell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implements final mode

Browse Source
This commit is contained in:
Susann Sgorzaly 2017-09-24 16:02:40 +02:00
parent 8066518093
commit 60b91ebdc7
4 changed files with 132 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/duell.html
View File

@ -32,11 +32,15 @@
</div>
<div class="noIntro" id="result" style="position:absolute; bottom:115px; right:38px; font-size: 1.5em;">
<div style="float:left; padding-right: 20px;">SUMME</div>
<div style="float:left; padding-right: 20px;" class="header_summe">SUMME</div>
<div style="float:left; font-size: 0.8em; position: relative; top: 12; left:14px; color: red; cursor:pointer;" class="controller" id="pointsToTheLeft"><i class="fa fa-chevron-left"></i></div>
<div class="noIntro" style="width:50px; float: left; text-align:right;" id="SumRes">0</div>
<div style="float:left; font-size: 0.8em; position: relative; top: 12; color: red; cursor:pointer;" class="controller" id="pointsToTheRight"><i class="fa fa-chevron-right"></i></div>
</div>
<div class="noIntro" id="resultFinal" style="position:absolute; bottom:115px; right:465px; font-size: 1.5em; display: none;">
<div class="noIntro" style="width:50px; float: left; text-align:right;" id="SumRes_player1"></div>
<div class="noIntro" style="width:50px; float: left; text-align:right;" id="SumRes_player2"></div>
</div>
<div class="noIntro footer" id="footer1" style="position:absolute; bottom:50px; width:100%; height:50px; font-size: 2em;">
<div style="position:absolute; left:5px; top: -5px;" class="pointsLeft">0</div>
<div style="position:absolute; right:5px; top: -5px;" class="pointsRight">0</div>
@ -66,7 +70,7 @@
<td><b>Global</b></td>
<td><b>Server</b></td>
<td><b>Intro</b></td>
<td><b>Jeopardy</b></td>
<td><b>Final mode: answer fail</b></td>
<td><b>Schweinchen</b></td>
<td><b>Clear Fails</b></td>
<td><b>Punkte</b></td>
@ -83,8 +87,8 @@
Blackscreen: <input id="blackScreenCheck" checked="checked" type="checkbox">
</td>
<td>
<button id="startJeopardybtn"><i class="fa fa-play"></i> Jeopardy</button><br>
<button id="stopJeopardybtn"><i class="fa fa-stop"></i> Jeopardy</button><br>
<button id="startJeopardybtn"><i class="fa fa-play"></i>Final mode: answer fail</button><br>
<button id="stopJeopardybtn"><i class="fa fa-stop"></i> Final mode: answer fail</button><br>
<img width="20px;" src="./img/noSound.png">
<input id="jeopardyVolume" style="width: 50px;" type="range" value="10" name="points" min="0" max="10">
<img width="20px;" src="./img/soundOn.png">
@ -114,6 +118,14 @@
</tr>
</table>
<br>
<div>
Finalmodus: <input id="modeFinal" type="checkbox">
</div>
<br>
<div>
Finalmodus Spieler 2 spielt: <input id="player2" type="checkbox">
</div>
<br>
<table>
<tr>
<td><b>Fragenliste:</b><br>

121
web/js/main.js
View File

@ -23,6 +23,16 @@ $(document).ready(function() {
wsSend("toggleBlackScreen", "");
});
$("#modeFinal").change(function() {
var status = $('#modeFinal').is(':checked');
wsSend("toggleFinalMode", status);
});
$("#player2").change(function() {
var player = $('#player2').is(':checked');
wsSend("setPlayer2ForFinalMode", player);
});
$("#startJeopardybtn").click(function() {
$("#startJeopardybtn").attr("disabled", "disabled");
wsSend("startJeopardy", "");
@ -130,9 +140,18 @@ $(document).ready(function() {
});
function setFinalMode(status){
isFinalMode = status;
}
function setPlayer2(value){
player2 = value;
}
function setRunde(value){
runde = value;
}
function showQuestionsAsPrint() {
var ges = '<h2 style="margin-left:30px;">Familienduell Fragen</h2><ol>';
for(var i=0;i<fragen.length;i++) {
@ -162,7 +181,7 @@ function setRightPoints(newPoints) {
function startJeopardy() {
if(sounds && (display || serverSound)) {
jeopardy = new Audio('./sounds/jeopardy.mp3');
jeopardy = new Audio('./sounds/failFinal.mp3');
jeopardy.volume = jeopardyVolume;
jeopardy.play();
}
@ -252,20 +271,58 @@ function changeFrage() {
function loadQuestionToGui(index) {
$("#schweinchenImg").hide();
$("#answers").empty();
$("#schweinchen1Img").hide();
$("#schweinchen2Img").hide();
if (!(player2 && display)) {
$("#answers").empty();
}
$('.footer').toggle(!isFinalMode);
$('.xmarker').toggle(!isFinalMode);
$("#ResSum_player1").toggle(isFinalMode);
$("#ResSum_player2").toggle(isFinalMode);
if (!isFinalMode){
$("#resultFinal").hide();
} else {
$("#resultFinal").show();
}
$("#result").toggle(!isFinalMode);
if(index > -1) {
$("#displayQuestions").html(fragen[index]["frage"]);
$("#displayQuestions").html(fragen[index]["frage"]);
if (isFinalMode){
$("#displayQuestions").hide();
} else {
$("#displayQuestions").show();
}
for(var i=0;i<fragen[index]["antworten"].length;i++) {
if(fragen[index]["antworten"][i]["antwort"] != "") {
var oneLine = $('<div style="height:55px">'+
'<div style="width: 52px; float: left;" class="nr">'+(i+1)+'.</div>'+
'<div style="width: 860px; float: left;" class="answer"></div>'+
'<div style="width: 52px; float: left;" class="points"></div>'+
'</div>');
if(display) {
oneLine.find(".answer").text("_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _");
if (!isFinalMode) {
var oneLine = $('<div style="height:55px">' +
'<div style="width: 52px; float: left;" class="nr">' + (i + 1) + '.</div>' +
'<div style="width: 860px; float: left;" class="answer"></div>' +
'<div style="width: 52px; float: left;" class="points"></div>' +
'</div>');
} else {
var oneLine = $('<div style="height:55px">' +
'<div style="width: 430px; float: left;" class="answer"></div>' +
'<div style="width: 52px; float: left;" class="points"></div>' +
'<div style="width: 52px; float: left;" class="points_player2"></div>' +
'<div style="width: 430px; float: left;" class="answer_player2"></div>' +
'</div>');
}
if(display && !player2) {
if (isFinalMode) {
oneLine.find(".answer").text("_ _ _ _ _ _ _ _ _ _");
} else {
oneLine.find(".answer").text("_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _");
}
oneLine.find(".points").text("--");
} else {
if (isFinalMode){
oneLine.find(".points_player2").text("--");
oneLine.find(".answer_player2").text("_ _ _ _ _ _ _ _ _ _");
}
} else if (!display) {
oneLine.find(".answer").html('<span class="markOnHover">'+getAnswerString(fragen[index]["antworten"][i]["antwort"])+'</span>');
oneLine.find(".points").html('<span class="markOnHover">'+fragen[index]["antworten"][i]["anz"]+'</span>');
(function() {
@ -283,13 +340,27 @@ function loadQuestionToGui(index) {
}
}
}
$("#SumRes").text("0");
recalcSum(0);
if (!isFinalMode) {
$("#SumRes").text("0");
}
if (isFinalMode){
if (!player2) {
$('#SumRes_player1').html("0");
$('#SumRes_player2').html("0");
}
}
if (!player2) {
recalcSum(0);
}
}
function setAnswer(index, answer) {
var answer_select = ".answer";
if (player2){
answer_select = '.answer_player2';
}
answer = getAnswerString(answer);
var el = $($("#answers").find(".answer")[index]);
var el = $($("#answers").find(answer_select)[index]);
el.empty();
if(sounds && (display || serverSound)) {
audio = new Audio('./sounds/textRichtig.mp3');
@ -302,7 +373,11 @@ function setAnswer(index, answer) {
}
function setAnz(index, nr) {
var el = $($("#answers").find(".points")[index]);
var points_select = ".points";
if (player2){
points_select = '.points_player2';
}
var el = $($("#answers").find(points_select)[index]);
el.text(nr);
if(sounds && (display || serverSound)) {
audio = new Audio('./sounds/zahlRichtig.mp3');
@ -312,7 +387,15 @@ function setAnz(index, nr) {
}
function recalcSum(s) {
$("#SumRes").text(parseFloat($("#SumRes").text())+parseFloat(s));
var sum_selector = '#SumRes';
if (isFinalMode) {
if (player2) {
sum_selector = '#SumRes_player2';
} else {
sum_selector = '#SumRes_player1';
}
}
$(sum_selector).text(parseFloat($(sum_selector).text())+parseFloat(s));
}
function getAnswerString(str) {
@ -321,7 +404,11 @@ function getAnswerString(str) {
str+="_";
}
anz = str.length;
while(str.length < 40) {
var maxLength = 40;
if (isFinalMode){
maxLength = 20;
}
while(str.length < maxLength) {
str+= " _";
}
return str;

12
web/js/websocket.js
View File

@ -15,6 +15,9 @@ var ws;
var display = true;
var audio = null;
var serverSound = false;
var isFinalMode = false;
var player2 = false;
var runde = 1;
$(document).ready(function() {
$("#displayBtn").click(function() {
@ -161,7 +164,16 @@ var connectWs = function() {
if(display) {
$("#blackScreen").toggle();
}
} else if (key == "toggleFinalMode"){
setFinalMode(value);
}
else if (key == "setPlayer2ForFinalMode"){
setPlayer2(value);
}
else if (key == "setRunde"){
console.log('Set Runde to ' + value);
setRunde(value);
}
}
}

BIN
web/sounds/failfinal.mp3 Executable file
View File

Binary file not shown.