diff --git a/rowers/models.py b/rowers/models.py index 1627147c..7aec7bbd 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1556,7 +1556,6 @@ class InstantPlan(models.Model): uuid = models.UUIDField(primary_key=False,editable=True,default=uuid.uuid4) owner = models.ForeignKey(User,on_delete=models.SET_NULL,null=True) name = models.CharField(max_length=150,blank=True) - url = models.CharField(max_length=200,blank=True, verbose_name="URL Link to plan origin") goal = models.CharField(max_length=150,blank=True,verbose_name="Goal (one sentence)") description = models.TextField(max_length=450,blank=True) duration = models.IntegerField(default=6,verbose_name='Duration in Calendar Days') @@ -1597,7 +1596,6 @@ class InstantPlanForm(ModelForm): 'target', 'hoursperweek', 'sessionsperweek', - 'url', 'yaml', ] @@ -2349,8 +2347,8 @@ class PlannedSession(models.Model): sessionvalue = models.IntegerField(default=60,verbose_name='Value') - approximate_distance = models.IntegerField(default=10000,verbose_name='Approximate Distance') - approximate_duration = models.IntegerField(default=60,verbose_name='Approximate Duration') + approximate_distance = models.IntegerField(default=0,verbose_name='Approximate Distance') + approximate_duration = models.IntegerField(default=0,verbose_name='Approximate Duration') max_nr_of_workouts = models.IntegerField( default=0,verbose_name='Maximum number of workouts' diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index e4097cc6..3a9e2ca3 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -32,7 +32,9 @@ {% if key == 'comment' %} {{ value.0 }}{{ value.1|linebreaks|urlshorten:"50" }} {% else %} + {% if value.1 %} {{ value.0 }}{{ value.1 }} + {% endif %} {% endif %} {% endif %}