From 3208c2d8a9e2d49fe7202bc87d384cad5fd61899 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 5 Aug 2019 22:05:31 +0200
Subject: [PATCH] now working on linux with mariadb

---
 rowers/dataprepnodjango.py     | 10 ++++++++--
 rowers/interactiveplots.py     |  3 +++
 rowsandall_app/settings_dev.py |  7 +++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py
index 2953eadf..ed9dfc5f 100644
--- a/rowers/dataprepnodjango.py
+++ b/rowers/dataprepnodjango.py
@@ -22,6 +22,7 @@ import sqlalchemy as sa
 
 from rowsandall_app.settings import DATABASES
 from rowsandall_app.settings_dev import DATABASES as DEV_DATABASES
+from rowsandall_app.settings_dev import use_sqlite
 
 from rowers.utils import lbstoN
 
@@ -58,7 +59,12 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format(
 
 database_name_dev = DEV_DATABASES['default']['NAME']
 
-database_url_debug = 'sqlite:///'+database_name_dev
+database_url_debug = database_url
+
+if use_sqlite:
+    database_url_debug = 'sqlite:///'+database_name_dev
+
+
 
 # mapping the DB column names to the CSV file column names
 columndict = {
@@ -728,7 +734,7 @@ def fitnessmetric_to_sql(m,table='powertimefitnessmetric',debug=False,
         engine = create_engine(database_url, echo=False)
         
     columns = ', '.join(m.keys())
-    if debug:
+    if use_sqlite:
         placeholders  = ", ".join(["?"] * len(m))
     else:
         placeholders  = ", ".join(["%s"] * len(m))
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index e3cedb84..5b30d4c4 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1121,6 +1121,9 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
     except TypeError:
         df = pd.DataFrame()
 
+    if df.empty:
+        return ["","no data"]
+
     groups = df.groupby(by='date').max()
 
     power4min = groups['power4min']
diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py
index 76dbb335..3f161559 100644
--- a/rowsandall_app/settings_dev.py
+++ b/rowsandall_app/settings_dev.py
@@ -27,7 +27,8 @@ if TESTING or use_sqlite:
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
             'HOST': 'localhost',
-        },
+    	    'PASSWORD': 'roeidata',
+            'PORT': '3306',        },
         #        'TEST': {
         #	    'CHARSET': 'utf8',
         #	    'COLLATION': 'utf8_general_ci',
@@ -37,9 +38,7 @@ if TESTING or use_sqlite:
         #	    'ENGINE': 'django.db.backends.mysql',
         #            'NAME': 'rowsanda_107501',
         #	    'USER': 'rowsanda_107501',
-    #	    'PASSWORD': 'roeidata',
-        #	    'HOST': 'store3.rosti.cz',
-        #	    'PORT': '3306',
+
     #	}
     }