From 2ed98b903c7420034ca09cef7cc9bb11544f379b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 24 Apr 2018 17:58:42 +0200 Subject: [PATCH] color code bug fix --- rowers/templates/racelist.html | 2 ++ rowers/templatetags/rowerfilters.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/rowers/templates/racelist.html b/rowers/templates/racelist.html index af2a919b..c6a12507 100644 --- a/rowers/templates/racelist.html +++ b/rowers/templates/racelist.html @@ -33,6 +33,8 @@   {% elif race|race_complete:rower %}   + {% elif race|future_registered:rower %} +   {% elif race|past_not_registered:rower %}   {% else %} diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 33c7e9d9..88342bea 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -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