forked from rDrama/rDrama
better stats
parent
2c694c27de
commit
aa5c4297e0
|
@ -1105,10 +1105,7 @@ class User(Base):
|
|||
@property
|
||||
@lazy
|
||||
def winnings(self):
|
||||
from_casino = g.db.query(func.sum(CasinoGame.winnings)).filter(CasinoGame.user_id == self.id).one()[0]
|
||||
from_casino_value = from_casino or 0
|
||||
|
||||
return from_casino_value + self.total_lottery_winnings
|
||||
return g.db.query(func.sum(CasinoGame.winnings)).filter(CasinoGame.user_id == self.id).one()[0]
|
||||
|
||||
@lazy
|
||||
def show_sig(self, v):
|
||||
|
|
|
@ -220,7 +220,8 @@
|
|||
<div class="mt-3" id="profile--info">
|
||||
<p id="profile--info--id">User ID: {{u.id}}</p>
|
||||
<p id="profile--info--truescore">True score: {{u.truescore}}</p>
|
||||
<p id="profile--info--winnings">Casino and lottery winnings: {{u.winnings}}</p>
|
||||
<p id="profile--info--casino-winnings">Casino winnings: {{u.winnings}}</p>
|
||||
<p id="profile--info--lottery-winnings">Lottery winnings: {{u.total_lottery_winnings}}</p>
|
||||
<p id="profile--info--hats-owned" {% if u.num_of_owned_hats >= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})</p>
|
||||
<p id="profile--info--spent">Coins spent on awards: {{u.coins_spent}}</p>
|
||||
<p id="profile--info--spent">Coins spent on hats: {{u.coins_spent_on_hats}}</p>
|
||||
|
@ -489,7 +490,8 @@
|
|||
<div id="profile-mobile--info">
|
||||
<p id="profile-mobile--info--id">User ID: {{u.id}}</p>
|
||||
<p id="profile-mobile--info--truescore">True score: {{u.truescore}}</p>
|
||||
<p id="profile-mobile--info--winnings">Casino and lottery winnings: {{u.winnings}}</p>
|
||||
<p id="profile-mobile--info--casino-winnings">Casino winnings: {{u.winnings}}</p>
|
||||
<p id="profile-mobile--info--lottery-winnings">Lottery winnings: {{u.total_lottery_winnings}}</p>
|
||||
<p id="profile-mobile--info--hats-owned" {% if u.num_of_owned_hats >= hats_total %}class="profile-owned-all-hats"{% endif %}>{{u.num_of_owned_hats}} / {{hats_total}} hats owned ({{hats_owned_percent}})</p>
|
||||
<p id="profile-mobile--info--spent">Coins spent on awards: {{u.coins_spent}}</p>
|
||||
<p id="profile-mobile--info--spent">Coins spent on hats: {{u.coins_spent_on_hats}}</p>
|
||||
|
|
Loading…
Reference in New Issue