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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-08 09:35:11 +02:00
parent dcb207fb20
commit 15f489e086
4 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rowers/views.py
View File

@@ -3604,6 +3604,7 @@ def addmanual_view(request):
distance = form.cleaned_data['distance']
notes = form.cleaned_data['notes']
thetimezone = form.cleaned_data['timezone']
private = form.cleaned_data['private']
try:
boattype = request.POST['boattype']
except KeyError:
@@ -3617,6 +3618,11 @@ def addmanual_view(request):
except KeyError:
rankingpiece =- Workout.objects.get(id=id).rankingpiece
if private:
privacy = 'private'
else:
privacy = 'visible'
startdatetime = (str(date) + ' ' + str(starttime))
startdatetime = datetime.datetime.strptime(startdatetime,
"%Y-%m-%d %H:%M:%S")
@@ -3628,10 +3634,10 @@ def addmanual_view(request):
id,message = dataprep.create_row_df(r,
distance,
weightcategory,
# weightcategory,
duration,startdatetime,
title = name,
notes=notes,
# title = name,
# notes=notes,
workouttype=workouttype)
@@ -3642,7 +3648,12 @@ def addmanual_view(request):
if id:
w = Workout.objects.get(id=id)
w.rankingpiece = rankingpiece or is_ranking_piece(w)
w.privacy = privacy
w.weightcategory = weightcategory
w.notes = notes
w.name = name
w.workouttype = workouttype
w.boattype = boattype
w.save()
messages.info(request,'New workout created')
@@ -7541,7 +7552,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
def instroke_view(request,id=0):
row = get_workout(id)
form = WorkoutForm(instance=row)
# form = WorkoutForm(instance=row)
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
# check if user is owner of this workout
@@ -7573,7 +7584,7 @@ def instroke_view(request,id=0):
def workout_geeky_view(request,id=0,message="",successmessage=""):
row = get_workout(id)
form = WorkoutForm(instance=row)
# form = WorkoutForm(instance=row)
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
rowdata = rrdata(csvfile=row.csvfilename)
instrokemetrics = rowdata.get_instroke_columns()
@@ -8131,7 +8142,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
def workout_advanced_view(request,id=0,message="",successmessage=""):
row = get_workout(id)
form = WorkoutForm(instance=row)
# form = WorkoutForm(instance=row)
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
for i in g:
try:
@@ -8851,7 +8862,7 @@ def workout_export_view(request,id=0, message="", successmessage=""):
rkuserid = 0
form = WorkoutForm(instance=row)
# form = WorkoutForm(instance=row)
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
for i in g:
try:
@@ -10175,11 +10186,13 @@ def workout_getc2workout_view(request,c2id):
distance,
duration,
startdatetime,
title = 'Imported from C2',
# title = 'Imported from C2',
workouttype=workouttype)
w = Workout.objects.get(id=id)
w.uploadedtoc2 = c2id
w.name = 'Imported from C2'
w.workouttype = 'rower'
w.save()
message = "This workout does not have any stroke data associated with it. We created synthetic stroke data."