diff options
| -rw-r--r-- | src/match_up/controller.py | 9 | ||||
| -rw-r--r-- | src/match_up/utilities.py | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/match_up/controller.py b/src/match_up/controller.py index a02dd04..4c7119f 100644 --- a/src/match_up/controller.py +++ b/src/match_up/controller.py @@ -45,11 +45,14 @@ class RoundGenerator: active_teams = {} players_without_team = [] for team_id in grouped_players_by_team: - if team_id == 0 or len(grouped_players_by_team[team_id]) < 4: + if team_id == 0: players_without_team += [player for player in grouped_players_by_team[team_id]] else: - active_teams[team_id] = grouped_players_by_team[team_id] - + if len(grouped_players_by_team[team_id]) >= 4: + active_teams[team_id] = grouped_players_by_team[team_id] + else: + players_without_team += [player for player in grouped_players_by_team[team_id]] + regular_courts = len(used_courts) - len(active_teams) reg_courts = {A:N for (A,N) in [x for x in used_courts.items()][:regular_courts]} team_courts = {A:N for (A,N) in [x for x in used_courts.items()][regular_courts:]} diff --git a/src/match_up/utilities.py b/src/match_up/utilities.py index 7d7de08..fa82b58 100644 --- a/src/match_up/utilities.py +++ b/src/match_up/utilities.py @@ -126,6 +126,7 @@ def _init_database_from_csv(session, csv_location: str) -> None: first=entry["first"], last=entry["last"], level=entry["skill"], + team=entry["team"], status=False, count=0, ) |