Merge branch 'release/v10.70'

rowers/models.py

@@ -1398,6 +1398,7 @@ class TrainingPlan(models.Model):
     status = models.BooleanField(default=True,verbose_name='Active')
     target = models.ForeignKey(TrainingTarget,blank=True,null=True,on_delete=models.SET_NULL)
     startdate = models.DateField(default=current_day)
+    notes = models.CharField(blank=True,null=True,max_length=200,verbose_name='Plan Notes')
     enddate = models.DateField(
         default=half_year_from_now)
 
@@ -1476,11 +1477,12 @@ class TrainingPlan(models.Model):
 class TrainingPlanForm(ModelForm):
     class Meta:
         model = TrainingPlan
-        fields = ['name','target','startdate','enddate','status','rowers']
+        fields = ['name','target','startdate','enddate','status','notes','rowers']
 
         widgets = {
             'startdate': AdminDateWidget(),
-            'enddate': AdminDateWidget()
+            'enddate': AdminDateWidget(),
+            'notes': forms.Textarea()
             }
 
     def __init__(self,*args, **kwargs):

rowers/templates/trainingplan.html

@@ -24,6 +24,11 @@
   The training plan target is: {{ plan.target.name }} on {{ plan.target.date }}.
   {% endif %}
 </p>
+
+<h2>Notes</h2>
+<p>
+  {{ plan.notes }}
+  </p>
 {% if plan|mayeditplan:request %}
 <p><a href="/rowers/editplan/{{ plan.id }}">Edit the plan</a></p>
 {% endif %}
@@ -303,7 +308,7 @@
                           </th>
                         </tr>
                         {% if todays_date <= microcycle.enddate %}
-                        {% if microcycle.plan.type == 'userdefined'  %} 
+                        {% if microcycle.plan.type == 'userdefined'  %}
                         <tr>
                           <td>&nbsp;</td>
                         </tr>
@@ -381,7 +386,7 @@
                         </tr>
                         <tr>
                           <td colspan="4">
-                            {% if microcycle|mayeditplan:request %}                            
+                            {% if microcycle|mayeditplan:request %}
                             <a href="/rowers/microcycle/{{ microcycle.id }}">edit</a>
                             /
                             <a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a>
@@ -427,7 +432,7 @@
   The gray "filler"
   cycles are generated, adjusted and deleted automatically to
   ensure the entire plan
-  duration is covered with non-overlapping cycles. 
+  duration is covered with non-overlapping cycles.
   Once you edit a filler cycle, it become a user-defined
   cycle, which cannot be deleted
   by the system.</p>

rowers/views/planviews.py

@@ -1557,7 +1557,7 @@ def plannedsession_totemplate_view(request,id=0):
     ps.enddate = datetime.date(1970,1,1)
     ps.save()
 
-    url = reverse(plannedsession_create_view,kwargs={'userid':request.user.id})
+    url = reverse(plannedsession_create_view,kwargs={'userid':r.user.id})
 
     startdatestring = startdate.strftime('%Y-%m-%d')
     enddatestring = enddate.strftime('%Y-%m-%d')
@@ -2021,6 +2021,7 @@ def rower_create_trainingplan(request,userid=0):
             startdate = form.cleaned_data['startdate']
             status = form.cleaned_data['status']
             enddate = form.cleaned_data['enddate']
+            notes = form.cleaned_data['notes']
 
             try:
                 athletes = form.cleaned_data['rowers']
@@ -2033,6 +2034,7 @@ def rower_create_trainingplan(request,userid=0):
                 manager=themanager,
                 startdate=startdate,
                 enddate=enddate,status=status,
+				notes=notes,
             )
 
             p.save()

rowers/views/workoutviews.py

@@ -5171,12 +5171,11 @@ def workout_split_view(request,id=0):
                 ids,mesgs = dataprep.split_workout(
                     r,row,splitsecond,splitmode
                 )
+                for message in mesgs:
+                    messages.info(request,message)
             except IndexError:
                 messages.error(request,"Something went wrong in Split")
 
-            for message in mesgs:
-                messages.info(request,message)
-
 
             if request.user == r:
                 url = reverse('workouts_view')

static/rigging/1x.json

@@ -0,0 +1 @@
+{"Lin":0.9,"Mb":14,"BladeLength":0.46,"Lscull":2.425,"Nrowers":1,"RowOrScull":"scull","Span":1.6,"CatchAngle":-0.93,"DragForm":0.98}

static/rigging/2-.json

@@ -0,0 +1 @@
+{"Lin":1.14,"Mb":27,"BladeLength":0.46,"Lscull":2.975,"Nrowers":2,"RowOrScull":"row","Span":1.6,"CatchAngle":-0.93,"DragForm":1.05}

static/rigging/2x.json

@@ -0,0 +1 @@
+{"Lin":0.9,"Mb":27,"BladeLength":0.46,"Lscull":2.425,"Nrowers":2,"RowOrScull":"scull","Span":1.6,"CatchAngle":-0.93,"DragForm":1.05}

static/rigging/4-.json

@@ -0,0 +1 @@
+{"Lin":1.14,"Mb":50,"BladeLength":0.545,"Lscull":2.9325,"Nrowers":4,"RowOrScull":"row","Span":1.6,"CatchAngle":-0.93,"DragForm":1}

static/rigging/4x.json

@@ -0,0 +1 @@
+{"Lin":0.9,"Mb":52,"BladeLength":0.46,"Lscull":2.425,"Nrowers":4,"RowOrScull":"scull","Span":1.6,"CatchAngle":-0.93,"DragForm":1.11}

static/rigging/8+.json

@@ -0,0 +1 @@
+{"Lin":1.14,"Mb":151,"BladeLength":0.545,"Lscull":2.9325,"Nrowers":8,"RowOrScull":"row","Span":1.6,"CatchAngle":-0.93,"DragForm":1}