From: Ant Zucaro <azucaro@gmail.com>
Date: Mon, 23 May 2011 17:05:13 +0000 (-0400)
Subject: Show scoreboard on index page to avoid monotony. Only CTF supported right now.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b116c5bf4a4d3140384f1e2b4fcbac8ed53aa61b;p=xonotic%2Fxonstat.git

Show scoreboard on index page to avoid monotony. Only CTF supported right now.
---

diff --git a/xonstat/templates/game_index.mako b/xonstat/templates/game_index.mako
index 2e90840..8024184 100755
--- a/xonstat/templates/game_index.mako
+++ b/xonstat/templates/game_index.mako
@@ -9,11 +9,55 @@ Game Index - ${parent.title()}
 
 % else:
 <h2>Recent Games</h2>
-<ul>
 % for (game, server, map) in games:
-   <li><a href="${request.route_url("game_info", id=game.game_id)}" name="Game info page for game #${game.game_id}">#${game.game_id}:</a> <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a></li>
+<p>
+   <a href="${request.route_url("map_info", id=map.map_id)}" name="Map info page for ${map.name}">${map.name}</a> on <a href="${request.route_url("server_info", id=server.server_id)}" name="Server info page for ${server.name}">${server.name}</a> (<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a> for this game)
+<table border="1" cellpadding="3">
+    % if game.game_type_cd == 'ctf':
+    <tr>
+        <td>Nick</td>
+        <td>Team</td>
+        <td>Kills</td>
+        <td>Captures</td>
+        <td>Pickups</td>
+        <td>Flag Carrier Kills</td>
+        <td>Returns</td>
+        <td>Score</td>
+        <td>Accuracy</td>
+    </tr>
+
+% for pgstat in pgstats[game.game_id]:
+    <tr>
+        <td>
+        % if pgstat.player_id > 2:
+          <a href="${request.route_url("player_info", id=pgstat.player_id)}"
+           title="Go to the info page for this player">
+          ${pgstat.nick_html_colors()}
+          </a>
+        % else:
+          ${pgstat.nick_html_colors()}
+        % endif
+        </td>
+        <td>${pgstat.team}</td>
+        <td>${pgstat.kills}</td>
+        <td>${pgstat.captures}</td>
+        <td>${pgstat.pickups}</td>
+        <td>${pgstat.carrier_frags}</td>
+        <td>${pgstat.returns}</td>
+        <td>${pgstat.score}</td>
+        <td>
+        % if pgstat.player_id > 1:
+          <a href="${request.route_url("player_weapon_stats", game_id=pgstat.game_id, pgstat_id=pgstat.player_game_stat_id)}"
+           title="View weapon accuracy details for this player in this game">
+          View
+          </a>
+        % endif
+        </td>
+    </tr>
+% endfor
+</table>
+% endif
 % endfor
-</ul>
 % endif
 
 % if games.previous_page:
diff --git a/xonstat/views.py b/xonstat/views.py
index 3cf5d05..36afef4 100755
--- a/xonstat/views.py
+++ b/xonstat/views.py
@@ -127,7 +127,15 @@ def game_index(request):
 
     games = Page(games_q, current_page, url=page_url)
 
-    return {'games':games}
+    pgstats = {}
+    for (game, server, map) in games:
+        pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
+                filter(PlayerGameStat.game_id == game.game_id).\
+                order_by(PlayerGameStat.rank).\
+                order_by(PlayerGameStat.score).all()
+
+    return {'games':games, 
+            'pgstats':pgstats}
 
 
 def game_info(request):