diff options
| author | emkael <emkael@tlen.pl> | 2017-08-01 13:41:27 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2017-08-01 13:41:27 +0200 |
| commit | ca21319b59b3188582b70a78965729b9131dd409 (patch) | |
| tree | 307102d542ff2dd030dfa97b5580bb8860be03f7 | |
| parent | 7f76c56ab258c8978c39507eb997852e2280449d (diff) | |
Additional properties in DTOs
| -rw-r--r-- | jfr_playoff/data.py | 12 | ||||
| -rw-r--r-- | jfr_playoff/dto.py | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/jfr_playoff/data.py b/jfr_playoff/data.py index 3952c64..997b038 100644 --- a/jfr_playoff/data.py +++ b/jfr_playoff/data.py @@ -10,11 +10,12 @@ class PlayoffData(object): self.database = PlayoffDB(self.settings.get('database')) self.phases = self.settings.get('phases') self.teams = self.settings.get('teams') + self.grid = [] self.match_info = {} self.leaderboard = [] def generate_phases(self): - grid = [] + self.grid = [] for phase in self.phases: phase_count = len(phase['matches']) if 'dummies' in phase: @@ -30,14 +31,18 @@ class PlayoffData(object): phase_pos += 1 phase_object.matches[phase_pos] = match['id'] phase_pos += 1 - grid.append(phase_object) - return grid + self.grid.append(phase_object) + return self.grid def fill_match_info(self): self.match_info = {} for phase in self.phases: for match in phase['matches']: self.match_info[match['id']] = self.get_match_info(match) + if self.match_info[match['id']].running > 0: + for phase_obj in self.grid: + if match['id'] in phase_obj.matches: + phase_obj.running = True if self.match_info[match['id']].link is None: self.match_info[match['id']].link = phase['link'] else: @@ -107,6 +112,7 @@ class PlayoffData(object): def get_match_info(self, match): info = Match() + info.id = match['id'] info.winner_matches = [] info.loser_matches = [] for i in range(0, 2): diff --git a/jfr_playoff/dto.py b/jfr_playoff/dto.py index 9a72a12..bf3e16a 100644 --- a/jfr_playoff/dto.py +++ b/jfr_playoff/dto.py @@ -3,6 +3,7 @@ class Team(object): score = 0.0 class Match(object): + id = None teams = None running = 0 link = None @@ -15,5 +16,6 @@ class Phase(object): title = None link = None matches = [] + running = False __all__ = ['Team', 'Match', 'Phase'] |