From de9c8abb10785f0944ffbb066826e1338dfcf029 Mon Sep 17 00:00:00 2001
From: Ant Zucaro <azucaro@gmail.com>
Date: Tue, 13 Nov 2012 23:02:56 -0500
Subject: [PATCH] Provide an option to show elo deltas on the game info page.

I was tired of looking at the actual elo deltas by bouncing
between the player_info and game_info pages for several
players just to see their collective elo delta values. This
provides a query parameter "show_elo" to the game info page
to show the extra elo delta column.

As a bonus, the up/down/neutral arrows on the player_info
page will take you to a scoreboard page where those values
are shown.
---
 xonstat/templates/game_info.mako   |  2 +-
 xonstat/templates/player_info.mako | 20 +++++++++++---------
 xonstat/templates/scoreboard.mako  | 23 +++++++++++++++++++++--
 xonstat/views/game.py              |  8 ++++++++
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/xonstat/templates/game_info.mako b/xonstat/templates/game_info.mako
index 0e3a383..44d1f9c 100644
--- a/xonstat/templates/game_info.mako
+++ b/xonstat/templates/game_info.mako
@@ -42,7 +42,7 @@ Game Information
 <div class="row">
   <div class="span12 game">
     <h3>Scoreboard</h3>
-    ${scoreboard(game.game_type_cd, pgstats)}
+    ${scoreboard(game.game_type_cd, pgstats, show_elo)}
   </div>
 </div>
 
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 2ae8709..4ad859b 100644
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -457,17 +457,19 @@ Player Information
            </td>
            <td><span class="abstime" data-epoch="${game.epoch()}" title="${game.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${game.fuzzy_date()}</span></td>
            <td class="tdcenter">
-             % if gamestat.elo_delta is not None:
-               % if round(gamestat.elo_delta,2) > 0:
-               <span title="Elo went up by ${round(gamestat.elo_delta,2)}"><i class="icon-arrow-up icon-white"></i></span>
-               % elif round(gamestat.elo_delta,2) < 0:
-               <span title="Elo went down by ${round(-gamestat.elo_delta,2)}"><i class="icon-arrow-down icon-white"></i></span>
+             <a href="${request.route_url('game_info', id=game.game_id, _query={'show_elo':1})}" title="View detailed information about this game">
+               % if gamestat.elo_delta is not None:
+                 % if round(gamestat.elo_delta,2) > 0:
+                 <span title="Elo went up by ${round(gamestat.elo_delta,2)}"><i class="icon-arrow-up icon-white"></i></span>
+                 % elif round(gamestat.elo_delta,2) < 0:
+                 <span title="Elo went down by ${round(-gamestat.elo_delta,2)}"><i class="icon-arrow-down icon-white"></i></span>
+                 % else:
+                 <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
+                 % endif
                % else:
-               <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
+                 <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
                % endif
-             % else:
-               <span title="Elo did not change"><i class="icon-minus icon-white"></i></span>
-             % endif
+             </a>
            </td>
         </tr>
       % endfor
diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 1ce98e8..5064bb1 100644
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -1,4 +1,4 @@
-<%def name="scoreboard(game_type_cd, pgstats)">
+<%def name="scoreboard(game_type_cd, pgstats, show_elo=False)">
 <table  class="table table-bordered table-condensed">
 ${scoreboard_header(game_type_cd, pgstats[0])}
   <tbody>
@@ -19,8 +19,15 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
         ${int(round(pgstat.avg_latency))}
       </td>
       % endif
-    ${scoreboard_row(game_type_cd, pgstat)}
+      ${scoreboard_row(game_type_cd, pgstat)}
       <td>${pgstat.score}</td>
+      % if show_elo:
+        % if pgstat.elo_delta is not None:
+        <td>${round(pgstat.elo_delta,2)}</td>
+        % else:
+        <td>-</td>
+        % endif
+      % endif
     </tr>
   % endfor
   </tbody>
@@ -40,6 +47,9 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       <th class="deaths">Deaths</th>
       <th class="suicides">Suicides</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
@@ -57,6 +67,9 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       <th class="fck" title="Flag Carrier Kill">FCK</th>
       <th class="returns">Returns</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
@@ -70,6 +83,9 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       % endif
       <th class="kills">Kills</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
@@ -85,6 +101,9 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       <th class="deaths">Deaths</th>
       <th class="suicides">Suicides</th>
       <th class="score">Score</th>
+      % if show_elo:
+      <th>Elo Change</th>
+      % endif
     </tr>
     </thead>
 % endif
diff --git a/xonstat/views/game.py b/xonstat/views/game.py
index 2e088b8..f9389e0 100644
--- a/xonstat/views/game.py
+++ b/xonstat/views/game.py
@@ -55,6 +55,12 @@ def game_index_json(request):
 
 def _game_info_data(request):
     game_id = request.matchdict['id']
+
+    if request.params.has_key('show_elo'):
+        show_elo = True
+    else:
+        show_elo = False
+
     try:
         notfound = False
 
@@ -104,6 +110,7 @@ def _game_info_data(request):
         pgstats = None
         pwstats = None
         captimes = None
+        show_elo = False
         raise inst
 
     return {'game':game,
@@ -112,6 +119,7 @@ def _game_info_data(request):
             'pgstats':pgstats,
             'pwstats':pwstats,
             'captimes':captimes,
+            'show_elo':show_elo,
             }
 
 
-- 
2.39.2