From 6ab3c088595d9a07b3219b794a27b830001941da Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 28 Sep 2018 10:56:51 +0200 Subject: [PATCH] stopped at empower fix (line 122 in urls.py) --- rowers/templates/empower_fix.html | 142 +++--- rowers/templates/export_workouts.html | 39 +- rowers/templates/menu_profile.html | 6 +- rowers/urls.py | 6 +- rowers/views.py | 1 + rowsandall_workouts_2017-09-28_2018-09-28.csv | 434 ++++++++++++++++++ static/css/rowsandall2.css | 81 ++-- static/css/styles2.css | 6 +- templates/400.html | 13 +- templates/403.html | 17 +- templates/404.html | 21 +- templates/500.html | 23 +- templates/502.html | 30 ++ 13 files changed, 650 insertions(+), 169 deletions(-) create mode 100644 rowsandall_workouts_2017-09-28_2018-09-28.csv create mode 100644 templates/502.html diff --git a/rowers/templates/empower_fix.html b/rowers/templates/empower_fix.html index 8e059f80..5fd1101e 100644 --- a/rowers/templates/empower_fix.html +++ b/rowers/templates/empower_fix.html @@ -1,10 +1,10 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} -{% block title %}Workouts{% endblock %} +{% block title %}Empower FIX{% endblock %} -{% block content %} +{% block main %} -
- {% include "teambuttons.html" with teamid=team.id team=team %} -
-
-

Empower Workouts

-

This functionality is aimed at users who have uploaded workouts from - the Nielsen-Kellerman Empower Oarlock/SpeedCoach combination before the - power inflation bug was known (May 4, 2018).

+

Empower Workouts

-

Workouts recorded with a SpeedCoach running NK Firmware version 2.17 or - lower have Power and Work per Stroke values that are approximately - 9% (sculling) or 5% too high. The exact value of the error depends on your - inboard and oar length.

- -

Currently, we autocorrect workouts recorded with old Firmware upon - their upload, but workouts that were present on the site before - the bug was known still have incorrect values for Power and Work per Stroke. -

- -

- You can use this page to correct those workouts. -

- - -
-
-
- -
-
- - {{ dateform.as_table }} -
- {% csrf_token %} -
-
- -
-
-
- -
- - -
-
- - - {% if workouts %} - - Toggle All
- - - {{ form.as_table }} -
- -{% else %} -

No workouts found

-{% endif %} -
-
-

Select workouts on the left, - and press submit

-
+
    +
  • +

    Use the date form to reduce the selection

    - {% csrf_token %} - -

    -
-
-

You can use the date form above to reduce the selection

-
-
-
+
+ + {{ dateform.as_table }} +
+ {% csrf_token %} + +
+

+ +
  • +

    This functionality is aimed at users who have uploaded workouts from + the Nielsen-Kellerman Empower Oarlock/SpeedCoach combination before the + power inflation bug was known (May 4, 2018).

    + +

    Workouts recorded with a SpeedCoach running NK Firmware version 2.17 or + lower have Power and Work per Stroke values that are approximately + 9% (sculling) or 5% too high. The exact value of the error depends on your + inboard and oar length.

    + +

    Currently, we autocorrect workouts recorded with old Firmware upon + their upload, but workouts that were present on the site before + the bug was known still have incorrect values for Power and Work per Stroke. +

    +

    + You can use this page to correct those workouts. +

    +
    • + +
  • +

    +

    + {% if workouts %} + + Toggle All
    + + + {{ form.as_table }} +
    + {% csrf_token %} + + + +
    +

    + {% else %} +

    No workouts found

    + {% endif %} +
    • + {% if workouts %} +
  • +

    Select workouts + and press submit +

    +
    • + {% endif %} + {% endblock %} + +{% block sidebar %} +{% include 'menu_workouts.html' %} +{% endblock %} diff --git a/rowers/templates/export_workouts.html b/rowers/templates/export_workouts.html index 61bec7b6..b45dc2f5 100644 --- a/rowers/templates/export_workouts.html +++ b/rowers/templates/export_workouts.html @@ -1,23 +1,24 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block title %}Rowsandall Workouts Summary Export{% endblock %} -{% block content %} -
    -
    -
    - - {{ form.as_table }} -
    - {% csrf_token %} -
    -
    - -
    -
    -
    +{% block main %} +

    Export all workouts

    +
      +
    • +

      +

      + + {{ form.as_table }} +
      + {% csrf_token %} + +
      +

      +
      • +

    • With this form, you can export a summary table for all workouts within a selected date range. The table will be sent to you as a CSV file which can be opened in excel. The table contains @@ -27,7 +28,11 @@ By setting the start date to your registration date or earlier and the end date to today, you will receive all workout data we are storing for you.

      -
    -
    + + {% endblock %} + +{% block sidebar %} +{% include 'menu_profile.html' %} +{% endblock %} diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html index 91c63029..11c21fe0 100644 --- a/rowers/templates/menu_profile.html +++ b/rowers/templates/menu_profile.html @@ -1,17 +1,17 @@

    Profile