From 9c76c3067c4e441cc6b318bd8292aaf9ac470d97 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 29 Feb 2020 17:30:16 +0100 Subject: [PATCH 1/2] closed excel --- rowers/tests/.~lock.viewnames.csv# | 1 - 1 file changed, 1 deletion(-) delete mode 100644 rowers/tests/.~lock.viewnames.csv# diff --git a/rowers/tests/.~lock.viewnames.csv# b/rowers/tests/.~lock.viewnames.csv# deleted file mode 100644 index ad550290..00000000 --- a/rowers/tests/.~lock.viewnames.csv# +++ /dev/null @@ -1 +0,0 @@ -,sander,sander-pc,29.02.2020 17:14,file:///home/sander/.config/libreoffice/4; \ No newline at end of file From 5477d8b1da9ff31366811310536b64e900754d13 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 1 Mar 2020 11:30:52 +0100 Subject: [PATCH 2/2] NK files will show up as water --- rowers/dataprep.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index af7df311..a17281ab 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1569,6 +1569,9 @@ def new_workout_from_file(r, f2, dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat) dosummary = dosummary or summary == '' + if 'speedcoach2' in fileformat and workouttype == 'rower': + workouttype = 'water' + if workoutsource is None: workoutsource = fileformat