Merge branch 'release/v6.49'

rowers/courses.py

@@ -260,7 +260,7 @@ def coursetime_paths(data,paths,finalmaxmin='min'):
 
 def get_time_course(ws,course):
     coursetimeseconds = 0.0
-    coursecompleted = 0
+    coursecompleted = False
 
     w = ws[0]
     columns = ['time',' latitude',' longitude','cum_dist']

rowers/plannedsessions.py

@@ -488,12 +488,14 @@ def update_virtualrace(ps,cd):
 
 def race_rower_status(r,race):
 
-    ws = Workout.objects.filter(user=r,plannedsession=race)
+    has_registered = False
-
+    is_complete = False
-    is_complete = is_session_complete_ws(ws,race)[1]
+    
-
+    vs = VirtualRaceResult.objects.filter(userid=r.id,race=race)
-    has_registered = r in race.rower.all()
+    if vs:
-
+        has_registered = True
+        is_complete = vs[0].coursecompleted
+    
     return is_complete,has_registered
 
 def race_can_edit(r,race):

rowers/templates/email.html

@@ -92,6 +92,7 @@ When the site is down, this is the appropriate channel to look for apologies, up
   602 00 Brno<br />
   Czech Republic<br />
   IČ: 070 48 572<br />
+  Datová schránka: 7897syr<br />
   Email: <a href="mailto:info@rowsandall.com">info@rowsandall.com</a><br />
   The company is registered in the business register at the
   Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)<br/>

rowers/templates/racelist.html

@@ -4,6 +4,7 @@
     <thead>
       <tr>
         <th>Date</th>
+        <th>Registration Deadline</th>
         <th>Event</th>
         <th>Country</th>
         <th>Course</th>
@@ -14,9 +15,16 @@
   {% for race in races %}
   <tr>
     <td>{{ race.startdate }}</td>
+    <td>
+      {% if race.registration_closure %}
+      {{ race.registration_closure }}
+      {% else %}
+      {{ race.startdate }} {{ race.start_time }}
+      {% endif %}
+    </td>
     <td><a href="/rowers/virtualevent/{{ race.id }}">{{ race.name }}</a></td>
     <td>{{ race.course.country }}</td>
-    <td>{{ race.course.name }}</td>
+    <td><a href="/rowers/courses/{{ race.course.id }}">{{ race.course.name }}</a></td>
     <td>
       {% if rower %}
       {% if race|can_register:rower %}
@@ -25,6 +33,8 @@
       <a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
       {% elif race|race_complete:rower %}
       <a class="green dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
+      {% elif race|past_not_registered:rower %}
+      <a class="white dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
       {% else %}
       <a class="red dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
       {% endif %}

rowers/templates/virtualevents.html

@@ -60,11 +60,16 @@
 {% block content %}
 
 <div class="grid_12 alpha">
-  <div class="grid_2 alpha suffix_10">
+  <div class="grid_2 alpha">
     <p>
       <a class="button green small" href="/rowers/virtualevent/create">Add Race</a>
       </p>
   </div>
+  <div class="grid_2">
+    <p>
+      <a class="button green small" href="/rowers/list-courses">Courses</a>
+    </p>
+  </div>
 </div>
 
 <div class="grid_12 alpha">

rowers/templatetags/rowerfilters.py

@@ -258,7 +258,9 @@ def can_submit(race,r):
 @register.filter
 def race_complete(race,r):
     is_complete,has_registered = race_rower_status(r,race)
-    if is_complete == 'completed':
+    return is_complete
-        return True
+
-    else:
+@register.filter
-        return False
+def past_not_registered(race,r):
+    is_complete,has_registered = race_rower_status(r,race)
+    return not has_registered