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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-04 14:55:16 +01:00
parent 769eab2692 2364c06c1f
commit b2802f9285
3 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/interactiveplots.py
View File

@@ -497,9 +497,17 @@ def interactive_chart(id=0,promember=0):
TOOLS = 'pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
datadf,row = dataprep.getrowdata_db(id=id)
columns = ['time','pace','hr']
datadf = dataprep.getsmallrowdata_db(columns,ids=[id])
row = Workout.objects.get(id=id)
if datadf.empty:
return "","CSV Data File Not Found"
else:
datadf.sort_values(by='time',ascending=True,inplace=True)
#datadf,row = dataprep.getrowdata_db(id=id)
#if datadf.empty:
#return "","CSV Data File Not Found"
source = ColumnDataSource(
datadf
@@ -930,16 +938,18 @@ def interactive_flex_chart2(id=0,promember=0,
'peakforceangle': 20,
}
rowdata,row = dataprep.getrowdata_db(id=id)
#columns = [xparam,yparam1,yparam2,
# 'ftime','distance','fpace',
# 'power','hr','spm',
# 'time','pace']
#rowdata = dataprep.getsmallrowdata_db(columns,ids=[id])
#row = Workout.objects.get(id=id)
#rowdata,row = dataprep.getrowdata_db(id=id)
columns = [xparam,yparam1,yparam2,
'ftime','distance','fpace',
'power','hr','spm',
'time','pace','workoutstate']
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id])
row = Workout.objects.get(id=id)
if rowdata.empty:
return "","CSV Data File Not Found"
else:
rowdata.sort_values(by='time',ascending=True,inplace=True)
workoutstateswork = [1,4,5,8,9,6,7]
workoutstatesrest = [3]
workoutstatetransition = [0,2,10,11,12,13]

19
rowers/tests.py
View File

@@ -434,9 +434,24 @@ class ViewTest(TestCase):
response = self.c.get('/rowers/workout/1/histo', form_data, follow=True)
self.assertEqual(response.status_code, 200)
form_data = {
'name':'aap',
'date':'2016-11-05',
'starttime':'09:07:14',
'duration':'1:00:00.5',
'distance':'15000',
'workouttype':'rower',
'notes':'noot mies',
}
form = WorkoutForm(data=form_data)
self.assertTrue(form.is_valid())
response = self.c.post('/rowers/workout/1/edit', form_data, follow=True)
self.assertRedirects(response,
expected_url='/rowers/workout/1/edit/s/Changes%20saved',
status_code=302,target_status_code=200)
w = Workout.objects.get(id=1)
w = Workout.objects.get(id=1)
f_to_be_deleted = w.csvfilename
os.remove(f_to_be_deleted)

4
rowers/views.py
View File

@@ -2871,6 +2871,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
return HttpResponse("Error: CSV Data File Not Found")
r.rowdatetime = startdatetime
r.write_csv(row.csvfilename)
dataprep.update_strokedata(id,r.df)
successmessage = "Changes saved"
url = "/rowers/workout/"+str(row.id)+"/edit"
url = reverse(workout_edit_view,
@@ -4213,6 +4214,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
return HttpResponse("Error: CSV Data File Not Found")
rowdata.restoreintervaldata()
rowdata.write_csv(f1)
dataprep.update_strokedata(id,rowdata.df)
intervalstats = rowdata.allstats()
row.summary = intervalstats
row.save()
@@ -4297,6 +4299,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
row.notes += "\n"+s
row.save()
rowdata.write_csv(f1)
dataprep.update_strokedata(id,rowdata.df)
data = {'intervalstring':s}
form = SummaryStringForm(initial=data)
savebutton = 'savestringform'
@@ -4348,6 +4351,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
row.notes += "\n"+s
row.save()
rowdata.write_csv(f1)
dataprep.update_strokedata(id,rowdata.df)
form = SummaryStringForm()