Merge branch 'position-boxes' into v1.2.1

1 files changed, 97 insertions, 13 deletions

diff --git a/jfr_playoff/generator.py b/jfr_playoff/generator.py
index d358d86..c2fba28 100644
--- a/jfr_playoff/generator.py
+++ b/jfr_playoff/generator.py
@@ -109,33 +109,91 @@ class PlayoffGenerator(object):
 
     def get_match_box(self, match, position):
         if match is not None:
+            winner_link = [
+                str(m) for m in match.winner_matches
+            ] if match.winner_matches is not None else []
+            loser_link = [
+                str(m) for m in match.loser_matches
+            ] if match.loser_matches is not None else []
+            place_loser_link = []
+            place_winner_link = []
+            if self.page.get('starting_position_indicators', None):
+                for team in match.teams:
+                    if len(team.place) > 0:
+                        place_link = ['place-' + str(pl) for pl in team.place]
+                        if len(team.place) > 1:
+                            place_loser_link += place_link
+                        else:
+                            place_winner_link += place_link
             return self.p_temp.get(
                 'MATCH_BOX',
                 position[0], position[1],
                 match.id,
-                ' '.join([
-                    str(m) for m in match.winner_matches
-                ]) if match.winner_matches is not None else '',
-                ' '.join([
-                    str(m) for m in match.loser_matches
-                ]) if match.loser_matches is not None else '',
+                ' '.join(winner_link),
+                ' '.join(loser_link),
+                ' '.join(place_winner_link),
+                ' '.join(place_loser_link),
                 self.get_match_table(match))
         return ''
 
+    def get_starting_position_box(self, positions, dimensions):
+        if 'starting_position_indicators' not in self.page \
+           or not self.page['starting_position_indicators']:
+            return ''
+        boxes = ''
+        order = 0
+        for place in sorted(positions):
+            boxes += self.p_temp.get(
+                'STARTING_POSITION_BOX',
+                0,
+                self.page['margin'] / 2 + int(float(order) / float(len(positions)) * dimensions[1]),
+                place,
+                self.p_temp.get('POSITION_BOX', place))
+            order += 1
+        return boxes
+
+    def get_finishing_position_box(self, positions, position_info, dimensions, margin):
+        if 'finishing_position_indicators' not in self.page \
+           or not self.page['finishing_position_indicators']:
+            return ''
+        boxes = ''
+        order = 0
+        for place in sorted(positions):
+            boxes += self.p_temp.get(
+                'FINISHING_POSITION_BOX',
+                self.page['margin'] / 2 + int(float(order) / float(len(positions)) * dimensions[1]),
+                place,
+                ' '.join([str(p) for p in position_info[place]['winner']]),
+                ' '.join([str(p) for p in position_info[place]['loser']]),
+                self.p_temp.get('POSITION_BOX', place))
+            order += 1
+        return boxes
+
     def get_match_grid(self, dimensions, grid, matches):
-        canvas_size = (
+        canvas_size = [
             dimensions[0] * (
                 self.page['width'] + self.page['margin']
-            ) - self.page['margin'],
+            ) + self.page['margin'],
             dimensions[1] * (
                 self.page['height'] + self.page['margin']
-            ) - self.page['margin'])
+            ) - self.page['margin']]
+        if 'starting_position_indicators' not in self.page \
+           or not self.page['starting_position_indicators']:
+            canvas_size[0] -= self.page['margin']
+        if 'finishing_position_indicators' not in self.page \
+           or not self.page['finishing_position_indicators']:
+            canvas_size[0] -= self.page['margin']
         PlayoffLogger.get('generator').info(
             'canvas size: %s', canvas_size)
         grid_boxes = ''
         col_no = 0
+        starting_positions = set()
+        finishing_positions = {}
+        finishing_places = set()
         for phase in grid:
-            grid_x = col_no * (self.page['width'] + self.page['margin'])
+            grid_x = col_no * self.page['width'] + (col_no + 1) * self.page['margin'] \
+                     if self.page.get('starting_position_indicators', None) \
+                        else col_no * (self.page['width'] + self.page['margin'])
             grid_boxes += self.get_phase_header(phase, grid_x)
             match_height = canvas_size[1] / len(phase.matches)
             row_no = 0
@@ -144,11 +202,33 @@ class PlayoffGenerator(object):
                          int(row_no * match_height +
                              0.5 * (match_height - self.page['height']))
                 PlayoffLogger.get('generator').info(
-                    'grid box (%d, %d) position: (%d, %d)',
+                    'calculated grid box (%d, %d) position: (%d, %d)',
                     col_no, row_no, grid_x, grid_y)
+                if str(match) in self.canvas.get('box_positioning', {}):
+                    if isinstance(self.canvas['box_positioning'][str(match)], list):
+                        grid_x, grid_y = self.canvas['box_positioning'][str(match)][0:2]
+                    else:
+                        grid_y = float(self.canvas['box_positioning'][str(match)])
+                    PlayoffLogger.get('generator').info(
+                        'overridden box #%d position: (%d, %d)',
+                        match, grid_x, grid_y)
                 grid_boxes += self.get_match_box(
                     matches[match] if match is not None else None,
                     (grid_x, grid_y))
+                if match is not None:
+                    for team in matches[match].teams:
+                        starting_positions.update(team.place)
+                    for place in matches[match].loser_place + matches[match].winner_place:
+                        if place not in finishing_positions:
+                            finishing_positions[place] = {
+                                'winner': [],
+                                'loser': []
+                            }
+                        finishing_places.add(place)
+                    for place in matches[match].winner_place:
+                        finishing_positions[place]['winner'].append(match)
+                    for place in matches[match].loser_place:
+                        finishing_positions[place]['loser'].append(match)
                 row_no += 1
             col_no += 1
         return self.p_temp.get(
@@ -157,8 +237,12 @@ class PlayoffGenerator(object):
             canvas_size[0], canvas_size[1],
             ' '.join(['data-%s="%s"' % (
                 setting.replace('_', '-'), str(value)
-            ) for setting, value in self.canvas.iteritems()]),
-            grid_boxes
+            ) for setting, value in self.canvas.iteritems() if not isinstance(value, dict)]),
+            self.get_starting_position_box(starting_positions, canvas_size),
+            grid_boxes,
+            self.get_finishing_position_box(
+                finishing_places, finishing_positions, canvas_size, self.page['margin']
+            )
         )
 
     def get_leaderboard_row_class(self, position):