Remove <ul>s, center tables, and tweak the team colors a bit.

[xonotic/xonstat.git] / xonstat / models.py

diff --git a/xonstat/models.py b/xonstat/models.py
old mode 100644 (file)
new mode 100755 (executable)
index 8046279..bcebb9c
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -3,12 +3,17 @@ from sqlalchemy.orm import mapper
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
+from xonstat.util import strip_colors, html_colors
 
 DBSession = scoped_session(sessionmaker())
 Base = declarative_base()
 
 # define objects for all tables
 class Player(object):
+
+    def nick_html_colors(self):
+        return html_colors(self.nick)
+
     def __repr__(self):
         return "<Player(%s, %s, %s, %s)>" % (self.player_id, self.nick, 
                 self.create_dt, self.location)
@@ -76,6 +81,24 @@ class PlayerGameStat(object):
         return "<PlayerGameStat(%s, %s, %s, %s)>" \
         % (self.player_id, self.game_id, self.create_dt, self.stat_type)
 
+    def nick_stripped(self):
+        return strip_colors(self.nick)
+
+    def nick_html_colors(self):
+        return html_colors(self.nick)
+
+    def team_html_color(self):
+        # blue
+        if self.team == 5:
+            return "#312AB1"
+        # red
+        if self.team == 14:
+            return "#FF0033"
+        if self.team == 13:
+            return "#FFFF00"
+        if self.team == 10:
+            return "#FF00FF"
+
 
 class GameMutator(object):
     def __repr__(self):
@@ -94,7 +117,7 @@ class PlayerAchievement(object):
 
 class PlayerWeaponStat(object):
     def __repr__(self):
-        return "<PlayerWeaponStat(%s, %s, %s)>" % (self.player_weapon_stat_id,
+        return "<PlayerWeaponStat(%s, %s, %s)>" % (self.player_weapon_stats_id,
                 self.player_id, self.game_id)