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

some improvements in races

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-17 10:05:30 +02:00
parent eaaab0d2ab
commit 4698c96b2b
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/templates/racelist.html
View File

@@ -16,12 +16,12 @@
<tbody>
{% for race in races %}
<tr>
<td>{{ race.startdate }}</td>
<td>{{ race.startdate|date:"Y-m-d" }}</td>
<td>
{% if race.registration_closure %}
{{ race.registration_closure }}
{{ race.registration_closure|date:"Y-m-d H:i e" }}
{% else %}
{{ race.startdate }} {{ race.start_time }}
{{ race.startdate|date:"Y-m-d" }} {{ race.start_time }}
{% endif %}
</td>
<td><a href="/rowers/virtualevent/{{ race.id }}">{{ race.name }}</a></td>
@@ -42,7 +42,7 @@
{% elif race|can_submit:rower %}
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% elif race|future_registered:rower %}
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% elif race|past_not_registered:rower %}
<a class="blue dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% else %}

31
rowers/templates/virtualevent.html
View File

@@ -2,6 +2,7 @@
{% load staticfiles %}
{% load rowerfilters %}
{% load leaflet_tags %}
{% load tz %}
{% block meta %}
{% leaflet_js %}
@@ -83,6 +84,7 @@
</li>
{% endif %}
<li class="grid_2">
{% localtime off %}
<div id="raceinfo">
<p>
<h2>Race Information</h2>
@@ -99,7 +101,7 @@
<th>Indoor Race</th><td>To be rowed on a Concept2 ergometer</td>
</tr>
<tr>
<th>Time Zone</th><td>{{ race.timezone }}</td>
<th>Event Time Zone</th><td>{{ race.timezone }}</td>
</tr>
{% endif %}
<tr>
@@ -108,18 +110,28 @@
</th><td>{{ race.sessionvalue }} {{ race.sessionunit }}
</td>
</tr>
<tr>
<th>Date</th><td>{{ race.startdate|date:"Y-m-d" }}</td>
</tr>
<tr>
<th>Race Window</th><td>{{ race.startdate|date:"Y-m-d" }} {{ race.start_time|time:"H:i e" }} to {{ race.enddate|date:"Y-m-d" }} {{ race.end_time|time:"H:i e" }} ({{ race.timezone }})</td>
</tr>
<tr>
<th>Registration closure</th>
<td>{{ race.registration_closure }}</td>
<td>
{% with tz=race.timezone %}
{{ race.registration_closure|timezone:tz |date:"Y-m-d H:i e" }}
{% endwith %}
</td>
</tr>
<tr>
<th>Date</th><td>{{ race.startdate }}</td>
</tr>
<tr>
<th>Race Window</th><td>{{ race.startdate }} {{ race.start_time }} to {{ race.enddate }} {{ race.end_time }}</td>
</tr>
<tr>
<th>Results Submission Deadline</th><td>{{ race.evaluation_closure }}</td>
<th>
Results Submission Deadline
</th>
<td>
{% with tz=race.timezone %}
{{ race.evaluation_closure|timezone:tz |date:"Y-m-d H:i e" }}
{% endwith %}</td>
</tr>
<tr>
<th>Organizer</th><td>{{ race.manager.first_name }} {{ race.manager.last_name }}</td>
@@ -137,6 +149,7 @@
</table>
</p>
</div>
{% endlocaltime %}
</li>
<li class="grid_2">
<div id="registerbuttons">

2
rowers/views/racesviews.py
View File

@@ -211,7 +211,7 @@ def course_edit_view(request,id=0):
}
)
@login_required()
#@login_required()
def course_view(request,id=0):
try:
course = GeoCourse.objects.get(id=id)