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

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()