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

ordering in mysql

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-22 14:33:36 +02:00
parent 964416362d
commit 6de6a0dae1
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -1911,12 +1911,12 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
# columns=cls, # columns=cls,
# )) # ))
elif len(ids) == 1: elif len(ids) == 1:
query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid={id}'.format( query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid={id} ORDER BY time ASC'.format(
id=ids[0], id=ids[0],
columns=cls, columns=cls,
)) ))
else: else:
query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid IN {ids}'.format( query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid IN {ids} ORDER BY time ASC'.format(
columns=cls, columns=cls,
ids=tuple(ids), ids=tuple(ids),
)) ))
@@ -1953,7 +1953,7 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
def read_df_sql(id): def read_df_sql(id):
engine = create_engine(database_url, echo=False) engine = create_engine(database_url, echo=False)
df = pd.read_sql_query(sa.text('SELECT * FROM strokedata WHERE workoutid={id}'.format( df = pd.read_sql_query(sa.text('SELECT * FROM strokedata WHERE workoutid={id} ORDER BY time ASC'.format(
id=id)), engine) id=id)), engine)
engine.dispose() engine.dispose()

42
rowers/interactiveplots.py
View File

@@ -2699,11 +2699,11 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if datadf.empty: if datadf.empty:
return "","No Valid Data Available" return "","No Valid Data Available"
else: #else:
try: # try:
datadf.sort_values(by='time',ascending=True,inplace=True) # datadf.sort_values(by='time',ascending=True,inplace=True)
except KeyError: # except KeyError:
return "","No valid data available" # return "","No valid data available"
try: try:
spm = datadf['spm'] spm = datadf['spm']
@@ -2715,10 +2715,6 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
except KeyError: except KeyError:
datadf['pace'] = 0 datadf['pace'] = 0
#datadf,row = dataprep.getrowdata_db(id=id)
#if datadf.empty:
#return "","No Valid Data Available"
source = ColumnDataSource( source = ColumnDataSource(
datadf datadf
) )
@@ -3526,11 +3522,11 @@ def interactive_flex_chart2(id=0,promember=0,
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if rowdata.empty: if rowdata.empty:
return "","No valid data",'','',workstrokesonly return "","No valid data",'','',workstrokesonly
else: #else:
try: # try:
rowdata.sort_values(by='time',ascending=True,inplace=True) # rowdata.sort_values(by='time',ascending=True,inplace=True)
except KeyError: # except KeyError:
pass # pass
workoutstateswork = [1,4,5,8,9,6,7] workoutstateswork = [1,4,5,8,9,6,7]
workoutstatesrest = [3] workoutstatesrest = [3]
@@ -4094,11 +4090,11 @@ def thumbnails_set(r,id,favorites):
'notes':"" 'notes':""
}] }]
else: # else:
try: # try:
rowdata.sort_values(by='time',ascending=True,inplace=True) # rowdata.sort_values(by='time',ascending=True,inplace=True)
except KeyError: # except KeyError:
pass # pass
l = len(rowdata) l = len(rowdata)
maxlength = 50 maxlength = 50
@@ -4673,13 +4669,13 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
if rowdata1.empty: if rowdata1.empty:
return "","No Valid Data Available" return "","No Valid Data Available"
else: # else:
rowdata1.sort_values(by='time',ascending=True,inplace=True) # rowdata1.sort_values(by='time',ascending=True,inplace=True)
if rowdata2.empty: if rowdata2.empty:
return "","No Valid Data Available" return "","No Valid Data Available"
else: # else:
rowdata2.sort_values(by='time',ascending=True,inplace=True) # rowdata2.sort_values(by='time',ascending=True,inplace=True)
try: try:
x1 = rowdata1.loc[:,xparam] x1 = rowdata1.loc[:,xparam]