X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=carousel.js;h=3a0905edd75ba5d137dffaa2f8afd125c9c36634;hb=693747756e9731f299c69c7374adc61c0d71450f;hp=b62fc270fb8ffdbbaa8b5bc402cd543b6ac9d8b3;hpb=44bf264bc9045503216832dcc7261f885983df4c;p=ultimatescore
diff --git a/carousel.js b/carousel.js
index b62fc27..3a0905e 100644
--- a/carousel.js
+++ b/carousel.js
@@ -24,10 +24,10 @@ function addth(tr, className, content) {
tr.appendChild(th);
};
-function subrank_partitions(games, parts, start_rank, tiebreakers) {
+function subrank_partitions(games, parts, start_rank, tiebreakers, func) {
let result = [];
for (let i = 0; i < parts.length; ++i) {
- let part = rank(games, parts[i], start_rank, tiebreakers);
+ let part = func(games, parts[i], start_rank, tiebreakers);
for (let j = 0; j < part.length; ++j) {
result.push(part[j]);
}
@@ -152,7 +152,7 @@ function rank(games, teams, start_rank, tiebreakers) {
// Rule #0: Partition the teams by score.
let score_parts = partition(teams, function(a, b) { return b.pts - a.pts });
if (score_parts.length > 1) {
- return subrank_partitions(games, score_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, score_parts, start_rank, tiebreakers, rank);
}
// Rule #1: Head-to-head wins.
@@ -174,7 +174,7 @@ function rank(games, teams, start_rank, tiebreakers) {
});
if (beat_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(beat_parts, 'head-to-head'));
- return subrank_partitions(games, beat_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, beat_parts, start_rank, tiebreakers, rank);
}
// Rule #2: Number of games played (fewer is better).
@@ -183,7 +183,7 @@ function rank(games, teams, start_rank, tiebreakers) {
let nplayed_parts = partition(teams, function(a, b) { return a.nplayed - b.nplayed });
if (nplayed_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(nplayed_parts, 'fewer losses'));
- return subrank_partitions(games, nplayed_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, nplayed_parts, start_rank, tiebreakers, rank);
}
// Rule #3: Head-to-head goal difference (if all have played).
@@ -210,7 +210,7 @@ function rank(games, teams, start_rank, tiebreakers) {
let h2h_gd_parts = partition(teams, function(a, b) { return b.h2h_gd - a.h2h_gd });
if (h2h_gd_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(h2h_gd_parts, 'head-to-head goal difference'));
- return subrank_partitions(games, h2h_gd_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, h2h_gd_parts, start_rank, tiebreakers, rank);
}
}
@@ -253,7 +253,7 @@ function rank(games, teams, start_rank, tiebreakers) {
});
if (gd_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference versus common opponents'));
- return subrank_partitions(games, gd_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, gd_parts, start_rank, tiebreakers, rank);
}
// Rule #5: Head-to-head scored goals (if all have played).
@@ -261,7 +261,7 @@ function rank(games, teams, start_rank, tiebreakers) {
let h2h_goals_parts = partition(teams, function(a, b) { return b.h2h_goals - a.h2h_goals });
if (h2h_goals_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(h2h_goals_parts, 'head-to-head scored goals'));
- return subrank_partitions(games, h2h_goals_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, h2h_goals_parts, start_rank, tiebreakers, rank);
}
}
@@ -293,7 +293,45 @@ function rank(games, teams, start_rank, tiebreakers) {
});
if (goals_parts.length > 1) {
tiebreakers.push(explain_tiebreaker(goals_parts, 'goals scored against common opponents'));
- return subrank_partitions(games, goals_parts, start_rank, tiebreakers);
+ return subrank_partitions(games, goals_parts, start_rank, tiebreakers, rank);
+ }
+
+ // OK, it's a tie. Give them all the same rank.
+ let result = [];
+ for (let i = 0; i < teams.length; ++i) {
+ result.push(teams[i]);
+ result[i].rank = start_rank;
+ }
+ return result;
+};
+
+// Same, but with the simplified rules for ranking thirds. games isn't used and can be empty.
+function rank_thirds(games, teams, start_rank, tiebreakers) {
+ if (teams.length <= 1) {
+ // Only one team, so trivial.
+ teams[0].rank = start_rank;
+ return teams;
+ }
+
+ // Rule #1: Partition the teams by score.
+ let score_parts = partition(teams, function(a, b) { return b.pts - a.pts });
+ if (score_parts.length > 1) {
+ tiebreakers.push(explain_tiebreaker(score_parts, 'most games won'));
+ return subrank_partitions(games, score_parts, start_rank, tiebreakers, rank_thirds);
+ }
+
+ // Rule #2: Goal difference against common opponents.
+ let gd_parts = partition(teams, function(a, b) { return b.gd - a.gd });
+ if (gd_parts.length > 1) {
+ tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference'));
+ return subrank_partitions(games, gd_parts, start_rank, tiebreakers, rank_thirds);
+ }
+
+ // Rule #3: Goals scored.
+ let goal_parts = partition(teams, function(a, b) { return b.goals - a.goals });
+ if (goal_parts.length > 1) {
+ tiebreakers.push(explain_tiebreaker(goal_parts, 'goals scored'));
+ return subrank_partitions(games, goal_parts, start_rank, tiebreakers, rank_thirds);
}
// OK, it's a tie. Give them all the same rank.
@@ -312,7 +350,8 @@ function parse_teams_from_spreadsheet(response) {
"name": response.values[i][0],
"mediumname": response.values[i][1],
"shortname": response.values[i][2],
- "tags": response.values[i][3],
+ //"tags": response.values[i][3],
+ "ngames": 0,
"nplayed": 0,
"gd": 0,
"pts": 0,
@@ -380,6 +419,24 @@ function apply_games_to_teams(games, teams)
}
}
+// So that we can just have one team list, and let membership be defined by games.
+function filter_teams(teams, response)
+{
+ let teams_to_idx = make_teams_to_idx(teams);
+ let games = parse_games_from_spreadsheet(response, 'irrelevant group name', true);
+ for (let i = 0; i < games.length; ++i) {
+ let idx1 = teams_to_idx[games[i].name1];
+ let idx2 = teams_to_idx[games[i].name2];
+ if (idx1 !== undefined) {
+ ++teams[idx1].ngames;
+ }
+ if (idx2 !== undefined) {
+ ++teams[idx2].ngames;
+ }
+ }
+ return teams.filter(function(team) { return team.ngames > 0; });
+}
+
function display_group_parsed(teams, games, group_name)
{
document.getElementById('entire-bug').style.display = 'none';
@@ -391,7 +448,7 @@ function display_group_parsed(teams, games, group_name)
let carousel = document.getElementById('carousel');
clear_carousel(carousel);
- addheading(carousel, 5, "Current standings, Trøndisk 2018
" + group_name);
+ addheading(carousel, 5, "Current standings, " + ultimateconfig['tournament_title'] + "
" + group_name);
let tr = document.createElement("tr");
tr.className = "subfooter";
addth(tr, "rank", "");
@@ -427,7 +484,7 @@ function display_group_parsed(teams, games, group_name)
let footer_tr = document.createElement("tr");
footer_tr.className = "footer";
let td = document.createElement("td");
- td.appendChild(document.createTextNode("www.trondheimfrisbeeklubb.no | #trøndisk"));
+ td.appendChild(document.createTextNode(ultimateconfig['tournament_footer']));
td.setAttribute("colspan", "5");
footer_tr.appendChild(td);
carousel.appendChild(footer_tr);
@@ -541,7 +598,7 @@ function display_stream_schedule_parsed(teams, games, page) {
let carousel = document.getElementById('carousel');
clear_carousel(carousel);
- addheading(carousel, 3, "Stream schedule, Trøndisk 2018
" + covered_days.join('/') + " (all times CET)");
+ addheading(carousel, 3, "Stream schedule, " + ultimateconfig['tournament_title'] + "
" + covered_days.join('/') + " (all times CET)");
let teams_to_idx = make_teams_to_idx(teams);
row_num = 0;
@@ -581,7 +638,7 @@ function get_group(group_name, cb)
req.onload = function(e) {
cb(JSON.parse(req.responseText), group_name);
};
- req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1ygfeR6njBUmLyuLRq7zfYW5slMWBGnj4XxzQQ4WJklU/values/\'' + group_name + '\'!A1:J50?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
+ req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/' + ultimateconfig['score_sheet_id'] + '/values/\'' + group_name + '\'!A1:J50?key=' + ultimateconfig['api_key']);
req.send();
}
@@ -590,9 +647,10 @@ function showgroup(group_name)
get_group(group_name, function(response, group_name) {
let teams = parse_teams_from_spreadsheet(response);
let games = parse_games_from_spreadsheet(response, group_name, false);
+ teams = filter_teams(teams, response);
display_group_parsed(teams, games, group_name);
+ publish_group_rank(response, group_name); // Update the spreadsheet in the background.
});
- publish_group_rank(group_name); // Update the spreadsheet in the background.
}
@@ -612,7 +670,7 @@ function showschedule(page)
{
let teams = [];
let games = [];
- let num_left = 3;
+ let num_left = 5;
let cb = function(response, group_name) {
teams = teams.concat(parse_teams_from_spreadsheet(response));
@@ -624,7 +682,9 @@ function showschedule(page)
get_group('Group A', cb);
get_group('Group B', cb);
+ get_group('Group C', cb);
get_group('Playoffs', cb);
+ get_group('Playoffs 9th-13th', cb);
};
function do_series(series)
@@ -646,7 +706,7 @@ function showcarousel()
let games_per_group = [];
let combined_teams = [];
let combined_games = [];
- let num_left = 3;
+ let num_left = 5;
let cb = function(response, group_name) {
let teams = parse_teams_from_spreadsheet(response);
@@ -661,6 +721,10 @@ function showcarousel()
[ 13000, function() { display_group_parsed(teams_per_group['Group A'], games_per_group['Group A'], 'Group A'); } ],
[ 2000, function() { hidetable(); } ],
[ 13000, function() { display_group_parsed(teams_per_group['Group B'], games_per_group['Group B'], 'Group B'); } ],
+ [ 2000, function() { hidetable(); } ],
+ [ 13000, function() { display_group_parsed(teams_per_group['Group C'], games_per_group['Group C'], 'Group C'); } ],
+ [ 2000, function() { hidetable(); } ],
+ [ 13000, function() { display_group_parsed(teams_per_group['Playoffs 9th-13th'], games_per_group['Playoffs 9th-13th'], 'Playoffs 9thâ13th'); } ],
[ 2000, function() { hidetable(); } ]
];
let num_pages = find_num_pages(combined_games);
@@ -675,6 +739,8 @@ function showcarousel()
get_group('Group A', cb);
get_group('Group B', cb);
+ get_group('Group C', cb);
+ get_group('Playoffs 9th-13th', cb);
get_group('Playoffs', cb);
};
@@ -695,5 +761,32 @@ function hidescorebug()
function showscorebug()
{
document.getElementById('entire-bug').style.display = null;
-};
+}
+
+function showmatch2()
+{
+ let css = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-fill-mode: both;";
+ document.getElementById('scorebug2').style = css;
+ document.getElementById('clockbug2').style = css;
+}
+
+function hidematch2()
+{
+ let css = "-webkit-animation: fade-out 1.0s ease; -webkit-animation-fill-mode: both;";
+ document.getElementById('scorebug2').style = css;
+ document.getElementById('clockbug2').style = css;
+}
+
+function showmatch3()
+{
+ let css = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-fill-mode: both;";
+ document.getElementById('scorebug3').style = css;
+ document.getElementById('clockbug3').style = css;
+}
+function hidematch3()
+{
+ let css = "-webkit-animation: fade-out 1.0s ease; -webkit-animation-fill-mode: both;";
+ document.getElementById('scorebug3').style = css;
+ document.getElementById('clockbug3').style = css;
+}