Merge branch 'release/v16.7.1' into develop

rowers/models.py

@@ -1574,7 +1574,7 @@ class TrainingTargetForm(ModelForm):
             qs1 = Rower.objects.filter(
                 team__in=teams
             ).distinct().order_by("user__last_name","user__first_name")
-            
+
             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)
     #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,
                                        verbose_name='Interval String (optional)')
     garmin_workout_id = models.BigIntegerField(default=0)
@@ -2517,7 +2517,9 @@ class PlannedSession(models.Model):
             self.preferreddate = self.startdate
 
         #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))
             self.steps = steps
 

rowers/views/planviews.py

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