Merge branch 'release/v15.6.3'

rowers/templates/templatelibrary.html

@@ -27,7 +27,7 @@
     <p>
       Sharing a session makes it available to all Rowsandall users on Self-Coach and Coach plans, so they can
       use it in their own training plans. You can make the session private again at any time, but users
-      can save your session in their own private libraries.
+      can save your session in their own private libraries. Click on the lock icon to toggle sharing/private.
     </p>
     <table width="90%" class="listtable shortpadded">
       <thead>
@@ -36,11 +36,9 @@
           <th align="left">Type</th>
           <th align="left">Mode</th>
           <th align="left">Value</th>
-          <th align="left">Private/Public</th>
+          <th align="left">Private/Shared</th>
           <th align="left">Edit</th>
           <th align="left">Copy to Calendar</th>
-          <th align="left">Share</th>
-          <th align="left">Make Private</th>
           <th align="left">Delete</th>
         </tr>
       </thead>
@@ -59,9 +57,23 @@
           <td> {{ ps.sessionvalue }} {{ ps.sessionunit }}</td>
           <td>
             {% if ps.is_public %}
-            <i class="fas fa-lock-open-alt"></i>
+            {% if ps.manager == request.user %}
+            <a class="small"
+               href="/rowers/sessions/{{ ps.id }}/makeprivate/">
+               <i class="fas fa-lock-open fa-fw"></i>
+             </a>
+             {% else %}
+             <i class="fas fa-lock-open fa-fw"></i>
+             {% endif %}
             {% else %}
-            <i class="fas fa-lock-alt"></i>
+            {% if ps.manager == request.user %}
+            <a class="small"
+               href="/rowers/sessions/{{ ps.id }}/share/">
+               <i class="fas fa-lock fa-fw"></i>
+             </a>
+             {% else %}
+             <i class="fas fa-lock fa-fw"></i>
+             {% endif %}
             {% endif %}
           </td>
           <td>

rowers/utils.py

@@ -859,9 +859,18 @@ def step_to_string(step):
         targettype = None
 
     if targettype == 'HeartRate':
-        value = step['targetValue']
-        valuelow = step['targetValueLow']
-        valuehigh = step['targetValueHigh']
+        try:
+            value = step['targetValue']
+        except KeyError:
+            value = 0
+        try:
+            valuelow = step['targetValueLow']
+        except KeyError:
+            valuelow = 0
+        try:
+            valuehigh = step['targetValueHigh']
+        except KeyError:
+            valuehigh = 0
 
         if value < 10 and value>0:
             target = 'Target: Heart Rate in zone {v}'.format(v=value)
@@ -877,9 +886,18 @@ def step_to_string(step):
                     h = valuehigh+100
                 )
     elif targettype == 'Power':
-        value = step['targetValue']
-        valuelow = step['targetValueLow']
-        valuehigh = step['targetValueHigh']
+        try:
+            value = step['targetValue']
+        except KeyError:
+            value = 0
+        try:
+            valuelow = step['targetValueLow']
+        except KeyError:
+            valuelow = 0
+        try:
+            valuehigh = step['targetValueHigh']
+        except KeyError:
+            valuehigh = 0
 
         if value < 10 and value>0:
             target = 'Target: Power in zone {v}'.format(v=value)
@@ -895,9 +913,18 @@ def step_to_string(step):
                     h = valuehigh-1000
                 )
     elif targettype == 'Speed':
-        value = step['targetValue']
-        valuelow = step['targetValueLow']
-        valuehigh = step['targetValueHigh']
+        try:
+            value = step['targetValue']
+        except KeyError:
+            value = 0
+        try:
+            valuelow = step['targetValueLow']
+        except KeyError:
+            valuelow = 0
+        try:
+            valuehigh = step['targetValueHigh']
+        except KeyError:
+            valuehigh = 0
 
         if value != 0:
             v = value/1000.