diff --git a/scoreboard/controllers/score.js b/scoreboard/controllers/score.js index cb9533f..26b52e3 100644 --- a/scoreboard/controllers/score.js +++ b/scoreboard/controllers/score.js @@ -14,7 +14,8 @@ let teamB = { score: 0, isSpielgemeinschaft: 0, }; -let sideswitch = false; +let sideswitch = false; // Attribute to switch sides after halftime +let referenceMirrored = false; // If sitting behind the scoreboard, switch sides for admin board // Function prototypes function setEnabled(status) {}; @@ -22,7 +23,7 @@ function configTeam(team, name, name2, isSpielgemeinschaft) {}; function setScore(team, score) {}; function alterScore(team, dir) {}; function clearScore() {}; -function toggleSideSwitch() {}; +function toggleSideswitch() {}; function getEnabled() {}; function getValues() {}; @@ -91,6 +92,11 @@ function toggleSideswitch() { io.sockets.emit('scoreSideswitch', ''); } +// Mirror team position on admin panel +function toggleReferenceMirrored() { + referenceMirrored = !referenceMirrored; +} + // Return enabled value function getEnabled() { return enabled @@ -112,11 +118,12 @@ function getValues() { teamA: teamA, teamB: teamB, sideswitch: sideswitch, + referenceMirrored: referenceMirrored, print: print(), teams: db.getTeams(), }; } module.exports = { - setEnabled, configTeam, setScore, alterScore, clearScore, toggleSideswitch, getEnabled, getValues + setEnabled, configTeam, setScore, alterScore, clearScore, toggleSideswitch, toggleReferenceMirrored, getEnabled, getValues, } \ No newline at end of file diff --git a/scoreboard/public/javascripts/admin.js b/scoreboard/public/javascripts/admin.js index bfd5164..1036eec 100644 --- a/scoreboard/public/javascripts/admin.js +++ b/scoreboard/public/javascripts/admin.js @@ -20,12 +20,22 @@ socket.on('timerEnded', (message) => { socket.on('score', (message) => { console.log(message); // Log score in client console - document.getElementById("score").innerHTML = message; // Display score in corresponding html Element + scoreGetValues(); + // document.getElementById("score").innerHTML = message; // Display score in corresponding html Element }); // ###################################################################################################################################################### // General functions // ###################################################################################################################################################### + +// Initial update gets called whenever page has been loaded +async function initialUpdate() { + etcGetValues(); // Request new values for etc stuff + timerGetValues(); // Request new values for timer + scoreGetValues(); // Request new values for score + dbGetValues(); // Request new values for db contents +} + // Update DOM timer elements from passed values function updateEtcFrontend(values) { console.log(values); @@ -48,13 +58,22 @@ function updateTimerFrontend(values) { } } +// Build colname to show Teams on Adminpanel based on isSpielgemeinschaft +function buildColFromIsSpielgemeinschaft(team) { + if(team.isSpielgemeinschaft) { + return team.name + "
" + team.name2; + } else { + return team.name + "
 "; + } +} + // Update DOM score elements from passed values function updateScoreFrontend(values) { console.log(values); // Print received data document.getElementById("scoreSwitchEnable").checked = values.enabled; // Set switch status to received score enabled value - document.getElementById("score").innerHTML = values.print; // Set score on admin interface + document.getElementById("scoreSwitchReferenceMirrored").checked = values.referenceMirrored; // Set switch status to received score enabled value - // Input current Team values into form inputs + // Config Teams - Input current teams into text fields document.getElementById("teamAname").value = values.teamA.name; document.getElementById("teamAname2").value = values.teamA.name2; document.getElementById("teamAisSpielgemeinschaft").checked = values.teamA.isSpielgemeinschaft; @@ -62,6 +81,27 @@ function updateScoreFrontend(values) { document.getElementById("teamBname").value = values.teamB.name; document.getElementById("teamBname2").value = values.teamB.name2; document.getElementById("teamBisSpielgemeinschaft").checked = values.teamB.isSpielgemeinschaft; + + // Show current Teams on admin panel + if(!values.referenceMirrored && !values.sideswitch || values.referenceMirrored && values.sideswitch) { // If not mirrored on adminpanel, show like main frontend while considering sideswitch state + document.getElementById("score").innerHTML = values.teamA.score + ':' + values.teamB.score; + document.getElementById("teamAcolName").innerHTML = buildColFromIsSpielgemeinschaft(values.teamA); + document.getElementById("teamBcolName").innerHTML = buildColFromIsSpielgemeinschaft(values.teamB); + document.getElementById("teamAinc").setAttribute("onclick", "scoreAlterScore('teamA', 'inc')"); + document.getElementById("teamAdec").setAttribute("onclick", "scoreAlterScore('teamA', 'dec')"); + document.getElementById("teamBinc").setAttribute("onclick", "scoreAlterScore('teamB', 'inc')"); + document.getElementById("teamBdec").setAttribute("onclick", "scoreAlterScore('teamB', 'dec')"); + + } else if(!values.referenceMirrored && values.sideswitch || values.referenceMirrored && !values.sideswitch) { // Else, swap posistions + document.getElementById("score").innerHTML = values.teamB.score + ':' + values.teamA.score; + document.getElementById("teamAcolName").innerHTML = buildColFromIsSpielgemeinschaft(values.teamB); + document.getElementById("teamBcolName").innerHTML = buildColFromIsSpielgemeinschaft(values.teamA); + document.getElementById("teamAinc").setAttribute("onclick", "scoreAlterScore('teamB', 'inc')"); + document.getElementById("teamAdec").setAttribute("onclick", "scoreAlterScore('teamB', 'dec')"); + document.getElementById("teamBinc").setAttribute("onclick", "scoreAlterScore('teamA', 'inc')"); + document.getElementById("teamBdec").setAttribute("onclick", "scoreAlterScore('teamA', 'dec')"); + } + } // Update DOM for all db contents with the passed values @@ -125,20 +165,13 @@ async function scoreInsertChosenName(field, name) { } } -// Initial update gets called whenever page has been loaded -async function initialUpdate() { - timerGetValues(); // Request new values for timer - scoreGetValues(); // Request new values for score - dbGetValues(); // Request new values for db contents -} - // Request monitor refresh for index frontend async function refreshMonitor() { const response = await fetch("/admin/refreshMonitor"); // Call API Endpoint /admin/timerStart } async function openBrowser() { - const response = await fetch("/admin/openBrowser"); // Call API Endpoint /admin/openBrowser + const response = await fetch("/admin/openBrowser"); // Call API Endpoint /admin/openBrowser } async function killBrowser() { @@ -259,6 +292,13 @@ async function scoreToggleSideswitch() { updateScoreFrontend(data); // Update admin frontend } +// Switch sides to mirror admin panel when sitting behind main monitor +async function scoreToggleReferenceMirrored() { + const response = await fetch("/admin/scoreToggleReferenceMirrored");// Call API Endpoint /admin/scoreSwitch + const data = await response.json(); // Wait for asyncronous transfer to complete + updateScoreFrontend(data); // Update admin frontend +} + // Clear score async function scoreClearScore() { const response = await fetch("/admin/scoreClearScore"); // Call API Endpoint /admin/scoreClearScore diff --git a/scoreboard/routes/admin.js b/scoreboard/routes/admin.js index 9e3c316..52763ce 100644 --- a/scoreboard/routes/admin.js +++ b/scoreboard/routes/admin.js @@ -6,6 +6,7 @@ const timer = require('../controllers/timer'); const score = require('../controllers/score'); const cli = require('../controllers/cli'); const db = require('../controllers/db'); +const etc = require('../controllers/etc'); // ###################################################################################################################################################### // General endpoints @@ -132,6 +133,13 @@ router.get('/scoreToggleSideswitch', function(req, res, next) { res.json(score.getValues()); }); +// Express router endpoint to toggle reference mirrored attribute +router.get('/scoreToggleReferenceMirrored', function(req, res, next) { + score.toggleReferenceMirrored(); + res.status(200); + res.json(score.getValues()); +}); + // Express router endpoint to get important score values router.get('/scoreGetValues', function(req, res, next) { res.json(score.getValues()); // Respond with important values for frontend diff --git a/scoreboard/views/admin.hbs b/scoreboard/views/admin.hbs index d692dce..b14274a 100644 --- a/scoreboard/views/admin.hbs +++ b/scoreboard/views/admin.hbs @@ -10,7 +10,7 @@ -
+
@@ -26,13 +26,13 @@
- - + +
-
+
@@ -47,7 +47,7 @@
-
+
-
+
-

+
+
+
+
+ + +
+
+
+

+
+
+
+
+ + +
+
+
@@ -73,17 +91,13 @@
-
-
- - -
+
+
+
-
- - -
+
+
@@ -299,10 +313,18 @@

Achtung, eine Fehlbedienung kann unerwünschtes Verhalten hervorrufen.

+
+ + +
+
+ + +