Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

bugfix, free_drink_list_history wenn kein dienst 

Sollte der user, der diese liste abruft keinen dienst haben, wird nur die history der letzten halben stunde abgerufen
This commit is contained in:
Tim Gröger 2020-08-20 20:17:35 +02:00
parent e5d2de4d35
commit 7ac3813782
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geruecht/controller/databaseController/dbFreeDrinkListConfigController.py
View File

@ -97,7 +97,11 @@ class Base:
cursor = self.db.connection.cursor()
now = datetime.now()
worker = self.getWorker(user, now)
cursor.execute(f'select * from free_drink_list_history where timestamp>="{worker["startdatetime"]}" and (user_id={user.id} or free_drink_type_id=3)')
if worker:
timestamp = worker["startdatetime"]
else:
timestamp = datetime.now() - timedelta(minutes=30)
cursor.execute(f'select * from free_drink_list_history where timestamp>="{timestamp}" and (user_id={user.id} or free_drink_type_id=3)')
retVal = cursor.fetchall()
for data in retVal:
data['timestamp'] = {'year': data['timestamp'].year,