From 0adaf1249520c007e32bd98b22cd1116d4e1f8be Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 27 Aug 2019 11:59:13 +0200 Subject: [PATCH 1/4] starting some ajax --- rowers/alerts.py | 3 + rowers/templates/alerts.html | 138 ++++++++++++++++++---------- rowers/templates/analysis.html | 2 +- rowers/templatetags/rowerfilters.py | 19 +++- 4 files changed, 114 insertions(+), 48 deletions(-) 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 @@
    {% if alerts %} {% for alert in alerts %} -
  • +

  • {{ alert.name }}

    @@ -22,10 +22,24 @@ title="Delete"> + + + + + +
    - -
    -

    {{ stats|alertstatspercentage:forloop.counter }}%

    +     +
    +

    {{ stats|alertstatspercentage:forloop.counter }}%

    @@ -34,51 +48,16 @@

    Workout type: {{ alert.workouttype }}

    -

    - Next Run: {{ alert.next_run }} +

    + + {{ stats|alertstartdate:forloop.counter }} + - + + {{ stats|alertenddate:forloop.counter }} +

    • {% endfor %} -
  • - - - - - - - - - - - {% for alert in alerts %} - - - - - - - - - - {% endfor %} - -
    NamemetricWorkout typeNext Run
    {{ alert.name }}{{ alert.measured.metric }}{{ alert.workouttype }}{{ alert.next_run }} - - - - - - - - - - - -
    -
    • {% else %}

  • 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 @@

  • -

    Power Progress

    +

    Power Progress

    Power Progress 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: From f4bc72501aa9a15b10fdd525b85016f55f38900b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 27 Aug 2019 13:33:21 +0200 Subject: [PATCH 2/4] alerts ajax working --- rowers/templates/alerts.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html index c4a0030a..aedd02ea 100644 --- a/rowers/templates/alerts.html +++ b/rowers/templates/alerts.html @@ -104,7 +104,7 @@ thediv.siblings("#dates").find("#enddate").text(enddate); thediv.data().nperiod=nperiod; if (nextperiod<0) {nextperiod=0}; - var nextperiod = nperiod-1 + var nextperiod = nperiod thediv.siblings(".iteratorright").data().nperiod=nextperiod; }); }); @@ -132,7 +132,7 @@ thediv.siblings("#dates").find("#startdate").text(startdate); thediv.siblings("#dates").find("#enddate").text(enddate); thediv.data().nperiod=nperiod; - var nextperiod = nperiod+1; + var nextperiod = nperiod; thediv.siblings(".iteratorleft").data().nperiod=nextperiod; console.log(thediv.siblings(".iteratorleft")); From b3046b85174e64f34486725e6c6a811318ba1216 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 27 Aug 2019 14:52:49 +0200 Subject: [PATCH 3/4] alerts --- rowers/templates/alerts.html | 12 ------------ rowers/tests/testdata/testdata.csv.gz | Bin 12642 -> 12660 bytes 2 files changed, 12 deletions(-) diff --git a/rowers/templates/alerts.html b/rowers/templates/alerts.html index aedd02ea..2cc3c6d4 100644 --- a/rowers/templates/alerts.html +++ b/rowers/templates/alerts.html @@ -80,25 +80,18 @@