Highlight the filtered game mode.

[xonotic/xonstat.git] / xonstat / views / game.py

diff --git a/xonstat/views/game.py b/xonstat/views/game.py
index 1ed1741f52eb4cbec54bf1ccbceed7f058e9cf85..f1ba46132d09f330529edf9aafa8f3f994605c2e 100644 (file)
--- a/xonstat/views/game.py
+++ b/xonstat/views/game.py
@@ -12,17 +12,25 @@ from xonstat.views.helpers import RecentGame, recent_games_q
 log = logging.getLogger(__name__)
 
 
+# DEPRECATED
 def _game_index_data(request):
-    if request.matchdict.has_key('game_type_cd'):
-        game_type_cd  = request.matchdict['game_type_cd']
-    else:
-        game_type_cd  = None
+    game_type_cd = None
+    game_type_descr = None
+
+    if request.params.has_key('game_type_cd'):
+        game_type_cd = request.params['game_type_cd']
+        try:
+            game_type_descr = DBSession.query(GameType.descr).\
+                filter(GameType.game_type_cd == game_type_cd).\
+                one()[0]
+        except Exception as e:
+            game_type_cd = None
 
     if request.params.has_key('page'):
         current_page = request.params['page']
     else:
         current_page = 1
-    
+
     try:
         rgs_q = recent_games_q(game_type_cd=game_type_cd)
 
@@ -30,22 +38,24 @@ def _game_index_data(request):
 
         # replace the items in the canned pagination class with more rich ones
         games.items = [RecentGame(row) for row in games.items]
-            
+
         pgstats = {}
         for game in games.items:
             pgstats[game.game_id] = DBSession.query(PlayerGameStat).\
                     filter(PlayerGameStat.game_id == game.game_id).\
                     order_by(PlayerGameStat.scoreboardpos).\
                     order_by(PlayerGameStat.score).all()
-                    
+
     except Exception as e:
-        games = None
-        pgstats = None
-        game_type_cd = None
+        games           = None
+        pgstats         = None
+        game_type_cd    = None
+        game_type_descr = None
 
     return {'games':games,
             'pgstats':pgstats,
             'game_type_cd':game_type_cd,
+            'game_type_descr':game_type_descr,
             }
 
 
@@ -117,10 +127,10 @@ def _game_info_data(request):
                         pwstats[pgstat.player_game_stat_id] = []
 
                     # NOTE adding pgstat to position 6 in order to display nick.
-                    # You have to use a slice [0:5] to pass to the accuracy 
+                    # You have to use a slice [0:5] to pass to the accuracy
                     # template
-                    pwstats[pgstat.player_game_stat_id].append((weapon.descr, 
-                        weapon.weapon_cd, pwstat.actual, pwstat.max, 
+                    pwstats[pgstat.player_game_stat_id].append((weapon.descr,
+                        weapon.weapon_cd, pwstat.actual, pwstat.max,
                         pwstat.hit, pwstat.fired, pgstat))
 
     except Exception as inst:
@@ -207,7 +217,9 @@ def game_finder_data(request):
     query = {}
 
     server_id, map_id, player_id = None, None, None
-    range_start, range_end = None, None
+    range_start, range_end, game_type_cd = None, None, None
+    game_type_descr = None
+
     # these become WHERE clauses when present
     if request.params.has_key('server_id'):
         server_id = request.params['server_id']
@@ -229,8 +241,18 @@ def game_finder_data(request):
         range_end = request.params['range_end']
         query['range_end'] = range_end
 
+    if request.params.has_key('type'):
+        game_type_cd = request.params['type']
+        query['type'] = game_type_cd
+        try:
+            game_type_descr = DBSession.query(GameType.descr).\
+                filter(GameType.game_type_cd == game_type_cd).\
+                one()[0]
+        except Exception as e:
+            game_type_cd = None
+
     rgs_q = recent_games_q(server_id=server_id, map_id=map_id,
-            player_id=player_id)
+            player_id=player_id, game_type_cd=game_type_cd)
 
     recent_games = Page(rgs_q, current_page, url=page_url)
 
@@ -239,6 +261,7 @@ def game_finder_data(request):
     return {
             'recent_games':recent_games,
             'query':query,
+            'game_type_cd':game_type_cd,
            }
 
 def game_finder(request):