From c396868fd38cc06d4aed4a787b98e6d9c39ccb00 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 19 Feb 2020 22:35:03 +0100 Subject: [PATCH] Ignore teams in the team list that have no games. This means we can really share the team list between all groups if we so desire... --- carousel.js | 20 ++++++++++++++++++++ update_sheets.js | 2 ++ 2 files changed, 22 insertions(+) diff --git a/carousel.js b/carousel.js index 00da45c..6240c7b 100644 --- a/carousel.js +++ b/carousel.js @@ -351,6 +351,7 @@ function parse_teams_from_spreadsheet(response) { "mediumname": response.values[i][1], "shortname": response.values[i][2], //"tags": response.values[i][3], + "ngames": 0, "nplayed": 0, "gd": 0, "pts": 0, @@ -418,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'; @@ -628,6 +647,7 @@ 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. }); diff --git a/update_sheets.js b/update_sheets.js index aa4daa6..3ee6c8f 100644 --- a/update_sheets.js +++ b/update_sheets.js @@ -74,6 +74,7 @@ function publish_group_rank(response, group_name) let teams = parse_teams_from_spreadsheet(response); let games = parse_games_from_spreadsheet(response, group_name, false); apply_games_to_teams(games, teams); + teams = filter_teams(teams, response); // Write the points total to the unsorted columns. if (config['point_total_start_row'] !== null) { @@ -397,6 +398,7 @@ function get_ranked(response, group_name) { let teams = parse_teams_from_spreadsheet(response); let games = parse_games_from_spreadsheet(response, group_name, false); apply_games_to_teams(games, teams); + teams = filter_teams(teams, response); let tiebreakers = []; teams = rank(games, teams, 1, tiebreakers); return teams; -- 2.39.2