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

updates on api

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-19 21:54:58 +02:00
parent 818cfdfe1d
commit 519f1edae4
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/views/apiviews.py
View File

@@ -111,6 +111,10 @@ def strokedatajson_v2(request,id):
return JSONResponse(data)
if request.method == 'POST':
with open('media/apilog.log','a') as logfile:
print(str(timezone.now()))
logfile.write(str(timezone.now())+": ")
logfile.write(request.user.username+"(POST) \n")
checkdata, r = dataprep.getrowdata_db(id=row.id)
if not checkdata.empty:
return HttpResponse("Duplicate Error",status=409)
@@ -226,6 +230,15 @@ def strokedatajson_v2(request,id):
except KeyError:
hr = 0*df['time']
try:
latitude = df['latitude']
except KeyError:
latitude = 0*df['time']
try:
longitude = df['longitude']
except KeyError:
longitude = 0*df['time']
starttime = totimestamp(row.startdatetime)+time[0]
@@ -256,6 +269,8 @@ def strokedatajson_v2(request,id):
'wash':wash,
'driveenergy':driveenergy,
'peakforceangle':peakforceangle,
' latitude': latitude,
' longitude': longitude,
})
r = getrower(request.user)
@@ -286,7 +301,12 @@ def strokedatajson_v2(request,id):
datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True,empower=True)
return(HttpResponse(encoder.encode_hex(row.id),status=201))
return(JsonResponse(
{"workout public id":encoder.encode_hex(row.id),
"workout private id":row.id,
"status":"success",
}))
#return(HttpResponse(encoder.encode_hex(row.id),status=201))
return HttpResponseNotAllowed("Method not supported")
@@ -316,11 +336,16 @@ def strokedatajson(request,id):
columns = ['spm','time','hr','pace','power','distance']
datadf = dataprep.getsmallrowdata_db(columns,ids=[id])
with open('media/apilog.log','a') as logfile:
print(str(timezone.now()))
logfile.write(str(timezone.now())+": ")
logfile.write(request.user.username+"(GET) \n")
return JSONResponse(datadf)
if request.method == 'POST':
with open('media/apilog.log','a') as logfile:
print(str(timezone.now()))
logfile.write(str(timezone.now())+": ")
logfile.write(request.user.username+"(POST) \n")
checkdata,r = dataprep.getrowdata_db(id=row.id)
if not checkdata.empty:
return HttpResponse("Duplicate Error",status=409)