From 1064fa42f9b2df360909ce281a9a265efd127551 Mon Sep 17 00:00:00 2001 From: Steve Colburn Date: Mon, 1 Jul 2019 18:40:23 -0400 Subject: [PATCH] Addressing Issue #20 Duplicated GameTable into GameTable2 and removed the tournament_code from displaying from the page output. Tourney page changed to reflect new call. --- agagd/agagd_core/tables.py | 26 +++++++++++++++++++++++++ agagd/templates/agagd_core/tourney.html | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/agagd/agagd_core/tables.py b/agagd/agagd_core/tables.py index 0ae805f2..7b4d9c7a 100644 --- a/agagd/agagd_core/tables.py +++ b/agagd/agagd_core/tables.py @@ -13,6 +13,7 @@ def render(self, value, record, bound_column): self.attrs['td'] = {'class': 'foo'} return tables.LinkColumn.render(self, value, record, bound_column) +#Standard gameTable display as is on agagd.usgo.org and most pages class GameTable(tables.Table): pin_player_1 = WinnerColumn('W', viewname='agagd_core.views.member_detail', @@ -35,6 +36,31 @@ class Meta: "pin_player_2", 'handicap', 'komi', 'tournament_code') sequence = fields +#Modified gaeTable to remove duplicate tournament listing displayed on the page, GitHubIssue#20 +class GameTable2(tables.Table): + pin_player_1 = WinnerColumn('W', + viewname='agagd_core.views.member_detail', + verbose_name="white player", + kwargs={"member_id":tables.A('pin_player_1.member_id')}) + pin_player_2 = WinnerColumn('B', + 'agagd_core.views.member_detail', + verbose_name="black player", + kwargs={"member_id":tables.A('pin_player_2.member_id')}) + tournament_code = tables.LinkColumn( + verbose_name="Tournament", + viewname='agagd_core.views.tournament_detail', + kwargs={'tourn_code':tables.A('tournament_code.tournament_code')},) + + class Meta: + model = Game + # add class="paleblue" to tag + attrs = {"class": "paleblue"} + fields = ("game_date", "round", "pin_player_1", + "pin_player_2", 'handicap', 'komi') + sequence = fields + + + class OpponentTable(tables.Table): def __init__(self, qs, p1, *args, **kwargs): self.this_player = p1 diff --git a/agagd/templates/agagd_core/tourney.html b/agagd/templates/agagd_core/tourney.html index 99dc0830..89361915 100644 --- a/agagd/templates/agagd_core/tourney.html +++ b/agagd/templates/agagd_core/tourney.html @@ -18,6 +18,6 @@

Recreated Wall List

 {{ tournament.wall_list }} 

Games

- {% render_table game_table %} + {% render_table game_table2 %} {% endblock %}