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

Merge branch 'release/v6.50'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-24 17:59:45 +02:00
parent 0fbd518c53 2ed98b903c
commit fd57f93e5b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/racelist.html
View File

@@ -33,6 +33,8 @@
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a> <a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% elif race|race_complete:rower %} {% elif race|race_complete:rower %}
<a class="green dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a> <a class="green dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% elif race|future_registered:rower %}
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% elif race|past_not_registered:rower %} {% elif race|past_not_registered:rower %}
<a class="white dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a> <a class="white dot" href="/rowers/virtualevent/{{ race.id }}">&nbsp;</a>
{% else %} {% else %}

7
rowers/templatetags/rowerfilters.py
View File

@@ -1,6 +1,7 @@
from django import template from django import template
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from time import strftime from time import strftime
from django.utils import timezone
import dateutil.parser import dateutil.parser
import json import json
import datetime import datetime
@@ -264,3 +265,9 @@ def race_complete(race,r):
def past_not_registered(race,r): def past_not_registered(race,r):
is_complete,has_registered = race_rower_status(r,race) is_complete,has_registered = race_rower_status(r,race)
return not has_registered return not has_registered
@register.filter
def future_registered(race,r):
is_complete, has_registered = race_rower_status(r,race)
is_open = race.evaluation_closure > timezone.now()
return has_registered and not is_complete and is_open