diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 01557032..0059162f 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -816,7 +816,7 @@ def new_workout_from_df(r,df, timestr = strftime("%Y%m%d-%H%M%S") - csvfilename ='media/Fusion_'+timestr+'.csv' + csvfilename ='media/df_'+timestr+'.csv' df.rename(columns = columndict,inplace=True) diff --git a/rowers/views.py b/rowers/views.py index 1f920fcc..0a268c8a 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -146,7 +146,7 @@ USER_LANGUAGE = 'en-US' from interactiveplots import * # Define the API documentation -schema_view = get_swagger_view(title='Rowsandall API (Unstable)') +schema_view = get_swagger_view(title='Rowsandall API') # Custom error pages with Rowsandall headers def error500_view(request): @@ -7985,6 +7985,9 @@ def strokedatajson(request,id): # currently only returns a subset. columns = ['spm','time','hr','pace','power','distance'] datadf = dataprep.getsmallrowdata_db(columns,ids=[id]) + with open('media/apilog.log','a') as logfile: + logfile.write(str(timezone.now())+": ") + logfile.write(request.user.username+"(GET) \n") return JSONResponse(datadf) if request.method == 'POST': @@ -8032,6 +8035,10 @@ def strokedatajson(request,id): starttime = totimestamp(row.startdatetime)+time unixtime = starttime+time + + with open('media/apilog.log','a') as logfile: + logfile.write(starttime+": ") + logfile.write(request.user.username+"(POST) \r\n") data = pd.DataFrame({'TimeStamp (sec)':unixtime, ' Horizontal (meters)': distance, @@ -8049,6 +8056,7 @@ def strokedatajson(request,id): ' ElapsedTime (sec)':time, }) + # Following part should be replaced with dataprep.new_workout_from_df timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S") csvfilename ='media/Import_'+timestr+'.csv' diff --git a/rowsanda_107501 b/rowsanda_107501 index f2d56d0f..a01511d5 100644 Binary files a/rowsanda_107501 and b/rowsanda_107501 differ