X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=carousel.js;h=35b02883c7d91809e89e5ec891e10733c9595c83;hb=3c3a5c028bed3922840a2b5ad7ab861fca092582;hp=2336e5545d7a091259150e24a0a49b6f2e73baaa;hpb=0aaade127cabd5530f53cea3ca7b5e03660ff799;p=ultimatescore diff --git a/carousel.js b/carousel.js index 2336e55..35b0288 100644 --- a/carousel.js +++ b/carousel.js @@ -1,8 +1,10 @@ +'use strict'; + function addheading(carousel, colspan, content) { - var thead = document.createElement("thead"); - var tr = document.createElement("tr"); - var th = document.createElement("th"); + 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); @@ -10,23 +12,23 @@ function addheading(carousel, colspan, content) carousel.appendChild(thead); }; function addtd(tr, className, content) { - var td = document.createElement("td"); + let td = document.createElement("td"); td.appendChild(document.createTextNode(content)); td.className = className; tr.appendChild(td); }; function addth(tr, className, content) { - var th = document.createElement("th"); + let th = document.createElement("th"); th.appendChild(document.createTextNode(content)); th.className = className; tr.appendChild(th); }; function subrank_partitions(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) { + let result = []; + for (let i = 0; i < parts.length; ++i) { + let part = rank(games, parts[i], start_rank, tiebreakers); + for (let j = 0; j < part.length; ++j) { result.push(part[j]); } start_rank += part.length; @@ -38,9 +40,9 @@ 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 = []; @@ -55,8 +57,8 @@ function partition(teams, compare) 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 + ")"; @@ -64,41 +66,32 @@ function explain_tiebreaker(parts, rule_name) 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; } -function partition_by_beat(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 +100,9 @@ function partition_by_beat(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 +110,10 @@ function partition_by_beat(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 +124,13 @@ function partition_by_beat(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; } @@ -157,13 +150,28 @@ function rank(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); } // 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); @@ -172,62 +180,125 @@ function rank(games, teams, start_rank, tiebreakers) { // 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); } - // 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; - } - 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 #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); } - } - 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); } - // Rule #4: Global goal difference. (Well, not strictly, but good enough.) - var gd_parts = partition(teams, function(a, b) { return b.gd - a.gd }); + // 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] = {}; + } + 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]; + } + } + + 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')); + tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference versus common opponents')); return subrank_partitions(games, gd_parts, start_rank, tiebreakers); } - // 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); + } } - // 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')); + tiebreakers.push(explain_tiebreaker(goals_parts, 'goals scored against common opponents')); return subrank_partitions(games, goals_parts, start_rank, tiebreakers); } // 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; } @@ -235,8 +306,8 @@ function rank(games, teams, start_rank, tiebreakers) { }; function parse_teams_from_spreadsheet(response) { - var teams = []; - for (var i = 2; response.values[i].length >= 1; ++i) { + let teams = []; + for (let i = 2; response.values[i].length >= 1; ++i) { teams.push({ "name": response.values[i][0], "mediumname": response.values[i][1], @@ -252,8 +323,8 @@ function parse_teams_from_spreadsheet(response) { }; function parse_games_from_spreadsheet(response, group_name, include_unplayed) { - var games = []; - var i; + let games = []; + let i; for (i = 0; i < response.values.length; ++i) { if (response.values[i][0] === 'Results') { i += 2; @@ -263,7 +334,7 @@ function parse_games_from_spreadsheet(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; } @@ -281,21 +352,12 @@ function parse_games_from_spreadsheet(response, group_name, include_unplayed) { return games; }; -function display_group(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 display_group_parsed(teams, games, group_name) +function apply_games_to_teams(games, teams) { - document.getElementById('entire-bug').style.display = 'none'; - - var teams_to_idx = make_teams_to_idx(teams); - for (var 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); + 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 (games[i].score1 === undefined || games[i].score2 === undefined || isNaN(games[i].score1) || isNaN(games[i].score2) || idx1 === undefined || idx2 === undefined || @@ -316,15 +378,21 @@ function display_group_parsed(teams, games, group_name) teams[idx2].pts += 2; } } +} - var tiebreakers = []; +function display_group_parsed(teams, games, group_name) +{ + document.getElementById('entire-bug').style.display = 'none'; + + apply_games_to_teams(games, teams); + 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
" + group_name); + let tr = document.createElement("tr"); tr.className = "subfooter"; addth(tr, "rank", ""); addth(tr, "team", ""); @@ -333,9 +401,9 @@ function display_group_parsed(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 +415,19 @@ function display_group_parsed(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("Norwegian Ultimate Championships 2018 | #ultimatenm")); td.setAttribute("colspan", "5"); footer_tr.appendChild(td); carousel.appendChild(footer_tr); @@ -371,8 +439,8 @@ function display_group_parsed(teams, games, group_name) 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 { @@ -383,8 +451,8 @@ function fade_in_rows(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 { @@ -401,11 +469,11 @@ function clear_carousel(table) }; // Stream schedule -var max_list_len = 8; +let max_list_len = 7; function display_stream_schedule(response, group_name) { - var teams = parse_teams_from_spreadsheet(response); - var games = parse_games_from_spreadsheet(response, group_name, true); + let teams = parse_teams_from_spreadsheet(response); + let games = parse_games_from_spreadsheet(response, group_name, true); display_stream_schedule_parsed(teams, games, 0); }; @@ -416,8 +484,8 @@ function sort_game_list(games) { 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; @@ -426,8 +494,8 @@ function sort_game_list(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 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; @@ -443,7 +511,7 @@ function find_game_start_idx(games) { function find_num_pages(games) { games = sort_game_list(games); - var start_idx = find_game_start_idx(games); + let start_idx = find_game_start_idx(games); return Math.ceil((games.length - start_idx) / max_list_len); } @@ -451,7 +519,7 @@ function display_stream_schedule_parsed(teams, games, page) { document.getElementById('entire-bug').style.display = 'none'; games = sort_game_list(games); - var start_idx = find_game_start_idx(games); + let start_idx = find_game_start_idx(games); start_idx += page * max_list_len; if (start_idx >= games.length) { @@ -459,29 +527,29 @@ function display_stream_schedule_parsed(teams, games, page) { return; } - 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()]; + 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()]; - var covered_days = []; - var row_num = 0; - for (var i = start_idx; i < games.length && row_num++ < max_list_len; ++i) { + 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
" + covered_days.join('/') + " (all times CET)"); + addheading(carousel, 3, "Match schedule
" + covered_days.join('/') + " (all times CET)"); - var teams_to_idx = make_teams_to_idx(teams); + let teams_to_idx = make_teams_to_idx(teams); row_num = 0; - for (i = start_idx; i < games.length && row_num < max_list_len; ++i) { - var tr = document.createElement("tr"); + 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 = teams[teams_to_idx[games[i].name1]].mediumname; + let name2 = teams[teams_to_idx[games[i].name2]].mediumname; addtd(tr, "matchup", name1 + "–" + name2); addtd(tr, "group", games[i].group_name); @@ -490,8 +558,8 @@ function display_stream_schedule_parsed(teams, games, page) { 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; } @@ -509,25 +577,31 @@ function display_stream_schedule_parsed(teams, games, page) { function get_group(group_name, cb) { - var req = new XMLHttpRequest(); + let req = new XMLHttpRequest(); req.onload = function(e) { cb(JSON.parse(req.responseText), group_name); }; - 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/1uh7kr5v_hyD072b1G2tbQlhqd_8ldS_6j30CBocQ-4E/values/\'' + group_name + '\'!A1:J50?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU'); req.send(); -}; +} function showgroup(group_name) { - get_group(group_name, display_group); -}; + 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); + display_group_parsed(teams, games, group_name); + }); + publish_group_rank(group_name); // Update the spreadsheet in the background. +} + function showgroup_from_state() { showgroup(state['group_name']); -}; +} -var carousel_timeout = null; +let carousel_timeout = null; function hidetable() { @@ -536,11 +610,11 @@ function hidetable() function showschedule(page) { - var teams = []; - var games = []; - var num_left = 3; + let teams = []; + let games = []; + let num_left = 3; - var cb = function(response, group_name) { + let 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) { @@ -568,28 +642,28 @@ function do_series_internal(series, idx) function showcarousel() { - 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); + let teams_per_group = []; + let games_per_group = []; + let combined_teams = []; + let combined_games = []; + let num_left = 3; + + let cb = function(response, group_name) { + let teams = parse_teams_from_spreadsheet(response); + let 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) { - var series = [ + let 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(); } ] ]; - var num_pages = find_num_pages(combined_games); + let num_pages = find_num_pages(combined_games); for (let page = 0; page < num_pages; ++page) { series.push([ 13000, function() { display_stream_schedule_parsed(combined_teams, combined_games, page); } ]); series.push([ 2000, function() { hidetable(); } ]);