From d88a0f7aea6a0b5f7705cbf0167ff9e52f29a50e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 7 Jan 2020 18:14:27 +0100 Subject: [PATCH] added menu items --- rowers/dataprep.py | 22 ++++++++++------------ rowers/templates/menu_workout.html | 12 ++++++++++++ templates/newbase.html | 1 + 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 747135e5..b0d015b9 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1437,18 +1437,16 @@ def handle_nonpainsled(f2, fileformat, summary=''): f_to_be_deleted = f2 # should delete file f2 = f2[:-4] + 'o.csv' - try: - row2 = rrdata(df = row.df) - if fileformat == 'speedcoach2': - # impeller consistency - impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3) - if impellerdata and consistent: - impeller = True - if impellerdata and not consistent: - row2.use_gps() - row2.write_csv(f2, gzip=True) - except: - return (0,'',0,0,'',impeller) + row2 = rrdata(df = row.df) + if 'speedcoach2' in fileformat: + # impeller consistency + impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3) + if impellerdata and consistent: + impeller = True + if impellerdata and not consistent: + row2.use_gpsdata() + row2.write_csv(f2, gzip=True) + # os.remove(f2) try: diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html index f6edffd0..f8d4ee7c 100644 --- a/rowers/templates/menu_workout.html +++ b/rowers/templates/menu_workout.html @@ -287,6 +287,18 @@  OTW Power + {% if 'speedcoach2' in workout.workoutsource %} +
  • + +  Use GPS data + +
    • +
  • + +  Use Impeller data + +
    • + {% endif %} {% endif %}
  • diff --git a/templates/newbase.html b/templates/newbase.html index 885e3f90..41486614 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -43,6 +43,7 @@ +