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

some fixes after testing

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-11 11:58:44 +02:00
parent 514e54e814
commit 4a10584733
4 changed files with 103 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
rowers/views.py
View File

@@ -2180,7 +2180,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
'the_div':div,
'js_res': js_resources,
'css_res':css_resources,
'id':id,
'id':int(id),
'mayedit':mayedit,
'workstrokesonly': not workstrokesonly,
'teams':get_my_teams(request.user),
@@ -2199,7 +2199,7 @@ def workout_test_task_view(request,id=0):
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -2232,7 +2232,7 @@ def workout_histo_view(request,id=0):
'histo_single.html',
{'interactiveplot':script,
'the_div':div,
'id':id,
'id':int(id),
'mayedit':mayedit,
'teams':get_my_teams(request.user),
})
@@ -2675,14 +2675,14 @@ def workout_recalcsummary_view(request,id=0):
messages.info(request,successmessage)
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
else:
message = "Something went wrong. Could not update summary"
messages.error(request,message)
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -2717,7 +2717,7 @@ def workout_makepublic_view(request,id,
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -2748,7 +2748,7 @@ def workout_setprivate_view(request,id,
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -3090,7 +3090,7 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
messages.info(request,successmessage)
return render(request, 'comparison_list.html',
{'id':id,
{'id':int(id),
'workout':row,
'workouts': workouts,
'last_name':u.last_name,
@@ -3171,7 +3171,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
messages.error(request,message)
return render(request, 'fusion_list.html',
{'id':id,
{'id':int(id),
'workout':row,
'workouts': workouts,
'last_name':u.last_name,
@@ -3324,17 +3324,20 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
messages.info(request,successmessage)
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
except:
os.remove(fname)
message = "Something went wrong (workout_crewnerd_summary_view)"
try:
os.remove(fname)
except:
pass
message = "Something went wrong (workout_crewnerd_summary_view)"
messages.error(request,message)
url = reverse(workout_edit_view,
kwargs = {
'id':str(id),
'id':int(id),
})
return HttpResponseRedirect(url)
else:
@@ -3403,7 +3406,7 @@ def workout_downloadwind_view(request,id=0,
messages.info(request,message)
kwargs = {
'id':str(id)}
'id':int(id)}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3411,7 +3414,7 @@ def workout_downloadwind_view(request,id=0,
message = "No latitude/longitude data"
messages.error(request,message)
kwargs = {
'id':str(id)
'id':int(id)
}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3471,7 +3474,7 @@ def workout_downloadmetar_view(request,id=0,
messages.info(request,message)
kwargs = {
'id':str(id)}
'id':int(id)}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3479,7 +3482,7 @@ def workout_downloadmetar_view(request,id=0,
message = "No latitude/longitude data"
messages.error(request,message)
kwargs = {
'id':str(id)
'id':int(id)
}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3570,7 +3573,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
message = "Invalid Form"
messages.error(request,message)
kwargs = {
'id':str(id)
'id':int(id)
}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3657,7 +3660,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
message = "Invalid Form"
messages.error(request,message)
kwargs = {
'id':str(id)}
'id':int(id)}
url = reverse(workout_wind_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3747,7 +3750,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
successmessage = "Your calculations have been submitted. You will receive an email when they are done."
messages.info(request,successmessage)
kwargs = {
'id':str(id)}
'id':int(id)}
url = reverse(workout_advanced_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -3757,7 +3760,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
message = "Invalid Form"
messages.error(request,message)
kwargs = {
'id':str(id)}
'id':int(id)}
url = reverse(workout_otwsetpower_view,kwargs=kwargs)
response = HttpResponseRedirect(url)
@@ -4384,7 +4387,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
'the_div':div,
'js_res': js_resources,
'css_res':css_resources,
'id':id,
'id':int(id),
'teams':get_my_teams(request.user),
'xparam':xparam,
'yparam1':yparam1,
@@ -4416,7 +4419,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
'js_res': js_resources,
'css_res':css_resources,
'teams':get_my_teams(request.user),
'id':id,
'id':int(id),
'xparam':xparam,
'yparam1':yparam1,
'yparam2':yparam2,
@@ -5492,7 +5495,7 @@ def workout_getstravaworkout_view(request,stravaid):
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -5513,7 +5516,7 @@ def workout_getrunkeeperworkout_view(request,runkeeperid):
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -5532,7 +5535,7 @@ def workout_getunderarmourworkout_view(request,underarmourid):
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -5557,7 +5560,7 @@ def workout_getsporttracksworkout_view(request,sporttracksid):
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -5632,7 +5635,7 @@ def workout_getc2workout_view(request,c2id):
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
return HttpResponseRedirect(url)
@@ -5777,7 +5780,7 @@ def workout_upload_view(request,
url = reverse(workout_edit_view,
kwargs = {
'id':id,
'id':int(id),
})
response = HttpResponseRedirect(url)
@@ -6113,7 +6116,7 @@ def workout_delete_confirm_view(request, id=0):
raise PermissionDenied("You are not allowed to delete this workout")
else:
return render(request,'workout_delete_confirm.html',
{'id':id,
{'id':int(id),
'teams':get_my_teams(request.user),
'workout':row})
@@ -6149,7 +6152,7 @@ def graph_delete_confirm_view(request, id=0):
raise PermissionDenied("You are not allowed to delete this workout")
else:
return render(request,'graphimage_delete_confirm.html',
{'id':id,
{'id':int(id),
'teams':get_my_teams(request.user),
'graph':img})
@@ -6274,7 +6277,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
messages.info(request,'Original Interval Data Restored')
url = reverse(workout_summary_edit_view,
kwargs={
'id':id,
'id':int(id),
}
)
return HttpResponseRedirect(url)
@@ -6411,6 +6414,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
row.save()
rowdata.write_csv(f1,gzip=True)
dataprep.update_strokedata(id,rowdata.df)
messages.info(request,"Updated interval data saved")
data = {'intervalstring':s}
form = SummaryStringForm(initial=data)
savebutton = 'savestringform'
@@ -6463,7 +6467,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
row.save()
rowdata.write_csv(f1,gzip=True)
dataprep.update_strokedata(id,rowdata.df)
messages.info(request,"Updated interval data saved")
form = SummaryStringForm()
@@ -6523,7 +6527,9 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
detailform = IntervalUpdateForm(aantal=nrintervals,initial=initial)
# render page
return render(request, 'summary_edit.html',
{'form':form,
'detailform':detailform,
@@ -6919,7 +6925,7 @@ def strokedataform(request,id=0):
{
'form':form,
'teams':get_my_teams(request.user),
'id':id,
'id':int(id),
})
elif request.method == 'POST':
form = StrokeDataForm()
@@ -6928,7 +6934,7 @@ def strokedataform(request,id=0):
{
'form':form,
'teams':get_my_teams(request.user),
'id':id,
'id':int(id),
})
# Process the POSTed stroke data according to the API definition
@@ -7219,7 +7225,7 @@ def manager_requests_view(request,code=None,message='',successmessage=''):
successmessage = ''
messages.info(request,successmessage)
message.error(request,message)
messages.error(request,message)
url = reverse(rower_teams_view,kwargs={
})
return HttpResponseRedirect(url)
@@ -7333,7 +7339,7 @@ def team_edit_view(request,id=0):
url = reverse(team_view,
kwargs={
'id':id,
'id':int(id),
}
)