Skip to content

Commit

Permalink
Addressing Issue #20
Browse files Browse the repository at this point in the history
Duplicated GameTable into GameTable2 and removed the tournament_code from displaying from the page output. Tourney page changed to reflect new call.
  • Loading branch information
vash3g committed Jul 1, 2019
1 parent 3c9d2bc commit 1064fa4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
26 changes: 26 additions & 0 deletions agagd/agagd_core/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 <table> 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
Expand Down
2 changes: 1 addition & 1 deletion agagd/templates/agagd_core/tourney.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ <h3> Recreated Wall List </h3>
<pre> {{ tournament.wall_list }} </pre>

<h3> Games </h3>
{% render_table game_table %}
{% render_table game_table2 %}

{% endblock %}

0 comments on commit 1064fa4

Please sign in to comment.