From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 22 Jan 2012 04:11:52 +0000 (-0500)
Subject: Add player_ranks to the mix - it is a batch table intended to represent the latest... 
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=commitdiff_plain;h=129a16ca216817db10b4724def90ff8d1fc75961;hp=4192fbbe4da9efb321bbae77ee3c1723d5b51442

Add player_ranks to the mix - it is a batch table intended to represent the latest rankings at any given point in time. Ideally they would be updated daily.
---

diff --git a/xonstat/models.py b/xonstat/models.py
index 50d0a35..d53e1da 100755
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -270,6 +270,20 @@ class PlayerElo(object):
                 (self.player_id, self.game_type_cd, self.elo)
 
 
+class PlayerRank(object):
+
+    def nick_html_colors(self):
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return html_colors(self.nick)
+
+
+    def __repr__(self):
+        return "<PlayerRank(pid=%s, gametype=%s, rank=%s)>" % \
+                (self.player_id, self.game_type_cd, self.rank)
+
+
 def initialize_db(engine=None):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -291,6 +305,7 @@ def initialize_db(engine=None):
     servers_table = MetaData.tables['servers']
     player_nicks_table = MetaData.tables['player_nicks']
     player_elos_table = MetaData.tables['player_elos']
+    player_ranks_table = MetaData.tables['player_ranks']
 
     # now map the tables and the objects together
     mapper(PlayerAchievement, achievements_table)
@@ -306,3 +321,4 @@ def initialize_db(engine=None):
     mapper(Server, servers_table)
     mapper(PlayerNick, player_nicks_table)
     mapper(PlayerElo, player_elos_table)
+    mapper(PlayerRank, player_ranks_table)
diff --git a/xonstat/templates/rank_index.mako b/xonstat/templates/rank_index.mako
index 3ddb7f9..75f4574 100755
--- a/xonstat/templates/rank_index.mako
+++ b/xonstat/templates/rank_index.mako
@@ -28,10 +28,10 @@ Rank Index</h2>
     <th>Elo</th>
   </tr>
 <% i = 1 %>
-% for (rank, player) in ranks:
+% for rank in ranks:
   <tr>
-    <td>${i}</td>
-    <td><a href="${request.route_url("player_info", id=rank.player_id)}" title="Go to this player's info page">${player.nick_html_colors()|n}</a></th>
+    <td>${rank.rank}</td>
+    <td><a href="${request.route_url("player_info", id=rank.player_id)}" title="Go to this player's info page">${rank.nick_html_colors()|n}</a></th>
     <td>${round(rank.elo, 3)}</th>
   </tr>
 <% i += 1 %>
@@ -39,5 +39,5 @@ Rank Index</h2>
 </table>
 
 <!-- navigation links -->
-${navlinks("rank_index_paged", ranks.page, ranks.last_page)}
+${navlinks("rank_index_paged", ranks.page, ranks.last_page, game_type_cd=game_type_cd)}
 % endif
diff --git a/xonstat/views/game.py b/xonstat/views/game.py
index 25ab408..1ce8a9a 100755
--- a/xonstat/views/game.py
+++ b/xonstat/views/game.py
@@ -3,7 +3,7 @@ import logging
 import re
 import time
 from pyramid.response import Response
-from sqlalchemy import desc
+from sqlalchemy import desc, func, over
 from webhelpers.paginate import Page, PageURL
 from xonstat.models import *
 from xonstat.util import page_url
@@ -106,10 +106,9 @@ def rank_index(request):
 
     game_type_cd = request.matchdict['game_type_cd']
 
-    ranks_q = DBSession.query(PlayerElo, Player).\
-            filter(PlayerElo.game_type_cd==game_type_cd).\
-            filter(PlayerElo.player_id==Player.player_id).\
-            order_by(PlayerElo.elo.desc())
+    ranks_q = DBSession.query(PlayerRank).\
+            filter(PlayerRank.game_type_cd==game_type_cd).\
+            order_by(PlayerRank.rank)
 
     ranks = Page(ranks_q, current_page, url=page_url)