From a4cb6ff21c66cee5878c76bf6282c1150de0f9cc Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 17 Jan 2022 15:57:39 +0100
Subject: [PATCH 1/5] d

---
 rowers/polarstuff.py  | 5 +++++
 rowers/tests/mocks.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/rowers/polarstuff.py b/rowers/polarstuff.py
index 174c8e2c..f90022ab 100644
--- a/rowers/polarstuff.py
+++ b/rowers/polarstuff.py
@@ -246,11 +246,16 @@ def get_polar_workouts(user):
                             try:
                                 workouttype = mytypes.polaraccesslink_sports[exercise_dict['detailed-sport-info']]
                             except KeyError:
+                                dologging('polar.log',exercise_dict['detailed-sport-info'])
+                                dologging('polar.log',workouttype)
                                 try:
                                     workouttype = mytypes.polarmappinginv[exercise_dict['sport'].lower()]
                                 except KeyError:
+                                    dologging('polar.log',workouttype)
                                     pass
 
+                            dologging('polar.log',workouttype)
+
 
                             # post file to upload api
                             # TODO: add workouttype
diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py
index 06ac59c2..f4a31f68 100644
--- a/rowers/tests/mocks.py
+++ b/rowers/tests/mocks.py
@@ -789,7 +789,7 @@ def mocked_requests(*args, **kwargs):
         "has-route": True,
         "club-id": 999,
         "club-name": "Polar Club",
-        "detailed-sport-info": "WATERSPORTS_WATERSKI",
+        "detailed-sport-info": "WALKING",
         "fat-percentage": 60,
         "carbohydrate-percentage": 38,
         "protein-percentage": 2

From d130093520f3d8c8418f18d04a61b6092780aa1d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 17 Jan 2022 17:30:11 +0100
Subject: [PATCH 2/5] d

---
 rowers/dataprep.py                    |   6 ++++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 0 bytes
 2 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 rowers/tests/testdata/testdata.tcx.gz

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index eaab5f0b..d360703a 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2028,7 +2028,7 @@ def handle_nonpainsled(f2, fileformat, summary='',startdatetime='',empowerfirmwa
     return (f2, summary, oarlength, inboard, fileformat, impeller)
 
 # Create new workout from file and store it in the database
-# This routine should be used everywhere in views.py 
+# This routine should be used everywhere in views.py
 
 def get_workouttype_from_fit(filename,workouttype='water'):
     try:
@@ -2205,7 +2205,9 @@ def new_workout_from_file(r, f2,
     if (fileformat == 'fit'): # pragma: no cover
         workouttype = get_workouttype_from_fit(f2,workouttype=workouttype)
     if (fileformat == 'tcx'):
-        workouttype = get_workouttype_from_tcx(f2,workouttype=workouttype)
+        workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype) 
+        if workouttype not in mytypes.otwtypes and workouttype_from_tcx not in mytypes.otwtypes:
+            workouttype = workouttype_from_tcx
 
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index 9a25477da31a5c34184f7c97d24128ee531469c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4001
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
H#DD<+FiAoa


From da50e3389979664256e717764b956fda1d4e641a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 17 Jan 2022 20:56:32 +0100
Subject: [PATCH 3/5] adding third setting

---
 rowers/models.py                      |  7 +++++++
 rowers/templates/list_workouts.html   |  4 ++--
 rowers/templates/workflowconfig2.html | 19 +++++--------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 1659f849..ff201d6e 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -998,6 +998,12 @@ class Rower(models.Model):
                                           choices=landingpages2,
                                           verbose_name="Alternative Landing Page")
 
+    defaultlandingpage3 = models.CharField(default='workout_view',
+                                          max_length=200,
+                                          choices=landingpages2,
+                                          verbose_name="Title link on workout list")
+
+
     # Access tokens
     c2token = models.CharField(default='',max_length=200,blank=True,null=True)
     tokenexpirydate = models.DateTimeField(blank=True,null=True)
@@ -4285,6 +4291,7 @@ class AccountRowerForm(ModelForm):
                   'usersmooth',
                   'defaultlandingpage',
                   'defaultlandingpage2',
+                  'defaultlandingpage3',
                   'offercoaching','autojoin','emailalternatives']
 
         widgets = {
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 8f159808..43227cc6 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -90,8 +90,8 @@
             {% if workout.name != '' %}
             <h3>
               <a
-              href={% url rower.defaultlandingpage id=workout.id|encode %}
-              title="{{ rower.defaultlandingpage|verbose }}">
+              href={% url rower.defaultlandingpage3 id=workout.id|encode %}
+              title="{{ rower.defaultlandingpage3|verbose }}">
               {{ workout.name }}
               </a>
             </h3>
diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html
index 3924505a..209d32c2 100644
--- a/rowers/templates/workflowconfig2.html
+++ b/rowers/templates/workflowconfig2.html
@@ -10,13 +10,6 @@
 <h1>Change Workflow Page Layout for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
 <ul class="main-content">
-  {% if workoutid %}
-  <li class="grid_4">
-    <p>
-      <a class="button gray small" href="/rowers/workout/{{ workoutid }}/workflow/">Return to Workout</a>
-    </p>
-  </li>
-  {% endif %}
   <li>
     <p>On this page, you can configure the content of your "Workflow" page
       for each workout. If you want to remove an element, change it to "None".
@@ -32,15 +25,13 @@
       <input class="grid_2 alpha button" type="submit" value="Save">
     </form>
   </li>
+  {% if workoutid %}
   <li>
-    {% if rower.defaultlandingpage == 'workout_edit_view' %}
-    <p>Default landing page is Edit View. Set default landing page to</p>
-    <a class="button small" href="/rowers/me/workflowdefault/">Workflow View</a>
-    {% else %}
-    <p>Default landing page is Workflow View. Set default landing page to</p>
-    <a class="button small" href="/rowers/me/workflowdefault/">Edit View</a>
-    {% endif %}
+    <p>
+      <a class="button" href="/rowers/workout/{{ workoutid }}/workflow/">Return to Workout</a>
+    </p>
   </li>
+  {% endif %}
 </ul>
 
 

From e5a8c484f28514289667fccbcbc3e791e558adab Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 18 Jan 2022 14:43:27 +0100
Subject: [PATCH 4/5] tests pass

---
 rowers/dataprep.py                    |   8 ++++----
 rowers/tests/test_user.py             |   1 +
 rowers/tests/testdata/testdata.tcx.gz | Bin 0 -> 4000 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 rowers/tests/testdata/testdata.tcx.gz

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index d360703a..4bc4feaf 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2204,10 +2204,10 @@ def new_workout_from_file(r, f2,
     # Get workout type from fit & tcx
     if (fileformat == 'fit'): # pragma: no cover
         workouttype = get_workouttype_from_fit(f2,workouttype=workouttype)
-    if (fileformat == 'tcx'):
-        workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype) 
-        if workouttype not in mytypes.otwtypes and workouttype_from_tcx not in mytypes.otwtypes:
-            workouttype = workouttype_from_tcx
+    #if (fileformat == 'tcx'):
+    #    workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype)
+    #    if workouttype != 'rower' and workouttype_from_tcx not in mytypes.otwtypes:
+    #        workouttype = workouttype_from_tcx
 
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):
diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py
index b79d6fa7..125ec651 100644
--- a/rowers/tests/test_user.py
+++ b/rowers/tests/test_user.py
@@ -117,6 +117,7 @@ class UserPreferencesTest(TestCase):
             'usersmooth':2,
             'defaultlandingpage':'workout_edit_view',
             'defaultlandingpage2':'workout_delete',
+            'defaultlandingpage3': 'workout_view',
             'first_name': self.u.first_name,
             'last_name': self.u.last_name,
             'email':self.u.email
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c18cd7abc73b82a07f59195c79c2febfbe7eb0cc
GIT binary patch
literal 4000
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
GfB^uC^G9m{

literal 0
HcmV?d00001


From 0b670d7697dddc7a8b3f935090f11d701446b575 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 18 Jan 2022 15:55:30 +0100
Subject: [PATCH 5/5] release candidate

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 rowers/tests/testdata/testdata.tcx.gz

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index c18cd7abc73b82a07f59195c79c2febfbe7eb0cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4000
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
GfB^uC^G9m{