Merge branch 'release/v12.86'

rowers/models.py

@@ -2965,7 +2965,7 @@ class VirtualRaceResult(models.Model):
     race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
     duration = models.TimeField(default=datetime.time(1,0))
     distance = models.IntegerField(default=0)
-    points = models.IntegerField(default=0)
+    points = models.FloatField(default=0)
     boatclass = models.CharField(choices=boatclasses,
                                    max_length=40,
                                    default='water',
@@ -3052,7 +3052,7 @@ class IndoorVirtualRaceResult(models.Model):
     duration = models.TimeField(default=datetime.time(1,0))
     distance = models.IntegerField(default=0)
     referencespeed = models.FloatField(default=5.0)
-    points = models.IntegerField(default=0)
+    points = models.FloatField(default=0)
     boatclass = models.CharField(choices=boatclasses,
                                    max_length=40,
                                    default='rower',

rowers/tasks.py

@@ -494,7 +494,7 @@ def handle_check_race_course(self,
         if coursedistance == 0:
             coursedistance = coursemeters
         velo = coursedistance/coursetimeseconds
-        points = int(100*(2.-referencespeed/velo))
+        points = 100*(2.-referencespeed/velo)
         query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format(
             recordid=recordid,
             duration=totaltime_sec_to_string(coursetimeseconds),
@@ -2336,14 +2336,16 @@ def handle_sendemailnewcomment(first_name,
 @app.task
 def handle_send_template_email(template,email,fromemail,rowername,
                                subject,message,debug=False,**kwargs):
+
     fullemail = [email]
     d = {
         'message':message,
         'rowername':rowername,
         }
 
-    res = send_template_email(fromemail,fullemail,subject,
-                              template,d,**kwargs)
+    res = send_template_email('Rowsandall <info@rowsandall.com>',
+                              fullemail,subject,
+                              template,d,cc=[fromemail],**kwargs)
 
 @app.task
 def handle_sendemail_message(email,fromemail,rowername,message,teamname,managername,

rowers/templates/virtualevent.html

@@ -324,7 +324,7 @@
               <td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td>
               <td>{{ result.distance }} m</td>
               {% if race.coursestandards %}
-              <td>{{ result.points }}</td>
+              <td>{{ result.points|sigdig:4 }}</td>
               {% endif %}
               <td>
                 <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">

rowers/templates/virtualracemessage.html

@@ -6,5 +6,9 @@
  {{ message }}
 </p>
 
+<p>
+  This email was sent on behalf of the challenge organizer, who was copied on this message.
+  </p>
+
 
 {% endblock %}

rowers/templatetags/rowerfilters.py

@@ -112,6 +112,7 @@ def sigdig(value, digits = 3):
         return value
 
     places = digits - order - 1
+
     if places > 0:
         fmtstr = "%%.%df" % (places)
     else: