Merge branch 'release/v6.50'
This commit is contained in:
@@ -33,6 +33,8 @@
|
||||
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}"> </a>
|
||||
{% elif race|race_complete:rower %}
|
||||
<a class="green dot" href="/rowers/virtualevent/{{ race.id }}"> </a>
|
||||
{% elif race|future_registered:rower %}
|
||||
<a class="orange dot" href="/rowers/virtualevent/{{ race.id }}"> </a>
|
||||
{% elif race|past_not_registered:rower %}
|
||||
<a class="white dot" href="/rowers/virtualevent/{{ race.id }}"> </a>
|
||||
{% else %}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from django import template
|
||||
from django.utils.safestring import mark_safe
|
||||
from time import strftime
|
||||
from django.utils import timezone
|
||||
import dateutil.parser
|
||||
import json
|
||||
import datetime
|
||||
@@ -264,3 +265,9 @@ def race_complete(race,r):
|
||||
def past_not_registered(race,r):
|
||||
is_complete,has_registered = race_rower_status(r,race)
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user