From 95270b1f32ff946879cc9d8d7d4fe5f33b3a2868 Mon Sep 17 00:00:00 2001 From: emkael Date: Tue, 20 Feb 2018 22:59:46 +0100 Subject: If swiss is still not finished, display a running link --- jfr_playoff/data.py | 3 ++- jfr_playoff/generator.py | 2 +- jfr_playoff/template.py | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'jfr_playoff') diff --git a/jfr_playoff/data.py b/jfr_playoff/data.py index 83f5d6c..7f29bb2 100644 --- a/jfr_playoff/data.py +++ b/jfr_playoff/data.py @@ -138,7 +138,8 @@ class PlayoffData(object): return [{ 'link': self.get_swiss_link(event), 'position': event['position'], - 'label': event['label'] if 'label' in event else None + 'label': event['label'] if 'label' in event else None, + 'finished': TournamentInfo(event, self.database).is_finished() } for event in self.swiss] def get_dimensions(self): diff --git a/jfr_playoff/generator.py b/jfr_playoff/generator.py index bb18bb9..49ae3a4 100644 --- a/jfr_playoff/generator.py +++ b/jfr_playoff/generator.py @@ -129,7 +129,7 @@ class PlayoffGenerator(object): event_label = p_temp.SWISS_DEFAULT_LABEL % (event['position']) if 'label' in event and event['label'] is not None: event_label = event['label'] - info.append(p_temp.SWISS_LINK % ( + info.append((p_temp.SWISS_LINK if event['finished'] else p_temp.SWISS_RUNNING_LINK) % ( event['link'], event_label )) return '\n'.join(info) diff --git a/jfr_playoff/template.py b/jfr_playoff/template.py index 3296461..b814026 100644 --- a/jfr_playoff/template.py +++ b/jfr_playoff/template.py @@ -134,4 +134,8 @@ SWISS_LINK = ''' [ %s ]

''' +SWISS_RUNNING_LINK = ''' +[  %s  ]

+''' + SWISS_DEFAULT_LABEL = 'Turniej o %d. miejsce' -- cgit v1.2.3