Game Breakdown

- % elif total_stats['games_breakdown'].has_key(gtc.lower()): + % else:
- % endif - ${gtc} + % endif + ${gtc}

@@ -409,6 +415,7 @@ Player Information <% gtc_key = gtc.lower() %> % if gtc_key == "overall": <% total = total_stats['games'] %> + <% alivetime = total_stats['alivetime'] %> <% wins = total_stats['wins'] %> <% losses = total - wins %> <% kills = total_stats['kills'] %> @@ -416,6 +423,7 @@ Player Information <% suicides = total_stats['suicides'] %> % elif total_stats['games_breakdown'].has_key(gtc_key): <% total = total_stats['games_breakdown'][gtc_key] %> + <% alivetime = total_stats['games_alivetime'][gtc_key] %> <% wins = total_stats[gtc_key+'_wins'] %> <% losses = total - wins %> % if gtc_key == "ctf": @@ -430,41 +438,104 @@ Player Information <% suicides = total_stats[gtc_key+'_suicides'] %> % endif % endif - % if gtc_key == 'overall': -

- % else: + % if gtc_key == 'overall' or total_stats['games_breakdown'].has_key(gtc_key): + % if gtc_key == 'overall':

- % endif + % else: +

+ % endif +

- - - + + + + + + + + + + + + + % if gtc_key == 'ctf': - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + % else: - + + + + + + + + + + + + + + + + - + + + + + + % endif

Win Percentage:	${round(float(wins)/total * 100, 2)}%	${wins} wins, ${losses} losses	Games Played:	${total}
Playing Time:	${alivetime} hours
Win Percentage:	${round(float(wins)/total * 100, 2)}%	${wins} wins, ${losses} losses
Cap Ratio:	Caps:	${round(float(caps)/total, 2)} per game	${caps} total
Pickups:	${round(float(pickups)/total, 2)} per game	${pickups} total
Drops:	${round(float(drops)/total, 2)} per game	${drops} total
Returns:	${round(float(returns)/total, 2)} per game	${returns} total
FC Kills:	${round(float(fckills)/total, 2)} per game	${fckills} total
Cap Ratio:	${round(float(caps)/pickups, 3)}	${caps} caps, ${pickups} pickups, ${drops} drops, ${returns} returns, ${fckills} fckills

Return Ratio:	${round(float(returns)/fckills, 3)}
Kill Ratio:	Kills:	${round(float(kills)/total, 2)} per game	${kills} total
Deaths:	${round(float(deaths)/total, 2)} per game	${deaths} total
Suicides:	${round(float(suicides)/total, 2)} per game	${suicides} total
Kill Ratio:	${round(float(kills)/deaths, 3)}	${kills} kills, ${deaths} deaths, ${suicides} suicides
Suicide Ratio:	${round(float(suicides)/deaths, 3)}

+ % endif % endfor

diff --git a/xonstat/views/player.py b/xonstat/views/player.py index 6185598..0bc24b9 100644 --- a/xonstat/views/player.py +++ b/xonstat/views/player.py @@ -83,6 +83,7 @@ def _get_total_stats(player_id): games = how many games a player has played games_breakdown = how many games of given type a player has played (dictionary) + games_alivetime = how many time a player has spent in a give game type (dictionary) kills = how many kills a player has over all games deaths = how many deaths a player has over all games suicides = how many suicides a player has over all games @@ -100,7 +101,7 @@ def _get_total_stats(player_id): total_stats = {} games_played = DBSession.query( - Game.game_type_cd, func.count()).\ + Game.game_type_cd, func.count(), func.sum(PlayerGameStat.alivetime)).\ filter(Game.game_id == PlayerGameStat.game_id).\ filter(PlayerGameStat.player_id == player_id).\ group_by(Game.game_type_cd).\ @@ -109,9 +110,11 @@ def _get_total_stats(player_id): total_stats['games'] = 0 total_stats['games_breakdown'] = {} # this is a dictionary inside a dictionary .. dictception? - for (game_type_cd, games) in games_played: + total_stats['games_alivetime'] = {} + for (game_type_cd, games, alivetime) in games_played: total_stats['games'] += games total_stats['games_breakdown'][game_type_cd] = games + total_stats['games_alivetime'][game_type_cd] = alivetime # more fields can be added here, e.g. 'collects' for kh games (total_stats['kills'], total_stats['deaths'], total_stats['suicides'], -- 2.39.2