mirror of https://github.com/dirtbags/moth.git
Changed points restore output to Neale's stupid space delimited format. Added url param 'snapshot' to specify a points snapshot to restore (0-19). Changed points log storage to an array of the 20 most recent points logs.
This commit is contained in:
parent
7aa076d950
commit
973adb359d
2
install
2
install
|
@ -45,7 +45,7 @@ setup() {
|
|||
|
||||
|
||||
echo "Figuring out web user..."
|
||||
for www in www-data http tc _; do
|
||||
for www in www-data http tc _ _www; do
|
||||
id $www && break
|
||||
done
|
||||
if [ $www = _ ]; then
|
||||
|
|
|
@ -1,22 +1,31 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Scoreboard</title>
|
||||
<link rel="stylesheet" href="style.css" type="text/css">
|
||||
<script src="scoreboard.js" async></script>
|
||||
<title>Points History</title>
|
||||
<script>
|
||||
function init() {
|
||||
var pointslog = JSON.parse(localStorage.getItem("points"));
|
||||
for (point in points){
|
||||
console.log(point);
|
||||
|
||||
function getParameterByName(name) {
|
||||
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
|
||||
var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
|
||||
results = regex.exec(location.search);
|
||||
return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
|
||||
}
|
||||
|
||||
var pointsDiv = document.getElementById("pointslog");
|
||||
var pointshistory = JSON.parse(localStorage.getItem("pointshistory"));
|
||||
// get snapshot specified by query param or else most recent snapshot
|
||||
var i = parseInt(getParameterByName("snapshot")) || pointshistory.length-1;
|
||||
var snapshot = pointshistory[i];
|
||||
pointsDiv.innerHTML = snapshot.map(function(entry){
|
||||
return entry.join(" ");
|
||||
}).join("<br>");
|
||||
}
|
||||
|
||||
window.addEventListener("load", init);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Scoreboard</h1>
|
||||
<div id="scoreboard"></div>
|
||||
<div id="pointslog"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -13,9 +13,15 @@ function scoreboard(element, continuous) {
|
|||
function update(state) {
|
||||
var teamnames = state["teams"];
|
||||
var pointslog = state["points"];
|
||||
var pointshistory = JSON.parse(localStorage.getItem("pointshistory")) || [];
|
||||
if (pointshistory.length >= 20){
|
||||
pointshistory.shift();
|
||||
}
|
||||
pointshistory.push(pointslog);
|
||||
localStorage.setItem("pointshistory", JSON.stringify(pointshistory));
|
||||
var highscore = {};
|
||||
var teams = {};
|
||||
|
||||
|
||||
// Dole out points
|
||||
for (var i in pointslog) {
|
||||
var entry = pointslog[i];
|
||||
|
@ -23,18 +29,18 @@ function scoreboard(element, continuous) {
|
|||
var teamhash = entry[1];
|
||||
var category = entry[2];
|
||||
var points = entry[3];
|
||||
|
||||
|
||||
var team = teams[teamhash] || {__hash__: teamhash};
|
||||
|
||||
|
||||
// Add points to team's points for that category
|
||||
team[category] = (team[category] || 0) + points;
|
||||
|
||||
|
||||
// Record highest score in a category
|
||||
highscore[category] = Math.max(highscore[category] || 0, team[category]);
|
||||
|
||||
|
||||
teams[teamhash] = team;
|
||||
}
|
||||
|
||||
|
||||
// Sort by team score
|
||||
function teamScore(t) {
|
||||
var score = 0;
|
||||
|
@ -49,7 +55,7 @@ function scoreboard(element, continuous) {
|
|||
function teamCompare(a, b) {
|
||||
return teamScore(a) - teamScore(b);
|
||||
}
|
||||
|
||||
|
||||
var winners = [];
|
||||
for (var i in teams) {
|
||||
winners.push(teams[i]);
|
||||
|
@ -60,12 +66,12 @@ function scoreboard(element, continuous) {
|
|||
}
|
||||
winners.sort(teamCompare);
|
||||
winners.reverse();
|
||||
|
||||
|
||||
// Clear out the element we're about to populate
|
||||
while (element.lastChild) {
|
||||
element.removeChild(element.lastChild);
|
||||
}
|
||||
|
||||
|
||||
// Populate!
|
||||
var topActualScore = winners[0].__score__;
|
||||
|
||||
|
@ -80,26 +86,26 @@ function scoreboard(element, continuous) {
|
|||
var catTeam = team[category] || 0;
|
||||
var catPct = catTeam / catHigh;
|
||||
var width = maxWidth * catPct;
|
||||
|
||||
|
||||
var bar = document.createElement("span");
|
||||
bar.classList.add("cat" + ncat);
|
||||
bar.style.width = width + "%";
|
||||
bar.textContent = category + ": " + catTeam;
|
||||
bar.title = bar.textContent;
|
||||
|
||||
|
||||
row.appendChild(bar);
|
||||
ncat += 1;
|
||||
}
|
||||
|
||||
|
||||
var te = document.createElement("span");
|
||||
te.classList.add("teamname");
|
||||
te.textContent = teamnames[team.__hash__];
|
||||
row.appendChild(te);
|
||||
|
||||
|
||||
element.appendChild(row);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function once() {
|
||||
loadJSON("points.json", update);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue