diff --git a/pyfpdb/GuiPositionalStats.py b/pyfpdb/GuiPositionalStats.py index 9346bff2..4ffffd6c 100644 --- a/pyfpdb/GuiPositionalStats.py +++ b/pyfpdb/GuiPositionalStats.py @@ -27,7 +27,7 @@ import Filters import FpdbSQLQueries class GuiPositionalStats (threading.Thread): - def __init__(self, db, config, querylist, debug=True): + def __init__(self, config, querylist, debug=True): self.debug=debug self.conf=config @@ -56,7 +56,7 @@ class GuiPositionalStats (threading.Thread): "Button2" : False } - self.filters = Filters.Filters(db, settings, config, querylist, display = filters_display) + self.filters = Filters.Filters(self.db, settings, config, querylist, display = filters_display) self.filters.registerButton1Name("Refresh") self.filters.registerButton1Callback(self.refreshStats) @@ -252,15 +252,21 @@ class GuiPositionalStats (threading.Thread): #end def fillStatsFrame(self, vbox): def refineQuery(self, query, playerids, sitenos, limits): - nametest = str(tuple(playerids)) - nametest = nametest.replace("L", "") - nametest = nametest.replace(",)",")") - query = query.replace("", nametest) + if playerids: + nametest = str(tuple(playerids)) + nametest = nametest.replace("L", "") + nametest = nametest.replace(",)",")") + query = query.replace("", nametest) + else: + query = query.replace("", "1 = 2") - blindtest = str(tuple([x for x in limits if str(x).isdigit()])) - blindtest = blindtest.replace("L", "") - blindtest = blindtest.replace(",)",")") - query = query.replace("", "gt.bigBlind in " + blindtest) + if [x for x in limits if str(x).isdigit()]: + blindtest = str(tuple([x for x in limits if str(x).isdigit()])) + blindtest = blindtest.replace("L", "") + blindtest = blindtest.replace(",)",")") + query = query.replace("", "gt.bigBlind in " + blindtest) + else: + query = query.replace("", "gt.bigBlind = -1 ") groupLevels = "Separate" not in str(limits) if groupLevels: @@ -271,7 +277,7 @@ class GuiPositionalStats (threading.Thread): else format(min(gt.bigBlind)/100.0, 0) end) ,' - ' - trim(leading ' ' from + ,trim(leading ' ' from case when max(gt.bigBlind) < 100 then format(max(gt.bigBlind)/100.0, 2) else format(max(gt.bigBlind)/100.0, 0) diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 3ed004ef..7fcf75ee 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -337,7 +337,7 @@ class fpdb: self.add_and_display_tab(ps_tab, "Player Stats") def tab_positional_stats(self, widget, data): - new_ps_thread=GuiPositionalStats.GuiPositionalStats(self.db, self.config, self.querydict) + new_ps_thread=GuiPositionalStats.GuiPositionalStats(self.config, self.querydict) self.threads.append(new_ps_thread) ps_tab=new_ps_thread.get_vbox() self.add_and_display_tab(ps_tab, "Positional Stats")