From c0b676cc81e63f393e250c11c81ab26dc896adec Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Jun 2020 15:53:27 +0200 Subject: [PATCH 1/3] points as float --- rowers/models.py | 4 ++-- rowers/tasks.py | 2 +- rowers/templates/virtualevent.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index dd533aa0..7f7d7df0 100644 --- a/rowers/models.py +++ b/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', diff --git a/rowers/tasks.py b/rowers/tasks.py index 9c74aab9..f1eb59d8 100644 --- a/rowers/tasks.py +++ b/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), diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index fc4936a9..e4b744ea 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -324,7 +324,7 @@ {{ result.duration |durationprint:"%H:%M:%S.%f" }} {{ result.distance }} m {% if race.coursestandards %} - {{ result.points }} + {{ result.points|sigdig:2 }} {% endif %} From 3720af9ff67181d0a0bacf9485a5ca5a84b7301f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Jun 2020 17:25:54 +0200 Subject: [PATCH 2/3] sig fig --- rowers/templates/virtualevent.html | 2 +- rowers/templatetags/rowerfilters.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index e4b744ea..90685498 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -324,7 +324,7 @@ {{ result.duration |durationprint:"%H:%M:%S.%f" }} {{ result.distance }} m {% if race.coursestandards %} - {{ result.points|sigdig:2 }} + {{ result.points|sigdig:4 }} {% endif %} diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 6a60d032..b8532593 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -112,6 +112,7 @@ def sigdig(value, digits = 3): return value places = digits - order - 1 + print(places,digits,order) if places > 0: fmtstr = "%%.%df" % (places) else: From d037ae2354be534605d36d03922995ba78af77c2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Jun 2020 17:44:00 +0200 Subject: [PATCH 3/3] fixing messaging --- rowers/tasks.py | 6 ++++-- rowers/templates/virtualracemessage.html | 4 ++++ rowers/templatetags/rowerfilters.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index f1eb59d8..405434d4 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -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 ', + fullemail,subject, + template,d,cc=[fromemail],**kwargs) @app.task def handle_sendemail_message(email,fromemail,rowername,message,teamname,managername, diff --git a/rowers/templates/virtualracemessage.html b/rowers/templates/virtualracemessage.html index 0319f093..33d03a1b 100644 --- a/rowers/templates/virtualracemessage.html +++ b/rowers/templates/virtualracemessage.html @@ -6,5 +6,9 @@ {{ message }}

+

+ This email was sent on behalf of the challenge organizer, who was copied on this message. +

+ {% endblock %} diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index b8532593..b43268c0 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -112,7 +112,7 @@ def sigdig(value, digits = 3): return value places = digits - order - 1 - print(places,digits,order) + if places > 0: fmtstr = "%%.%df" % (places) else: