adding drag factor
This commit is contained in:
@@ -2536,6 +2536,7 @@ class Workout(models.Model):
|
||||
max_length=100)
|
||||
distance = models.IntegerField(default=0,blank=True)
|
||||
duration = models.TimeField(default=1,blank=True)
|
||||
dragfactor = models.IntegerField(default=0,blank=True)
|
||||
trimp = models.IntegerField(default=-1,blank=True)
|
||||
rscore = models.IntegerField(default=-1,blank=True)
|
||||
hrtss = models.IntegerField(default=-1,blank=True)
|
||||
@@ -2960,6 +2961,7 @@ class WorkoutForm(ModelForm):
|
||||
'distance',
|
||||
'workouttype',
|
||||
'boattype',
|
||||
'dragfactor',
|
||||
'weightcategory',
|
||||
'adaptiveclass',
|
||||
'notes',
|
||||
|
||||
@@ -32,7 +32,18 @@ $( document ).ready(function() {
|
||||
} else {
|
||||
$('#id_boattype').toggle(false);
|
||||
$('#id_boattype').val('1x');
|
||||
}
|
||||
}
|
||||
if (
|
||||
$(this).val() == 'rower'
|
||||
|| $(this).val() == 'dynamic'
|
||||
|| $(this).val() == 'slides'
|
||||
) {
|
||||
$('#id_dragfactor').toggle(true);
|
||||
} else {
|
||||
$('#id_dragfactor').toggle(false);
|
||||
$('#id_dragfactor').val('0');
|
||||
}
|
||||
|
||||
});
|
||||
$('#id_workouttype').change();
|
||||
});
|
||||
|
||||
@@ -3345,6 +3345,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
distance = form.cleaned_data['distance']
|
||||
private = form.cleaned_data['private']
|
||||
notes = form.cleaned_data['notes']
|
||||
newdragfactor = form.cleaned_data['dragfactor']
|
||||
thetimezone = form.cleaned_data['timezone']
|
||||
|
||||
try:
|
||||
@@ -3416,6 +3417,11 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
row.timezone = thetimezone
|
||||
row.plannedsession = ps
|
||||
|
||||
dragchanged = False
|
||||
if newdragfactor != row.dragfactor:
|
||||
row.dragfactor = newdragfactor
|
||||
dragchanged = True
|
||||
|
||||
try:
|
||||
row.save()
|
||||
except IntegrityError:
|
||||
@@ -3427,6 +3433,12 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
||||
# change data in csv file
|
||||
|
||||
r = rdata(row.csvfilename)
|
||||
if dragchanged:
|
||||
try:
|
||||
r.change_drag(newdragfactor)
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
if r == 0:
|
||||
return HttpResponse("Error: CSV Data File Not Found")
|
||||
r.rowdatetime = startdatetime
|
||||
|
||||
Reference in New Issue
Block a user