now working on linux with mariadb
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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']
|
||||
|
||||
Reference in New Issue
Block a user