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

Canceld FreeDrinks hinzugefügt und Bugfix 

FreeDrinksListHistory haben jetzt auch canceld in dem steht ob das getränk storniert wurde oder nicht.
Außerdem werden die Bandfreigetränke nicht per User sondern für alle Dienste rausgesucht
This commit is contained in:
Tim Gröger 2020-08-20 11:35:42 +02:00
parent c1c3437682
commit e5d2de4d35
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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