Fix "more games played by player <blah> page.

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 9eb3599bbf2dd9273e9cf3800b3cc86f180ca354..d47c365679b6765329754d39acf83baee21c5512 100755 (executable)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -27,14 +27,15 @@ def main(global_config, **settings):
         renderer="main_index.mako")
 
     # PLAYER ROUTES
-    config.add_route("player_game_index_default",
-            "/player/{player_id:\d+}/games")
-    config.add_view(player_game_index, route_name="player_game_index_default",
+    config.add_route("player_game_index_paged",
+            "/player/{player_id:\d+}/games/page/{page:\d+}")
+    config.add_view(player_game_index, route_name="player_game_index_paged",
         renderer="player_game_index.mako")
 
     config.add_route("player_game_index",
-            "/player/{player_id:\d+}/games/page/{page:\d+}")
-    config.add_view(player_game_index, renderer="player_game_index.mako")
+            "/player/{player_id:\d+}/games")
+    config.add_view(player_game_index, route_name="player_game_index",
+        renderer="player_game_index.mako")
 
     config.add_route("player_index_paged", "/players/page/{page:\d+}")
     config.add_view(player_index, route_name="player_index_paged",

diff --git a/xonstat/templates/player_game_index.mako b/xonstat/templates/player_game_index.mako
index 60cbd3d2dcb783ad94f529fef494810b8a6a1fbd..d667f1b33e38c8f5c9fae079f0d9a688c8a5ba6f 100755 (executable)
--- a/xonstat/templates/player_game_index.mako
+++ b/xonstat/templates/player_game_index.mako
@@ -1,23 +1,32 @@
 <%inherit file="base.mako"/>
+<%namespace name="nav" file="nav.mako" />
+<%namespace file="scoreboard.mako" import="scoreboard" />
+<%namespace file="navlinks.mako" import="navlinks" />
+
+<%block name="navigation">
+${nav.nav('games')}
+</%block>
 
 <%block name="title">
-Player Game Index for ${player.nick_html_colors()|n} - ${parent.title()}
+Game Index
 </%block>
 
 % if not games:
-<h2>Sorry, no games yet. Get playing, scrub!</h2>
+<h2>Sorry, no games yet. Get playing!</h2>
 
 % else:
-<h2>Recent Games by ${player.nick_html_colors()|n}</h2>
-% for (playergamestat, 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></li>
-% endfor
-<br />
-% endif
+<div class="row">
+  <div class="span12">
+    <h2>Recent Games</h2>
+    % for (game, server, map) in games:
+    <div class="game">
+      <h4><img src="/static/images/icons/48x48/${game.game_type_cd}.png" width="30" height="30" /><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> <span class="permalink">(<a href="${request.route_url('game_info', id=game.game_id)}" name="Permalink for game #${game.game_id}">permalink</a>)</span></h4>
+      ${scoreboard(game.game_type_cd, pgstats[game.game_id])}
+    </div>
+    % endfor
+  </div>
+</div>
 
-% if games.previous_page:
-<a href="${request.route_url("player_game_index", player_id=player.player_id, page=games.previous_page)}" name="Previous Page">Previous</a>
-% endif
-% if games.next_page:
-<a href="${request.route_url("player_game_index", player_id=player.player_id, page=games.next_page)}" name="Next Page">Next</a>
+<!-- navigation links -->
+${navlinks("player_game_index_paged", games.page, games.last_page, player_id=player_id)}
 % endif

diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index ba4a84b846d6eb1372826dd437b60c84121825d2..528e736b5e29583e625e405011b4dd31a12be2e0 100755 (executable)
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -124,7 +124,7 @@ Player Information
       </tbody>
     </table>
     % if game_stats['total_games_played'] > 10:
-    <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="Game index for ${player.nick}">More games</a> played by ${player.nick_html_colors()|n}...
+    <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="Game index for ${player.nick}">More games played by ${player.nick_html_colors()|n}...</a>
     % endif
   </div>
 </div>

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 6b9c63b7984807df2eaae897950b14ff5bdee99d..fedb99b328219706ca77fada061fce97e385b6c1 100755 (executable)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -28,7 +28,7 @@ def player_index(request):
                 filter(sa.not_(Player.nick.like('Anonymous Player%'))).\\r
                 order_by(Player.player_id.desc())\r
 \r
-        players = Page(player_q, current_page, url=page_url)\r
+        players = Page(player_q, current_page, items_per_page=10, url=page_url)\r
 \r
         last_linked_page = current_page + 4\r
         if last_linked_page > players.last_page:\r
@@ -140,21 +140,26 @@ def player_game_index(request):
         current_page = 1\r
 \r
     try:\r
-        player = DBSession.query(Player).filter_by(player_id=player_id).one()\r
-\r
-        games_q = DBSession.query(PlayerGameStat, Game, Server, Map).\\r
-                filter(PlayerGameStat.player_id == player_id).\\r
-                filter(PlayerGameStat.game_id == Game.game_id).\\r
-                filter(Game.server_id == Server.server_id).\\r
-                filter(Game.map_id == Map.map_id).\\r
-                order_by(Game.game_id.desc())\r
+        games_q = DBSession.query(Game, Server, Map).\\r
+            filter(PlayerGameStat.game_id == Game.game_id).\\r
+            filter(PlayerGameStat.player_id == player_id).\\r
+            filter(Game.server_id == Server.server_id).\\r
+            filter(Game.map_id == Map.map_id).\\r
+            order_by(Game.game_id.desc())\r
 \r
         games = Page(games_q, current_page, url=page_url)\r
 \r
-        \r
+        pgstats = {}\r
+        for (game, server, map) in games:\r
+            pgstats[game.game_id] = DBSession.query(PlayerGameStat).\\r
+                    filter(PlayerGameStat.game_id == game.game_id).\\r
+                    order_by(PlayerGameStat.rank).\\r
+                    order_by(PlayerGameStat.score).all()\r
+\r
     except Exception as e:\r
         player = None\r
         games = None\r
 \r
-    return {'player':player,\r
-            'games':games}\r
+    return {'player_id':player_id,\r
+            'games':games,\r
+            'pgstats':pgstats}\r