Grapher: Make date ranges work - MySQL
This commit is contained in:
parent
2d700820f4
commit
db6a8c5b31
|
@ -650,6 +650,8 @@ class FpdbSQLQueries:
|
||||||
INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
|
INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
|
||||||
where pl.id in <player_test>
|
where pl.id in <player_test>
|
||||||
AND pl.siteId in <site_test>
|
AND pl.siteId in <site_test>
|
||||||
|
AND h.handStart > '<startdate_test>'
|
||||||
|
AND h.handStart < '<enddate_test>'
|
||||||
AND hp.tourneysPlayersId IS NULL
|
AND hp.tourneysPlayersId IS NULL
|
||||||
GROUP BY hp.handId, hp.winnings, h.handStart, hp.ante
|
GROUP BY hp.handId, hp.winnings, h.handStart, hp.ante
|
||||||
ORDER BY h.handStart"""
|
ORDER BY h.handStart"""
|
||||||
|
|
|
@ -112,6 +112,12 @@ class GuiGraphViewer (threading.Thread):
|
||||||
def getRingProfitGraph(self, names, sites):
|
def getRingProfitGraph(self, names, sites):
|
||||||
tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
|
tmp = self.sql.query['getRingProfitAllHandsPlayerIdSite']
|
||||||
# print "DEBUG: getRingProfitGraph"
|
# print "DEBUG: getRingProfitGraph"
|
||||||
|
start_date, end_date = self.__get_dates()
|
||||||
|
|
||||||
|
if start_date == '':
|
||||||
|
start_date = '1970-01-01'
|
||||||
|
if end_date == '':
|
||||||
|
end_date = '2020-12-12'
|
||||||
|
|
||||||
#Buggered if I can find a way to do this 'nicely' take a list of intergers and longs
|
#Buggered if I can find a way to do this 'nicely' take a list of intergers and longs
|
||||||
# and turn it into a tuple readale by sql.
|
# and turn it into a tuple readale by sql.
|
||||||
|
@ -125,6 +131,8 @@ class GuiGraphViewer (threading.Thread):
|
||||||
#Must be a nicer way to deal with tuples of size 1 ie. (2,) - which makes sql barf
|
#Must be a nicer way to deal with tuples of size 1 ie. (2,) - which makes sql barf
|
||||||
tmp = tmp.replace("<player_test>", nametest)
|
tmp = tmp.replace("<player_test>", nametest)
|
||||||
tmp = tmp.replace("<site_test>", sitetest)
|
tmp = tmp.replace("<site_test>", sitetest)
|
||||||
|
tmp = tmp.replace("<startdate_test>", start_date)
|
||||||
|
tmp = tmp.replace("<enddate_test>", end_date)
|
||||||
|
|
||||||
# print "DEBUG: sql query:"
|
# print "DEBUG: sql query:"
|
||||||
# print tmp
|
# print tmp
|
||||||
|
|
Loading…
Reference in New Issue
Block a user