sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v11.96'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-03-21 09:33:18 +01:00
parent 9a000eca92 f8bb6d79b6
commit 7f16d64871
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/templates/virtualevent.html
View File

@@ -31,7 +31,7 @@
{% block main %} {% block main %}
<h1>{{ race.name }}</h1> <h1>{{ race.name }}</h1>
<p> <p>
@@ -77,7 +77,7 @@
</p> </p>
<div class="mapdiv"> <div class="mapdiv">
{{ coursediv|safe }} {{ coursediv|safe }}
{{ coursescript|safe }} {{ coursescript|safe }}
</div> </div>
</li> </li>
@@ -181,7 +181,7 @@
</td> </td>
<td> <td>
Upload a new workout to the site and submit it as a result. You Upload a new workout to the site and submit it as a result. You
need a workout data file. need a workout data file.
</td> </td>
</tr> </tr>
{% if race.sessiontype == 'indoorrace' %} {% if race.sessiontype == 'indoorrace' %}
@@ -266,7 +266,7 @@
<tr> <tr>
<td>{{ forloop.counter }}</td> <td>{{ forloop.counter }}</td>
<td> <td>
<a href="/rowers/workout/{{ result.workoutid }}"> <a href="/rowers/workout/{{ result.workoutid|encode }}">
{{ result.username }}</a></td> {{ result.username }}</a></td>
<td>{{ result.teamname }}</td> <td>{{ result.teamname }}</td>
<td>{{ result.age }}</td> <td>{{ result.age }}</td>
@@ -286,7 +286,7 @@
<td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td> <td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td>
<td>{{ result.distance }} m</td> <td>{{ result.distance }} m</td>
<td> <td>
<a href="/rowers/workout/{{ result.workoutid }}"> <a href="/rowers/workout/{{ result.workoutid|encode }}">
Details</a></td> Details</a></td>
<td> <td>
{% if race.manager == request.user and not race|is_final %} {% if race.manager == request.user and not race|is_final %}
@@ -413,7 +413,7 @@
{% else %} {% else %}
<a href="/rowers/raceregistration/togglenotification/{{ race.id }}"> <a href="/rowers/raceregistration/togglenotification/{{ race.id }}">
Subscribe to race notifications by email Subscribe to race notifications by email
</a> </a>
{% endif %} {% endif %}
{% else %} {% else %}
{% if record.emailnotifications %} {% if record.emailnotifications %}
@@ -423,7 +423,7 @@
{% else %} {% else %}
<a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}"> <a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}">
Subscribe to race notifications by email Subscribe to race notifications by email
</a> </a>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
@@ -479,7 +479,7 @@
</p> </p>
<p> <p>
The results table has a link to a page where details of your workout The results table has a link to a page where details of your workout
are shown. are shown.
</p> </p>
<p> <p>
Race results are stored permanently and are not deleted when Race results are stored permanently and are not deleted when
@@ -507,7 +507,7 @@
<p> <p>
Until the evaluation closure time, the race organizer can Until the evaluation closure time, the race organizer can
review and reject entries. If you are disqualified in this review and reject entries. If you are disqualified in this
way, you will receive an email with the reason. way, you will receive an email with the reason.
</p> </p>
</div> </div>
</li> </li>

32
rowers/views/racesviews.py
View File

@@ -2155,24 +2155,28 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
messages.info(request,"We are evaluating your result. The page will reload when we're done. Your result will show up if you adhered to the course") messages.info(request,"We are evaluating your result. The page will reload when we're done. Your result will show up if you adhered to the course")
if result: if result:
otherrecords = resultobj.objects.filter( otherrecords = resultobj.objects.filter(race = race).exclude(userid = r.id)
race = race).exclude(userid = r.id)
if not jobid: if not jobid:
messages.info(request,"Result submitted successfully.") messages.info(request,"Result submitted successfully.")
for otherrecord in otherrecords: for otherrecord in otherrecords:
otheruser = Rower.objects.get(id=otherrecord.userid) try:
othername = otheruser.user.first_name+' '+otheruser.user.last_name otheruser = Rower.objects.get(id=otherrecord.userid)
registeredname = r.user.first_name+' '+r.user.last_name othername = otheruser.user.first_name+' '+otheruser.user.last_name
if otherrecord.emailnotifications: registeredname = r.user.first_name+' '+r.user.last_name
job = myqueue( if otherrecord.emailnotifications:
queue, job = myqueue(
handle_sendemail_racesubmission, queue,
otheruser.user.email, othername, handle_sendemail_racesubmission,
registeredname, otheruser.user.email, othername,
race.name, registeredname,
race.id race.name,
) race.id
)
except Rower.DoesNotExist:
pass
# redirect to race page # redirect to race page