From e5d2de4d35f914ed0bf6bede0e1938f31bb25602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 20 Aug 2020 11:35:42 +0200 Subject: [PATCH] =?UTF-8?q?Canceld=20FreeDrinks=20hinzugef=C3=BCgt=20und?= =?UTF-8?q?=20Bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../databaseController/dbFreeDrinkListConfigController.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geruecht/controller/databaseController/dbFreeDrinkListConfigController.py b/geruecht/controller/databaseController/dbFreeDrinkListConfigController.py index dd7a7ab..269179c 100644 --- a/geruecht/controller/databaseController/dbFreeDrinkListConfigController.py +++ b/geruecht/controller/databaseController/dbFreeDrinkListConfigController.py @@ -97,7 +97,7 @@ 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}') + 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() for data in retVal: data['timestamp'] = {'year': data['timestamp'].year,