From 61e9af120851b0d0fdc889adb15d609abd1956a9 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Mon, 25 Mar 2019 20:58:51 +0100
Subject: [PATCH 1/3] change submit to select workouts
---
rowers/templates/list_workouts.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 7a7db9b9..237165d7 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -81,7 +81,7 @@
{{ searchform }}
-
+
From e79206c7c1ff28c1324aad7998a3692c5b3fd189 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Tue, 26 Mar 2019 21:08:40 +0100
Subject: [PATCH 2/3] fxix #464
---
rowers/dataprep.py | 9 ++++++++-
rowers/tasks.py | 2 ++
rowers/templates/fitnessmetric.html | 10 +++++-----
rowers/tests/testdata/testdata.csv.gz | Bin 12534 -> 12543 bytes
rowers/views/analysisviews.py | 13 +++++++++++++
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index d32a74a0..757254f5 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1280,6 +1280,7 @@ def new_workout_from_file(r, f2,
message = None
try:
fileformat = get_file_type(f2)
+ print(fileformat,'aa')
except IOError:
os.remove(f2)
message = "Rowsandall could not process this file. The extension is supported but the file seems corrupt. Contact info@rowsandall.com if you think this is incorrect."
@@ -1337,7 +1338,13 @@ def new_workout_from_file(r, f2,
# worth supporting
if fileformat == 'unknown':
message = "We couldn't recognize the file type"
- f4 = f2[:-5]+'a'+f2[-5:]
+ extension = os.path.splitext(f2)[1]
+ filename = os.path.splitext(f2)[0]
+ if extension == '.gz':
+ filename = os.path.splitext(filename)[0]
+ extension2 = os.path.splitext(filename)[1]+extension
+ extension = extension2
+ f4 = filename+'a'+extension
copyfile(f2,f4)
job = myqueue(queuehigh,
handle_sendemail_unrecognized,
diff --git a/rowers/tasks.py b/rowers/tasks.py
index f64b6c54..6a8ad981 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1661,6 +1661,8 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
haspower = row.df[' Power (watts)'].mean() > 50
except TypeError:
haspower = True
+ except KeyError:
+ haspower = False
nr_rows = len(row.df)
if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200):
diff --git a/rowers/templates/fitnessmetric.html b/rowers/templates/fitnessmetric.html
index 7939ed15..6958985d 100644
--- a/rowers/templates/fitnessmetric.html
+++ b/rowers/templates/fitnessmetric.html
@@ -72,16 +72,13 @@
{% if rower.user %}
-{{ rower.user.first_name }} Power Estimates
+Power Progress for {{ rower.user.first_name }}
{% else %}
-{{ user.first_name }} Power Estimates
+Power Progress for {{ user.first_name }}
{% endif %}