Add styles to make the headers vertical.

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

diff --git a/xonstat/views/helpers.py b/xonstat/views/helpers.py
index ec7219323f4a9e948f4ef3356aa81b3f35e93ed0..82ae6564d02041efb69d54485ef41d757e6dea44 100644 (file)
--- a/xonstat/views/helpers.py
+++ b/xonstat/views/helpers.py
@@ -1,9 +1,11 @@
 import logging
-import sqlalchemy.sql.expression as expr
+from calendar import timegm
 from datetime import datetime
+
+import sqlalchemy.sql.expression as expr
 from sqlalchemy.orm import aliased
-from xonstat.models import *
-from xonstat.util import *
+from xonstat.models import DBSession, Server, Map, Game, PlayerGameStat, GameType
+from xonstat.util import pretty_date, html_colors
 
 log = logging.getLogger(__name__)
 
@@ -72,7 +74,7 @@ class RecentGame(object):
 
 def recent_games_q(server_id=None, map_id=None, player_id=None,
         game_type_cd=None, cutoff=None, force_player_id=False,
-        start_game_id=None, end_game_id=None):
+        start_game_id=None, end_game_id=None, player_id_2=None):
     '''
     Returns a SQLA query of recent game data. Parameters filter
     the results returned if they are provided. If not, it is
@@ -119,6 +121,12 @@ def recent_games_q(server_id=None, map_id=None, player_id=None,
                 filter(Game.game_id==pgstat_alias.game_id).\
                 filter(Game.players.contains([player_id])).\
                 filter(pgstat_alias.player_id==player_id)
+
+            # supports versus queries
+            if player_id_2 is not None:
+                recent_games_q = recent_games_q.\
+                        filter(Game.players.contains([player_id, player_id_2]))
+
     else:
         recent_games_q = recent_games_q.\
             filter(PlayerGameStat.scoreboardpos==1)