From 85e7435ec4b91258580452b97a6c4d5681160f60 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 9 Nov 2021 18:39:20 +0100 Subject: [PATCH] fixes for plans --- rowers/models.py | 8 +++++--- rowers/views/planviews.py | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index fb2567cf..b371ae92 100644 --- a/rowers/models.py +++ b/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 diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index c67fa820..c5155b94 100644 --- a/rowers/views/planviews.py +++ b/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 = []