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

Merge branch 'release/v16.7.1'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-11-09 18:39:34 +01:00
parent f7d580575d 85e7435ec4
commit e28b82b4a5
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/models.py
View File

@@ -1574,7 +1574,7 @@ class TrainingTargetForm(ModelForm):
qs1 = Rower.objects.filter( qs1 = Rower.objects.filter(
team__in=teams team__in=teams
).distinct().order_by("user__last_name","user__first_name") ).distinct().order_by("user__last_name","user__first_name")
self.fields['rowers'].queryset = qs1 self.fields['rowers'].queryset = qs1
@@ -2419,7 +2419,7 @@ class PlannedSession(models.Model):
fitfile = models.FileField(upload_to=get_file_path,blank=True,null=True) fitfile = models.FileField(upload_to=get_file_path,blank=True,null=True)
#steps_json = models.TextField(max_length=10000,default=None,blank=True,null=True) #steps_json = models.TextField(max_length=10000,default=None,blank=True,null=True)
steps = PlannedSessionStepField(default={},null=True) steps = PlannedSessionStepField(default={},null=True,max_length=1000)
interval_string = models.TextField(max_length=1000,default=None,blank=True,null=True, interval_string = models.TextField(max_length=1000,default=None,blank=True,null=True,
verbose_name='Interval String (optional)') verbose_name='Interval String (optional)')
garmin_workout_id = models.BigIntegerField(default=0) garmin_workout_id = models.BigIntegerField(default=0)
@@ -2517,7 +2517,9 @@ class PlannedSession(models.Model):
self.preferreddate = self.startdate self.preferreddate = self.startdate
#super(PlannedSession,self).save(*args, **kwargs) #super(PlannedSession,self).save(*args, **kwargs)
if self.fitfile: if self.steps:
steps = self.steps
elif self.fitfile:
steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name)) steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name))
self.steps = steps self.steps = steps

4
rowers/plannedsessions.py
View File

@@ -1060,10 +1060,10 @@ def create_sessions_from_json(plansteps,rower,startdate,manager):
pass pass
preferreddate = planstartdate+timedelta(days=day['order']) preferreddate = planstartdate+timedelta(days=day['order'])
ps = PlannedSession( ps = PlannedSession(
startdate = preferreddate-timedelta(days=preferreddate.weekday()), startdate = preferreddate-timedelta(days=preferreddate.weekday()),
enddate = preferreddate+timedelta(days=-preferreddate.weekday(),weeks=1), enddate = preferreddate+timedelta(days=-preferreddate.weekday()-1,weeks=1),
preferreddate = preferreddate, preferreddate = preferreddate,
sessionsport = sessionsport, # change this sessionsport = sessionsport, # change this
name = workout['workoutName'], name = workout['workoutName'],

1
rowers/views/planviews.py
View File

@@ -2587,6 +2587,7 @@ def rower_view_instantplan(request,id='',userid=0):
return HttpResponseRedirect(reverse('rower_select_instantplan')) return HttpResponseRedirect(reverse('rower_select_instantplan'))
plansteps = response.json() plansteps = response.json()
trainingdays = plansteps['trainingDays'] trainingdays = plansteps['trainingDays']
trainingdays2 = [] trainingdays2 = []