sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v3.82'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-22 19:43:54 +02:00
parent a2456b7a94 909f3405fe
commit 4f50526fb6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/dataprepnodjango.py
View File

@@ -455,7 +455,7 @@ def new_workout_from_file(r,f2,
return (id,message,f2) return (id,message,f2)
def delete_strokedata(id,debug=True): def delete_strokedata(id,debug=False):
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
else: else:
@@ -471,7 +471,7 @@ def delete_strokedata(id,debug=True):
conn.close() conn.close()
engine.dispose() engine.dispose()
def update_strokedata(id,df,debug=True): def update_strokedata(id,df,debug=False):
delete_strokedata(id) delete_strokedata(id)
if debug: if debug:
print "updating ",id print "updating ",id
@@ -498,7 +498,7 @@ def getsmallrowdata_db(columns,ids=[]):
def read_cols_df_sql(ids,columns,debug=True): def read_cols_df_sql(ids,columns,debug=False):
columns = list(columns)+['distance','spm'] columns = list(columns)+['distance','spm']
columns = [x for x in columns if x != 'None'] columns = [x for x in columns if x != 'None']
columns = list(set(columns)) columns = list(set(columns))
@@ -532,7 +532,7 @@ def read_cols_df_sql(ids,columns,debug=True):
return df return df
def read_df_sql(id,debug=True): def read_df_sql(id,debug=False):
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
print "read_df",id print "read_df",id
@@ -593,7 +593,7 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
empower=True,debug=True,inboard=0.88,forceunit='lbs'): empower=True,debug=False,inboard=0.88,forceunit='lbs'):
if rowdatadf.empty: if rowdatadf.empty:
if debug: if debug: