Merge branch 'release/v6.17'

rowers/templates/panel_notes.html

@@ -1,6 +1,6 @@
 <h2>Notes</h2>
 <p>
   <div class="wrapwords">
-    {{ workout.notes }}
+    {{ workout.notes|linebreaks }}
   </div>
 </p>

rowers/templates/rankings.html

@@ -57,7 +57,7 @@
       </button>
       <div class="dropdown-content">
         {% for member in user|team_members %}
-        <a class="button green small" href="/rowers/{{ member.id }}/ote-bests/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}">{{ member.first_name }} {{ member.last_name }}</a>
+        <a class="button green small" href="/rowers/{{ member.id }}/ote-bests2/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}">{{ member.first_name }} {{ member.last_name }}</a>
         {% endfor %}
     </div>
     {% else %}

rowers/views.py

@@ -12065,9 +12065,18 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
             return HttpResponseRedirect(url)
     else:
         if 'fstartdate' in request.session:
-            fstartdate = arrow.get(request.session['fstartdate']).date()
-            fenddate = arrow.get(request.session['fenddate']).date()
-            fprefdate = arrow.get(request.session['fprefdate']).date()
+            try:
+                fstartdate = arrow.get(request.session['fstartdate']).date()
+            except KeyError:
+                fastartdate = timezone.now().date()
+            try:
+                fenddate = arrow.get(request.session['fenddate']).date()
+            except KeyError:
+                fenddate = timezone.now().date()
+            try:
+                fprefdate = arrow.get(request.session['fprefdate']).date()
+            except KeyError:
+                fprefdate = timezone.now().date()
 
             forminitial = {
                 'startdate':fstartdate,
@@ -12702,8 +12711,8 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
 
     deltadays = ps.enddate-ps.startdate
     
-    ps.startdate = timezone.now()
-    ps.enddate = timezone.now()+deltadays
+    ps.startdate = timezone.now().date()
+    ps.enddate = (timezone.now()+deltadays).date()
     ps.name += ' (copy)'
     
     ps.save()