diff --git a/rowers/alerts.py b/rowers/alerts.py index fdf00366..f33bd3f9 100644 --- a/rowers/alerts.py +++ b/rowers/alerts.py @@ -108,6 +108,7 @@ def alert_get_stats(alert,nperiod=0): 'nr_strokes':0, 'nr_strokes_qualifying':0, 'percentage':0, + 'nperiod':nperiod, } # check if filters are in columns list @@ -139,6 +140,7 @@ def alert_get_stats(alert,nperiod=0): 'nr_strokes':0, 'nr_strokes_qualifying':0, 'percentage':0, + 'nperiod':nperiod, } @@ -175,6 +177,7 @@ def alert_get_stats(alert,nperiod=0): 'nr_strokes':nr_strokes, 'nr_strokes_qualifying':nr_strokes_qualifying, 'percentage': percentage, + 'nperiod':nperiod, } # run alert report diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html index e0cad516..c4a0030a 100644 --- a/rowers/templates/alerts.html +++ b/rowers/templates/alerts.html @@ -13,7 +13,7 @@
@@ -34,51 +48,16 @@
Workout type: {{ alert.workouttype }}
-- Next Run: {{ alert.next_run }} +
+ + {{ stats|alertstartdate:forloop.counter }} + - + + {{ stats|alertenddate:forloop.counter }} +
{% endfor %} -| Name | -metric | -Workout type | -Next Run | -|||
|---|---|---|---|---|---|---|
| {{ alert.name }} | -{{ alert.measured.metric }} | -{{ alert.workouttype }} | -{{ alert.next_run }} | -- - - - | -- - - - | -- - - - | -
You have not set any alerts for {{ rower.user.first_name }}
@@ -95,6 +74,73 @@ {% endblock %} +{% block scripts %} + + +{% endblock %} {% block sidebar %} {% include 'menu_analytics.html' %} diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index 42eb08c2..465143e8 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -86,7 +86,7 @@
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 82a4afb6..e3ee8050 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -71,10 +71,27 @@ from rowers.teams import rower_get_managers
@register.filter
def alertstatspercentage(list,i):
alertstats = list[i-1]
- print(alertstats)
return alertstats["percentage"]
+@register.filter
+def alertstartdate(list,i):
+ alertstats = list[i-1]
+
+ return alertstats["startdate"]
+
+@register.filter
+def alertnperiod(list,i):
+ alertstats = list[i-1]
+
+ return alertstats["nperiod"]
+
+@register.filter
+def alertenddate(list,i):
+ alertstats = list[i-1]
+
+ return alertstats["enddate"]
+
@register.filter
def is_coach(rower,rowers):
for r in rowers: