From 94aa797b824992c47727c6186557d29bfbbbf58a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 14 Feb 2019 11:13:13 +0100 Subject: [PATCH] adding rowerfilters --- rowers/templates/panel_advancededit.html | 1 + rowers/templates/panel_delete.html | 3 ++- rowers/templates/panel_editbuttons.html | 1 + rowers/templates/panel_editintervals.html | 1 + rowers/templates/panel_editstream.html | 1 + rowers/templates/panel_editwind.html | 1 + rowers/templates/panel_export.html | 1 + rowers/templates/panel_flexchart.html | 1 + rowers/templates/panel_mapview.html | 1 + rowers/templates/panel_middlesocial.html | 1 + rowers/templates/panel_otwpower.html | 1 + rowers/templates/panel_ranking.html | 1 + rowers/templates/panel_social.html | 1 + rowers/templates/panel_staticchart.html | 1 + rowers/templates/panel_stats.html | 1 + rowers/templates/panel_uploadimage.html | 1 + rowers/templates/workflow_snippet.html | 1 + rowers/tests/testdata/testdata.csv.gz | Bin 11457 -> 11457 bytes rowers/views/statements.py | 2 +- 19 files changed, 19 insertions(+), 2 deletions(-) diff --git a/rowers/templates/panel_advancededit.html b/rowers/templates/panel_advancededit.html index bc80f9e0..8d09e083 100644 --- a/rowers/templates/panel_advancededit.html +++ b/rowers/templates/panel_advancededit.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Advanced diff --git a/rowers/templates/panel_delete.html b/rowers/templates/panel_delete.html index 78533eb3..53498b17 100644 --- a/rowers/templates/panel_delete.html +++ b/rowers/templates/panel_delete.html @@ -1,5 +1,6 @@ +{% load rowerfilters %}

- Delete + Delete

diff --git a/rowers/templates/panel_editbuttons.html b/rowers/templates/panel_editbuttons.html index 7fcb604c..3728a5e7 100644 --- a/rowers/templates/panel_editbuttons.html +++ b/rowers/templates/panel_editbuttons.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Edit Workout diff --git a/rowers/templates/panel_editintervals.html b/rowers/templates/panel_editintervals.html index 28c77980..9eb291a5 100644 --- a/rowers/templates/panel_editintervals.html +++ b/rowers/templates/panel_editintervals.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Edit Intervals diff --git a/rowers/templates/panel_editstream.html b/rowers/templates/panel_editstream.html index 129e7471..63f19f74 100644 --- a/rowers/templates/panel_editstream.html +++ b/rowers/templates/panel_editstream.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Edit Stream Data diff --git a/rowers/templates/panel_editwind.html b/rowers/templates/panel_editwind.html index e4b83302..865a345d 100644 --- a/rowers/templates/panel_editwind.html +++ b/rowers/templates/panel_editwind.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Edit Wind Data diff --git a/rowers/templates/panel_export.html b/rowers/templates/panel_export.html index 2c4018f5..7ffa6db6 100644 --- a/rowers/templates/panel_export.html +++ b/rowers/templates/panel_export.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Export Workout diff --git a/rowers/templates/panel_flexchart.html b/rowers/templates/panel_flexchart.html index 43eda26b..b82fc2dd 100644 --- a/rowers/templates/panel_flexchart.html +++ b/rowers/templates/panel_flexchart.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Flex Chart diff --git a/rowers/templates/panel_mapview.html b/rowers/templates/panel_mapview.html index 2ea3bbf5..87f00dc6 100644 --- a/rowers/templates/panel_mapview.html +++ b/rowers/templates/panel_mapview.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Map View diff --git a/rowers/templates/panel_middlesocial.html b/rowers/templates/panel_middlesocial.html index 8bfcfdf8..78b468f5 100644 --- a/rowers/templates/panel_middlesocial.html +++ b/rowers/templates/panel_middlesocial.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Share diff --git a/rowers/templates/panel_otwpower.html b/rowers/templates/panel_otwpower.html index 8faaecb9..15661ca0 100644 --- a/rowers/templates/panel_otwpower.html +++ b/rowers/templates/panel_otwpower.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

OTW Power diff --git a/rowers/templates/panel_ranking.html b/rowers/templates/panel_ranking.html index 9bf026aa..cf0cff54 100644 --- a/rowers/templates/panel_ranking.html +++ b/rowers/templates/panel_ranking.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

diff --git a/rowers/templates/panel_social.html b/rowers/templates/panel_social.html index f456042d..792d706d 100644 --- a/rowers/templates/panel_social.html +++ b/rowers/templates/panel_social.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Share diff --git a/rowers/templates/panel_staticchart.html b/rowers/templates/panel_staticchart.html index fb492f70..75cef85b 100644 --- a/rowers/templates/panel_staticchart.html +++ b/rowers/templates/panel_staticchart.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Create Charts

diff --git a/rowers/templates/panel_stats.html b/rowers/templates/panel_stats.html index 3a41cd97..76ed816e 100644 --- a/rowers/templates/panel_stats.html +++ b/rowers/templates/panel_stats.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Workout Stats

diff --git a/rowers/templates/panel_uploadimage.html b/rowers/templates/panel_uploadimage.html index 9a666426..74499375 100644 --- a/rowers/templates/panel_uploadimage.html +++ b/rowers/templates/panel_uploadimage.html @@ -1,3 +1,4 @@ +{% load rowerfilters %}

Attach Image diff --git a/rowers/templates/workflow_snippet.html b/rowers/templates/workflow_snippet.html index ea892cf2..1a17b65f 100644 --- a/rowers/templates/workflow_snippet.html +++ b/rowers/templates/workflow_snippet.html @@ -1,3 +1,4 @@ +{% load rowerfilters %} {% for chart in charts %}

{{ forloop.counter }} diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index cd7f8923eafb5f21965aa781f45a2945ead1b747..219caff7f1c20bfef779d4edf1f68f0707156e74 100644 GIT binary patch delta 15 WcmX>Yc`%YqzMF%C-Et$_ZXEzB#{|;= delta 15 WcmX>Yc`%YqzMF%iUw0$hZXEzEy9G}G diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 9c17a7f4..69a5c1a2 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -711,7 +711,7 @@ def get_thumbnails(request,id): charts = [] - charts = thumbnails_set(r,id,favorites) + charts = thumbnails_set(r,encoder.decode_hex(id),favorites) try: if charts[0]['script'] == '': charts = []