X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=carousel.js;h=25872316449b0c8b7c3bc4347880e1aef04283a7;hb=refs%2Fheads%2Fmaster;hp=0d5ec25783f9a6a392ec8743d448c16f4244192e;hpb=50e3bd357f2480378f0464d6b3191322bf970f57;p=ultimatescore diff --git a/carousel.js b/carousel.js index 0d5ec25..2587231 100644 --- a/carousel.js +++ b/carousel.js @@ -1,32 +1,52 @@ -addheading = function(carousel, colspan, content) +'use strict'; + +function jsonclone(x) +{ + return JSON.parse(JSON.stringify(x)); +} + +// Log with deep clone, so that the browser will show the object at time of log, +// instead of what it looks like at time of view. +function dlog() { - var thead = document.createElement("thead"); - var tr = document.createElement("tr"); - var th = document.createElement("th"); + let args = []; + for (const arg of arguments) { + args.push(jsonclone(arg)); + } + console.log(args); +} + +function addheading(carousel, colspan, content) +{ + let thead = document.createElement("thead"); + let tr = document.createElement("tr"); + let th = document.createElement("th"); th.innerHTML = content; th.setAttribute("colspan", colspan); tr.appendChild(th); thead.appendChild(tr); carousel.appendChild(thead); -}; -addtd = function(tr, className, content) { - var td = document.createElement("td"); +} + +function addtd(tr, className, content) { + let td = document.createElement("td"); td.appendChild(document.createTextNode(content)); td.className = className; tr.appendChild(td); -}; -addth = function(tr, className, content) { - var th = document.createElement("th"); +} + +function addth(tr, className, content) { + let th = document.createElement("th"); th.appendChild(document.createTextNode(content)); th.className = className; tr.appendChild(th); -}; +} -subrank_partitions = function(games, parts, start_rank, tiebreakers) { - var result = []; - for (var i = 0; i < parts.length; ++i) { - var part = rank(games, parts[i], start_rank, tiebreakers); - for (var j = 0; j < part.length; ++j) { +function subrank_partitions(games, parts, start_rank, tiebreakers, func) { + let result = []; + for (let i = 0; i < parts.length; ++i) { + let part = func(games, parts[i], start_rank, tiebreakers); + for (let j = 0; j < part.length; ++j) { result.push(part[j]); } start_rank += part.length; @@ -34,13 +54,13 @@ subrank_partitions = function(games, parts, start_rank, tiebreakers) { return result; }; -partition = function(teams, compare) +function partition(teams, compare) { teams.sort(compare); - var parts = []; - var curr_part = [teams[0]]; - for (var i = 1; i < teams.length; ++i) { + let parts = []; + let curr_part = [teams[0]]; + for (let i = 1; i < teams.length; ++i) { if (compare(teams[i], curr_part[0]) != 0) { parts.push(curr_part); curr_part = []; @@ -53,52 +73,43 @@ partition = function(teams, compare) return parts; }; -explain_tiebreaker = function(parts, rule_name) +function explain_tiebreaker(parts, rule_name) { - var result = []; - for (var i = 0; i < parts.length; ++i) { + let result = []; + for (let i = 0; i < parts.length; ++i) { result.push(parts[i].map(function(x) { return x.shortname; }).join("/")); } return result.join(" > ") + " (" + rule_name + ")"; } -make_teams_to_idx = function(teams) +function make_teams_to_idx(teams) { - var teams_to_idx = []; - for (var i = 0; i < teams.length; i++) { + let teams_to_idx = []; + for (let i = 0; i < teams.length; i++) { teams_to_idx[teams[i].name] = i; + teams_to_idx[teams[i].mediumname] = i; + teams_to_idx[teams[i].shortname] = i; } return teams_to_idx; } -partition_by_beat = function(games, teams) +function partition_by_beat(teams, fill_beatmatrix) { // Head-to-head score by way of components. First construct the beat matrix. - var n = teams.length; - var beat = new Array(n); - var teams_to_idx = make_teams_to_idx(teams); - for (var i = 0; i < n; i++) { + let n = teams.length; + let beat = new Array(n); + let teams_to_idx = make_teams_to_idx(teams); + for (let i = 0; i < n; i++) { beat[i] = new Array(n); - for (var j = 0; j < n; j++) { + for (let j = 0; j < n; j++) { beat[i][j] = 0; } } - for (i = 0; i < games.length; ++i) { - var idx1 = teams_to_idx[games[i].name1]; - var idx2 = teams_to_idx[games[i].name2]; - if (idx1 !== undefined && idx2 !== undefined) { - if (games[i].score1 > games[i].score2) { - beat[idx1][idx2] = 1; - } - if (games[i].score1 < games[i].score2) { - beat[idx2][idx1] = 1; - } - } - } + fill_beatmatrix(beat, teams_to_idx); // Floyd-Warshall for transitive closure. - for (var k = 0; k < n; ++k) { - for (var i = 0; i < n; ++i) { - for (var j = 0; j < n; ++j) { + for (let k = 0; k < n; ++k) { + for (let i = 0; i < n; ++i) { + for (let j = 0; j < n; ++j) { if (beat[i][k] && beat[k][j]) { beat[i][j] = 1; } @@ -107,9 +118,9 @@ partition_by_beat = function(games, teams) } // See if we can find any team that is comparable to all others. - for (var pivot_idx = 0; pivot_idx < n; pivot_idx++) { - var incomparable = false; - for (var i = 0; i < n; ++i) { + for (let pivot_idx = 0; pivot_idx < n; pivot_idx++) { + let incomparable = false; + for (let i = 0; i < n; ++i) { if (i != pivot_idx && beat[pivot_idx][i] == 0 && beat[i][pivot_idx] == 0) { incomparable = true; break; @@ -117,10 +128,10 @@ partition_by_beat = function(games, teams) } if (!incomparable) { // Split the teams into three partitions: - var better_than_pivot = [], equal = [], worse_than_pivot = []; - for (var i = 0; i < n; ++i) { - var we_beat = (beat[pivot_idx][i] == 1); - var they_beat = (beat[i][pivot_idx] == 1); + let better_than_pivot = [], equal = [], worse_than_pivot = []; + for (let i = 0; i < n; ++i) { + let we_beat = (beat[pivot_idx][i] == 1); + let they_beat = (beat[i][pivot_idx] == 1); if ((i == pivot_idx) || (we_beat && they_beat)) { equal.push(teams[i]); } else if (we_beat && !they_beat) { @@ -131,13 +142,13 @@ partition_by_beat = function(games, teams) console.log("this shouldn't happen"); } } - var result = []; + let result = []; if (better_than_pivot.length > 0) { - result = partition_by_beat(games, better_than_pivot); + result = partition_by_beat(better_than_pivot, fill_beatmatrix); } result.push(equal); // Obviously can't be partitioned further. if (worse_than_pivot.length > 0) { - result = result.concat(partition_by_beat(games, worse_than_pivot)); + result = result.concat(partition_by_beat(worse_than_pivot, fill_beatmatrix)); } return result; } @@ -149,7 +160,7 @@ partition_by_beat = function(games, teams) } // Takes in an array, gives every element a rank starting with 1, and returns. -rank = function(games, teams, start_rank, tiebreakers) { +function rank(games, teams, start_rank, tiebreakers) { if (teams.length <= 1) { // Only one team, so trivial. teams[0].rank = start_rank; @@ -157,91 +168,209 @@ rank = function(games, teams, start_rank, tiebreakers) { } // Rule #0: Partition the teams by score. - var score_parts = partition(teams, function(a, b) { return b.pts - a.pts }); + 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. - var beat_parts = partition_by_beat(games, teams); + let num_relevant_games = 0; + let beat_parts = partition_by_beat(teams, function(beat, teams_to_idx) { + 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 && idx2 !== undefined) { + if (games[i].score1 > games[i].score2) { + beat[idx1][idx2] = 1; + ++num_relevant_games; + } else if (games[i].score1 < games[i].score2) { + beat[idx2][idx1] = 1; + ++num_relevant_games; + } + } + } + }); 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). // Actually the rule says “fewest losses”, but fewer games is equivalent // as long as teams have the same amount of points and ties don't exist. - var nplayed_parts = partition(teams, function(a, b) { return a.nplayed - b.nplayed }); + 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. - var teams_to_idx = make_teams_to_idx(teams); - for (var i = 0; i < teams.length; i++) { - teams[i].h2h_gd = 0; - teams[i].h2h_goals = 0; + // Rule #3: Head-to-head goal difference (if all have played). + let teams_to_idx = make_teams_to_idx(teams); + if (num_relevant_games >= teams.length * (teams.length - 1) / 2) { + for (let i = 0; i < teams.length; i++) { + teams[i].h2h_gd = 0; + teams[i].h2h_goals = 0; + } + 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 && idx2 !== undefined && + !isNaN(games[i].score1) && !isNaN(games[i].score2)) { + teams[idx1].h2h_gd += games[i].score1; + teams[idx1].h2h_gd -= games[i].score2; + teams[idx2].h2h_gd += games[i].score2; + teams[idx2].h2h_gd -= games[i].score1; + + teams[idx1].h2h_goals += games[i].score1; + teams[idx2].h2h_goals += games[i].score2; + } + } + 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, rank); + } } - for (i = 0; i < games.length; ++i) { - var idx1 = teams_to_idx[games[i].name1]; - var idx2 = teams_to_idx[games[i].name2]; - if (idx1 !== undefined && idx2 !== undefined && - !isNaN(games[i].score1) && isNaN(games[i].score2)) { - teams[idx1].h2h_gd += games[i].score1; - teams[idx1].h2h_gd -= games[i].score2; - teams[idx2].h2h_gd += games[i].score2; - teams[idx2].h2h_gd -= games[i].score1; - teams[idx1].h2h_goals += games[i].score1; - teams[idx2].h2h_goals += games[i].score2; + // Rule #4: Goal difference against common opponents. + var results = {}; + for (let i = 0; i < games.length; ++i) { + if (results[games[i].name1] === undefined) { + results[games[i].name1] = {}; } - } - var 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); - } + if (results[games[i].name2] === undefined) { + results[games[i].name2] = {}; + } + results[games[i].name1][games[i].name2] = [ games[i].score1, games[i].score2 ]; + results[games[i].name2][games[i].name1] = [ games[i].score2, games[i].score1 ]; + } + let gd_parts = partition_by_beat(teams, function(beat, teams_to_idx) { + for (const team_i of Object.keys(teams_to_idx)) { + let i = teams_to_idx[team_i]; + for (const team_j of Object.keys(teams_to_idx)) { + let j = teams_to_idx[team_j]; + let results_i = results[team_i], results_j = results[team_j]; + let gd_i = 0, gd_j = 0; + + // See if the two teams have both played a third team k. + for (let k in results_i) { + if (!results_i.hasOwnProperty(k)) continue; + if (results_j !== undefined && results_j[k] !== undefined) { + gd_i += results_i[k][0] - results_i[k][1]; + gd_j += results_j[k][0] - results_j[k][1]; + } + } - // Rule #4: Global goal difference. (Well, not strictly, but good enough.) - var gd_parts = partition(teams, function(a, b) { return b.gd - a.gd }); + if (gd_i > gd_j) { + beat[i][j] = 1; + } else if (gd_i < gd_j) { + beat[j][i] = 1; + } + } + } + }); if (gd_parts.length > 1) { - tiebreakers.push(explain_tiebreaker(gd_parts, 'overall goal difference')); - return subrank_partitions(games, gd_parts, start_rank, tiebreakers); + tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference versus common opponents')); + return subrank_partitions(games, gd_parts, start_rank, tiebreakers, rank); } - // Rule #5: Head-to-head scored goals. - var 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); + // Rule #5: Head-to-head scored goals (if all have played). + if (num_relevant_games >= teams.length * (teams.length - 1) / 2) { + 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, rank); + } } - // Rule #6: Overall scored goals. (Same caveat as #4.) - var goals_parts = partition(teams, function(a, b) { return b.goals - a.goals }); + // Rule #6: Goals scored against common opponents. + let goals_parts = partition_by_beat(teams, function(beat, teams_to_idx) { + for (const team_i of Object.keys(teams_to_idx)) { + let i = teams_to_idx[team_i]; + for (const team_j of Object.keys(teams_to_idx)) { + let j = teams_to_idx[team_j]; + let results_i = results[team_i], results_j = results[team_j]; + let goals_i = 0, goals_j = 0; + + // See if the two teams have both played a third team k. + for (let k in results_i) { + if (!results_i.hasOwnProperty(k)) continue; + if (results_j !== undefined && results_j[k] !== undefined) { + goals_i += results_i[k][0]; + goals_j += results_j[k][0]; + } + } + + if (goals_i > goals_j) { + beat[i][j] = 1; + } else if (goals_i < goals_j) { + beat[j][i] = 1; + } + } + } + }); if (goals_parts.length > 1) { - tiebreakers.push(explain_tiebreaker(goals_parts, 'scored goals')); - return subrank_partitions(games, goals_parts, start_rank, tiebreakers); + tiebreakers.push(explain_tiebreaker(goals_parts, 'goals scored against common opponents')); + 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. - var result = []; - for (var i = 0; i < teams.length; ++i) { + let result = []; + for (let i = 0; i < teams.length; ++i) { result.push(teams[i]); result[i].rank = start_rank; } return result; }; -parse_teams_from_spreadsheet = function(response) { - var teams = []; - for (var i = 2; response.values[i].length >= 1; ++i) { +function parse_teams_from_spreadsheet(response) { + let teams = []; + for (let i = 1; i < response.values.length && response.values[i].length >= 1; ++i) { teams.push({ "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], + "seeding": parseInt(response.values[i][3]), + "ngames": 0, "nplayed": 0, "gd": 0, "pts": 0, @@ -251,9 +380,9 @@ parse_teams_from_spreadsheet = function(response) { return teams; }; -parse_games_from_spreadsheet = function(response, group_name, include_unplayed) { - var games = []; - var i; +function parse_games_from_spreadsheet(response, group_name, include_unplayed) { + let games = []; + let i; for (i = 0; i < response.values.length; ++i) { if (response.values[i][0] === 'Results') { i += 2; @@ -263,7 +392,7 @@ parse_games_from_spreadsheet = function(response, group_name, include_unplayed) for ( ; response.values[i] !== undefined && response.values[i].length >= 1; ++i) { if ((response.values[i][2] && response.values[i][3]) || include_unplayed) { - var real_group_name = response.values[i][9]; + let real_group_name = response.values[i][9]; if (real_group_name === undefined) { real_group_name = group_name; } @@ -273,7 +402,7 @@ parse_games_from_spreadsheet = function(response, group_name, include_unplayed) "score1": parseInt(response.values[i][2]), "score2": parseInt(response.values[i][3]), "streamday": response.values[i][7], - "streamtime": response.values[i][8], + "streamtime": response.values[i][8].replace('.', ':'), "group_name": real_group_name }); } @@ -281,27 +410,97 @@ parse_games_from_spreadsheet = function(response, group_name, include_unplayed) return games; }; -var display_group = function(response, group_name) -{ - var teams = parse_teams_from_spreadsheet(response); - var games = parse_games_from_spreadsheet(response, group_name, false); - display_group_parsed(teams, games, group_name); +function get_team_code(teams, str) { + for (const team of teams) { + if (team.name === str || team.mediumname === str || team.shortname === str) { + return team.shortname; + } + } + return str; +} + +function get_all_group_games(teams, groups, cb) { + get_sheet('Results', function(response) { + let games = []; + for (const region of ultimateconfig['group_match_scores']) { + for (let row = region.first_row; row <= region.last_row; ++row) { + let team1 = get_team_code(teams, response.values[row - 1][region.team1_column]); + let team2 = get_team_code(teams, response.values[row - 1][region.team2_column]); + if (team1 === undefined || team2 === undefined || team1 === '' || team2 === '' || team1 === null || team2 === null) { + continue; + } + let group_name = region.group_name; + if (group_name === undefined) { + // Infer group from whatever group both teams are in. + for (const [group, teams] of Object.entries(groups)) { + if (teams.indexOf(team1) != -1 && teams.indexOf(team2) != -1) { + group_name = group; + break; + } + } + } + let game = { + "name1": team1, + "name2": team2, + "score1": parseInt(response.values[row - 1][region.team1_score_column]), + "score2": parseInt(response.values[row - 1][region.team2_score_column]), + "group_name": group_name + }; + if (region.stream_time_column !== undefined) { + game["streamtime"] = response.values[row - 1][region.stream_time_column].replace('.', ':'); + game["streamday"] = region.stream_day; + } + games.push(game); + } + } + cb(games); + }); }; -var display_group_parsed = function(teams, games, group_name) +function apply_games_to_teams(games, teams, group_name, ignored_teams, ret_ignored_games) { - document.getElementById('entire-bug').style.display = 'none'; - - var teams_to_idx = make_teams_to_idx(teams); - for (i = 0; i < games.length; ++i) { - var idx1 = teams_to_idx[games[i].name1]; - var idx2 = teams_to_idx[games[i].name2]; + let teams_to_idx = make_teams_to_idx(teams); + let ignored_teams_idx; + if (ignored_teams === undefined) { + ignored_teams_idx = []; + } else { + ignored_teams_idx = make_teams_to_idx(ignored_teams); + } + for (let i = 0; i < teams.length; ++i) { + teams[i].nplayed = 0; + teams[i].goals = 0; + teams[i].gd = 0; + teams[i].pts = 0; + } + for (let i = 0; i < games.length; ++i) { + if (games[i].group_name !== group_name) { + continue; + } + let idx1 = teams_to_idx[games[i].name1]; + let idx2 = teams_to_idx[games[i].name2]; if (games[i].score1 === undefined || games[i].score2 === undefined || isNaN(games[i].score1) || isNaN(games[i].score2) || idx1 === undefined || idx2 === undefined || games[i].score1 == games[i].score2) { continue; } + + let ignored_idx1 = ignored_teams_idx[games[i].name1]; + let ignored_idx2 = ignored_teams_idx[games[i].name2]; + if (ignored_idx1 !== undefined || ignored_idx2 !== undefined) { + if (ret_ignored_games !== undefined) { + // Figure out whether the fifth we're ignoring was only picked out arbitrarily + // (ie., there's a tie for 5th); if so, mark it as such. + let arbitrary = false; + if (ignored_idx1 !== undefined && ignored_teams[ignored_idx1].rank < 5) { + arbitrary = true; + } else if (ignored_idx2 !== undefined && ignored_teams[ignored_idx2].rank < 5) { + arbitrary = true; + } + ret_ignored_games.push([teams[idx1].shortname, teams[idx2].shortname, arbitrary]); + } + continue; + } ++teams[idx1].nplayed; ++teams[idx2].nplayed; teams[idx1].goals += games[i].score1; @@ -316,15 +515,47 @@ var display_group_parsed = function(teams, games, group_name) teams[idx2].pts += 2; } } +} + +// 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; // FIXME: shouldn't nplayed be just as good? + } + if (idx2 !== undefined) { + ++teams[idx2].ngames; + } + } + return teams.filter(function(team) { return team.ngames > 0; }); +} + +// So that we can just have one team list, and let membership be defined by the group list. +function filter_teams_by_group(teams, groups, group) +{ + return teams.filter(function(team) { + return groups[group].indexOf(team.shortname) != -1 || groups[group].indexOf(team.mediumname) != -1; + }); +} + +function display_group_parsed(teams, games, group_name) +{ + document.getElementById('entire-bug').style.display = 'none'; - tiebreakers = []; + apply_games_to_teams(games, teams, group_name); + let tiebreakers = []; teams = rank(games, teams, 1, tiebreakers); - var carousel = document.getElementById('carousel'); + let carousel = document.getElementById('carousel'); clear_carousel(carousel); - addheading(carousel, 5, "Current standings, Trøndisk 2017
" + group_name); - var tr = document.createElement("tr"); + addheading(carousel, 5, "Current standings, " + ultimateconfig['tournament_title'] + "
" + group_name); + let tr = document.createElement("tr"); tr.className = "subfooter"; addth(tr, "rank", ""); addth(tr, "team", ""); @@ -333,9 +564,9 @@ var display_group_parsed = function(teams, games, group_name) addth(tr, "pts", "Pts"); carousel.appendChild(tr); - var row_num = 2; - for (i = 0; i < teams.length; ++i) { - var tr = document.createElement("tr"); + let row_num = 2; + for (let i = 0; i < teams.length; ++i) { + let tr = document.createElement("tr"); addth(tr, "rank", teams[i].rank); addtd(tr, "team", teams[i].name); @@ -347,19 +578,19 @@ var display_group_parsed = function(teams, games, group_name) } if (tiebreakers.length > 0) { - var tie_tr = document.createElement("tr"); + let tie_tr = document.createElement("tr"); tie_tr.className = "footer"; - var td = document.createElement("td"); + let td = document.createElement("td"); td.appendChild(document.createTextNode("Tiebreaks applied: " + tiebreakers.join(', '))); td.setAttribute("colspan", "5"); tie_tr.appendChild(td); carousel.appendChild(tie_tr); } - var footer_tr = document.createElement("tr"); + let footer_tr = document.createElement("tr"); footer_tr.className = "footer"; - var td = document.createElement("td"); - td.appendChild(document.createTextNode("www.trondheimfrisbeeklubb.no | #trøndisk")); + let td = document.createElement("td"); + td.appendChild(document.createTextNode(ultimateconfig['tournament_footer'])); td.setAttribute("colspan", "5"); footer_tr.appendChild(td); carousel.appendChild(footer_tr); @@ -369,10 +600,10 @@ var display_group_parsed = function(teams, games, group_name) carousel.style.display = 'table'; }; -var fade_in_rows = function(table) +function fade_in_rows(table) { - var trs = table.getElementsByTagName("tr"); - for (var i = 1; i < trs.length; ++i) { // The header already has its own fade-in. + let trs = table.getElementsByTagName("tr"); + for (let i = 1; i < trs.length; ++i) { // The header already has its own fade-in. if (trs[i].className === "footer") { trs[i].style = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-delay: " + (0.25 * i) + "s; -webkit-animation-fill-mode: both;"; } else { @@ -381,10 +612,10 @@ var fade_in_rows = function(table) } }; -var fade_out_rows = function(table) +function fade_out_rows(table) { - var trs = table.getElementsByTagName("tr"); - for (var i = 0; i < trs.length; ++i) { + let trs = table.getElementsByTagName("tr"); + for (let i = 0; i < trs.length; ++i) { if (trs[i].className === "footer") { trs[i].style = "-webkit-animation: fade-out 1.0s ease; -webkit-animation-delay: " + (0.125 * i) + "s; -webkit-animation-fill-mode: both;"; } else { @@ -393,7 +624,7 @@ var fade_out_rows = function(table) } }; -var clear_carousel = function(table) +function clear_carousel(table) { while (table.childNodes.length > 0) { table.removeChild(table.firstChild); @@ -401,32 +632,27 @@ var clear_carousel = function(table) }; // Stream schedule -var display_stream_schedule = function(response, group_name) { - var teams = parse_teams_from_spreadsheet(response); - var games = parse_games_from_spreadsheet(response, group_name, true); - display_stream_schedule_parsed(teams, games); -}; +let max_list_len = 7; -var display_stream_schedule_parsed = function(teams, games) { - document.getElementById('entire-bug').style.display = 'none'; - - var teams_to_idx = make_teams_to_idx(teams); +function sort_game_list(games) { games = games.filter(function(game) { return game.streamtime !== undefined && game.streamtime.match(/[0-9]+:[0-9]+/) != null; }); games.sort(function(a, b) { if (a.streamday !== b.streamday) { return a.streamday - b.streamday; } - var m1 = a.streamtime.match(/([0-9]+):([0-9]+)/); - var m2 = b.streamtime.match(/([0-9]+):([0-9]+)/); + let m1 = a.streamtime.match(/([0-9]+):([0-9]+)/); + let m2 = b.streamtime.match(/([0-9]+):([0-9]+)/); return (m1[1] * 60 + m1[2]) - (m2[1] * 60 + m2[2]); }); + return games; +} +function find_game_start_idx(games) { // Pick out a reasonable place to start the list. We'll show the last // completed match and start from there. - var max_list_len = 8; - var start_idx = games.length - 1; - for (var i = 0; i < games.length; ++i) { + let start_idx = games.length - 1; + for (let i = 0; i < games.length; ++i) { if (isNaN(games[i].score1) || isNaN(games[i].score2) && games[i].score1 === games[i].score2) { start_idx = i; @@ -437,22 +663,59 @@ var display_stream_schedule_parsed = function(teams, games) { if (games.length >= max_list_len) { start_idx = Math.min(start_idx, games.length - max_list_len); } + return start_idx; +} - var days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]; - var shortdays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; - var today = days[(new Date).getDay()]; - var short_today = shortdays[(new Date).getDay()]; +function find_num_pages(games) { + games = sort_game_list(games); + let start_idx = find_game_start_idx(games); + return Math.ceil((games.length - start_idx) / max_list_len); +} + +function get_mediumname(name, teams, teams_to_idx) +{ + if (teams_to_idx[name] === undefined) { + return name.replace(/^W /, 'Winner ').replace(/^L /, 'Loser '); + } else { + return teams[teams_to_idx[name]].mediumname; + } +} + +function display_stream_schedule_parsed(teams, games, page) { + document.getElementById('entire-bug').style.display = 'none'; + + games = sort_game_list(games); + let start_idx = find_game_start_idx(games); + + start_idx += page * max_list_len; + if (start_idx >= games.length) { + // Error. + return; + } + + let days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]; + let shortdays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; + let today = days[(new Date).getDay()]; + + let covered_days = []; + let row_num = 0; + for (let i = start_idx; i < games.length && row_num++ < max_list_len; ++i) { + if (i == start_idx || games[i].streamday != games[i - 1].streamday) { + covered_days.push(days[games[i].streamday]); + } + } - var carousel = document.getElementById('carousel'); + let carousel = document.getElementById('carousel'); clear_carousel(carousel); - addheading(carousel, 3, "Stream schedule, Trøndisk 2017
" + today); + addheading(carousel, 3, "Stream schedule, " + ultimateconfig['tournament_title'] + "
" + covered_days.join('/') + " (all times CET)"); - var row_num = 0; - for (i = start_idx; i < games.length && row_num < max_list_len; ++i) { - var tr = document.createElement("tr"); + let teams_to_idx = make_teams_to_idx(teams); + row_num = 0; + for (let i = start_idx; i < games.length && row_num < max_list_len; ++i) { + let tr = document.createElement("tr"); - var name1 = teams[teams_to_idx[games[i].name1]].mediumname; - var name2 = teams[teams_to_idx[games[i].name2]].mediumname; + let name1 = get_mediumname(games[i].name1, teams, teams_to_idx); + let name2 = get_mediumname(games[i].name2, teams, teams_to_idx); addtd(tr, "matchup", name1 + "–" + name2); addtd(tr, "group", games[i].group_name); @@ -461,8 +724,8 @@ var display_stream_schedule_parsed = function(teams, games) { games[i].score1 !== games[i].score2) { addtd(tr, "streamtime", games[i].score1 + "–" + games[i].score2); } else { - var streamtime = games[i].streamtime; - var streamday = days[games[i].streamday]; + let streamtime = games[i].streamtime; + let streamday = days[games[i].streamday]; if (streamday !== today) { streamtime = shortdays[games[i].streamday] + " " + streamtime; } @@ -478,58 +741,92 @@ var display_stream_schedule_parsed = function(teams, games) { carousel.style.display = 'table'; }; -var get_group = function(group_name, cb) +function get_sheet(sheet_name, cb) { - var req = new XMLHttpRequest(); + let req = new XMLHttpRequest(); req.onload = function(e) { - cb(JSON.parse(req.responseText), group_name); + cb(JSON.parse(req.responseText)); }; - req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1CwRHQtpokVMGTPJu2FYYG-6rnG7OfISIcEHwBfXh-Y4/values/\'' + group_name + '\'!A1:J50?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU'); + req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/' + ultimateconfig['score_sheet_id'] + '/values/\'' + sheet_name + '\'!A1:Z50?key=' + ultimateconfig['api_key']); req.send(); -}; +} -var showgroup = function(group_name) +function get_group(group_name, cb) { - get_group(group_name, display_group); -}; + get_sheet(group_name, function(response) { + cb(response, group_name); + }); +} -var showgroup_from_state = function() +function get_teams(cb) +{ + get_sheet('Teams', function(response) { + cb(parse_teams_from_spreadsheet(response)); + }); +} + +function get_groups(cb) +{ + get_sheet('Groups', function(response) { + let groups = {}; + for (let i = 1; i < response.values.length && response.values[i].length >= 1; ++i) { + let team = response.values[i][0]; + let group = response.values[i][1]; + if (groups[group] === undefined) { + groups[group] = []; + } + groups[group].push(team); + } + cb(groups); + }); +} + +function showgroup(group_name) +{ + get_teams(function(teams) { + get_groups(function(groups) { + get_all_group_games(teams, groups, function(games) { + teams = filter_teams_by_group(teams, groups, group_name); + display_group_parsed(teams, games, group_name); + publish_group_rank(response, group_name); // Update the spreadsheet in the background. + }); + }); + }); +} + +function showgroup_from_state() { showgroup(state['group_name']); -}; +} -var carousel_timeout = null; +let carousel_timeout = null; -var hidetable = function() +function hidetable() { fade_out_rows(document.getElementById('carousel')); }; -var showschedule = function() +function showschedule(page) { - var teams = []; - var games = []; - var num_left = 3; - - var cb = function(response, group_name) { - teams = teams.concat(parse_teams_from_spreadsheet(response)); - games = games.concat(parse_games_from_spreadsheet(response, group_name, true)); - if (--num_left == 0) { - display_stream_schedule_parsed(teams, games); - } - }; - - get_group('Group A', cb); - get_group('Group B', cb); - get_group('Playoffs', cb); + get_teams(function(teams) { + get_groups(function(groups) { + get_all_group_games(teams, groups, function(games) { + get_all_playoff_games(teams, groups, games, function(playoff_games) { + games = games.concat(playoff_games); + games = games.filter(function(game) { return game.streamday !== undefined; }); + display_stream_schedule_parsed(teams, games, 0); + }); + }); + }); + }); }; -var do_series = function(series) +function do_series(series) { do_series_internal(series, 0); }; -var do_series_internal = function(series, idx) +function do_series_internal(series, idx) { (series[idx][1])(); if (idx + 1 < series.length) { @@ -537,40 +834,46 @@ var do_series_internal = function(series, idx) } }; -var showcarousel = function() -{ - var teams_per_group = []; - var games_per_group = []; - var combined_teams = []; - var combined_games = []; - var num_left = 3; - - var cb = function(response, group_name) { - var teams = parse_teams_from_spreadsheet(response); - var games = parse_games_from_spreadsheet(response, group_name, true); - teams_per_group[group_name] = teams; - games_per_group[group_name] = games; - - combined_teams = combined_teams.concat(teams); - combined_games = combined_games.concat(games); - if (--num_left == 0) { - do_series([ - [ 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_stream_schedule_parsed(combined_teams, combined_games); } ], - [ 2000, function() { hidetable(); } ] - ]); - } - }; - - get_group('Group A', cb); - get_group('Group B', cb); - get_group('Playoffs', cb); +function showcarousel() +{ + let groups_to_get = [ + 'Group A', + 'Group B', + 'Group C', + 'Playoffs', + 'Playoffs 9th–11th', + 'Playoffs 12th–14th' + ]; + get_teams(function(teams) { + get_groups(function(groups) { + get_all_group_games(teams, groups, function(games) { + get_all_playoff_games(teams, groups, games, function(playoff_games) { + games = games.concat(playoff_games); + games = games.filter(function(game) { return game.streamday !== undefined; }); + + let series = [ + [ 13000, function() { display_group_parsed(filter_teams_by_group(teams, groups, 'Group A'), games, 'Group A'); } ], + [ 2000, function() { hidetable(); } ], + [ 13000, function() { display_group_parsed(filter_teams_by_group(teams, groups, 'Group B'), games, 'Group B'); } ], + [ 2000, function() { hidetable(); } ], + [ 13000, function() { display_group_parsed(filter_teams_by_group(teams, groups, 'Group C'), games, 'Group C'); } ], + [ 2000, function() { hidetable(); } ], + // We don't show the playoff groups, since we don't even know whether they have data. + ]; + let num_pages = find_num_pages(games); + for (let page = 0; page < num_pages; ++page) { + series.push([ 13000, function() { display_stream_schedule_parsed(teams, games, page); } ]); + series.push([ 2000, function() { hidetable(); } ]); + } + + do_series(series); + }); + }); + }); + }); }; -var stopcarousel = function() +function stopcarousel() { if (carousel_timeout !== null) { hidetable(); @@ -579,13 +882,40 @@ var stopcarousel = function() } }; -var hidescorebug = function() +function hidescorebug() { document.getElementById('entire-bug').style.display = 'none'; } -var showscorebug = function() +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; +}