Merge pull request #7 from AndreWohnsland/dev

Preparation for 1.5.0

.gitignore

@@ -11,5 +11,6 @@ team.db
 Cocktail_database.db
 failed_data.db
 custom_config.*
+.version.ini
 # some testing files
 tmp_*

changelog.txt

@@ -1,3 +1,12 @@
+--------------- 2021_12_30 ---------------------------------------------------------------------------------------------------------
+- Restructured maker structure to have all code within the src folder
+- Introduced migrator module to be able to make local migrations
+- Introduced updater module to programmatically check and fetch latest version from GitHub
+- Renamed German DB columns to English names
+- Introduced aditional table for failed team data buffering and according logic
+- Added new dialog method to ask a yes or no question 
+- Small code adjustments for cleaner code
+
 --------------- 2021_12_03 ---------------------------------------------------------------------------------------------------------
 - Introduced new API Model for Cocktai, Ingredient and IngredientData
 - Using new Models within Database returns and in functions

dashboard/backend/main.py

@@ -39,7 +39,7 @@ async def enter_cocktail_for_team(team: Teaminfo):
     cursor.execute(sql, (entry_datetime, team.team, team.volume,))
     conn.commit()
     conn.close()
-    return {"message": "Team entry was Successfull", "team": team.team, "volume": team.volume}
+    return {"message": "Team entry was successfull", "team": team.team, "volume": team.volume}
 
 
 def get_leaderboard(hourrange=None, limit=2, count=True):

dashboard/frontend/.env.example

@@ -0,0 +1 @@
+UI_LANGUAGE=en

dashboard/frontend/main.py

@@ -21,12 +21,12 @@
 
 DATABASE_NAME = "team"
 DIRPATH = os.path.dirname(os.path.abspath(__file__))
-load_dotenv(os.path.join(DIRPATH, ".language.env"))
+load_dotenv(os.path.join(DIRPATH, ".env"))
 database_path = os.path.join(DIRPATH, "storage", f"{DATABASE_NAME}.db")
 
 
 def __choose_language(element: dict) -> str:
-    language = os.getenv("LANGUAGE")
+    language = os.getenv("UI_LANGUAGE")
     return element.get(language, element["en"])
 
 

dashboard/qt-app/setup_leaderboard.py

@@ -4,7 +4,6 @@
 import time
 import matplotlib
 from mainwindow import Ui_Leaderboard
-# import datetime
 
 from PyQt5.QtCore import Qt, QRunnable, pyqtSlot, QObject, pyqtSignal, QThreadPool
 from PyQt5.QtWidgets import QMainWindow, qApp