summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-03-26 21:52:19 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-03-26 21:52:19 +0200
commit49e80a350afc920bc69dc7fdff81f4190114e2f4 (patch)
tree72d755ee9515a9ec28acb810c2b3c995eb17b6a3
parentf2f0fc19f4171c44a7e6bd5b724c3f31a78e6283 (diff)
downloadminionlivesmatter-1.6.0.tar.gz
minionlivesmatter-1.6.0.zip
do not crash on empty values1.6.0
-rw-r--r--api.py2
-rw-r--r--templates/index.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/api.py b/api.py
index 361531d..adecc66 100644
--- a/api.py
+++ b/api.py
@@ -40,7 +40,7 @@ def update_vals():
data["minions_per_kraken"] = sql_val("SELECT (SUM(match.duration)/60*5) / SUM(roster.kraken_captures) FROM match JOIN roster ON roster.match_api_id=match.api_id WHERE match.created_at > NOW() - '1 day'::INTERVAL")
data["minion_candies"] = sql_val("SELECT SUM((item_uses->>'*1041_Item_MinionCandy*')::INT) FROM participant WHERE created_at > NOW() - '1 day'::INTERVAL")
logging.warning("still calculating…")
- data["infusions_secs"] = sql_val("SELECT (24*60*60) / (SUM((participant.item_uses->>'*1052_Item_WeaponInfusion*')::INT) + SUM((participant.item_uses->>'*1053_Item_CrystalInfusion*')::INT))::FLOAT FROM participant JOIN roster ON participant.roster_api_id=roster.api_id JOIN match ON roster.match_api_id=match.api_id WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
+ data["infusions_secs"] = sql_val("SELECT (24*60*60) / (SUM((participant.item_uses->>'*1052_Item_WeaponInfusion*')::INT) + SUM((participant.item_uses->>'*1053_Item_CrystalInfusion*')::INT)) FROM participant JOIN roster ON participant.roster_api_id=roster.api_id JOIN match ON roster.match_api_id=match.api_id WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
data["scout_traps"] = sql_val("SELECT SUM((item_uses->>'*1054_Item_ScoutTrap*')::INT) FROM participant WHERE participant.created_at > NOW() - '1 day'::INTERVAL")
data["saw_turrets"] = sql_val("SELECT SUM(turret_kills) FROM participant WHERE hero='*SAW*' AND created_at > NOW() - '1 day'::INTERVAL")
data["matches"] = sql_val("SELECT COUNT(*) FROM match WHERE created_at > NOW() - '1 day'::INTERVAL")
diff --git a/templates/index.html b/templates/index.html
index 93a5e1c..195cdf6 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -248,7 +248,7 @@
<div class="content">
<div class="price">
<h6>every</h6>
- <h4>{{ data.infusions_secs | int }}<b class="currency"><br/>seconds</b></h4>
+ <h4>{{ data.infusions_secs }}<b class="currency"><br/>seconds</b></h4>
</div>
<p class="description">a hero gets high.</p>
</div>