Merge branch 'develop' into feature/braintree

rowers/interactiveplots.py

@@ -3899,7 +3899,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
             legend=str(id)
             
         if plottype=='line':
-            l1.append(plot.line('x','y',source=source,color=color,legend=legend))
+            l1.append(plot.line('x','y',source=source,color=color,legend=legend,line_width=2))
         else:
             l1.append(plot.scatter('x','y',source=source,color=color,legend=legend,
                          fill_alpha=0.4,line_color=None))

rowers/plannedsessions.py

@@ -1047,6 +1047,12 @@ def add_workout_indoorrace(ws,race,r,recordid=0):
         
         record.coursecompleted = True
         record.workoutid = ws[0].id
+
+        if ws[0].privacy == 'private':
+            ws[0].privacy = 'visible'
+            ws[0].save()
+            comments.append('Workouts submitted to virtual events have to be public. We have changed the workout to a public workout.')
+        
         record.save()
 
         add_workouts_plannedsession(ws,race,r)
@@ -1153,6 +1159,11 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0):
             otherrecord.coursecompleted = False
             otherrecord.save()
         
+        if ws[0].privacy == 'private':
+            ws[0].privacy = 'visible'
+            ws[0].save()
+            comments.append('Workouts submitted to virtual events have to be public. We have changed the workout to a public workout.')
+
         job = myqueue(queue,handle_check_race_course,ws[0].csvfilename,
                       ws[0].id,race.course.id,record.id,splitsecond=splitsecond)
             

rowers/templates/race_submit.html

@@ -42,6 +42,12 @@
         <input type="submit" value="Submit">
       </p>
   </li>
+  <li class="grid_4">
+    <p>
+      Warning: If you submit a workout that was marked as "private", it will
+      be made public by submitting it as a race result.
+    </p>
+  </li>
 </ul>
 
 

rowers/tests.py

@@ -432,7 +432,7 @@ class C2Objects(DjangoTestCase):
 
         
     @patch('rowers.c2stuff.requests.Session', side_effect=mocked_requests)
-    def test_c2_callback(self, mock_post):
+    def test_c2_callback(self, mock_Session):
         response = self.c.get('/call_back?code=dsdoij232s',follow=True)