From f46fbcd8ab878093c67bd3254ee6df648b03e3a1 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 12 Dec 2024 17:38:56 +0100
Subject: [PATCH 1/5] bringing back message delete

---
 rowers/urls.py            | 1 +
 rowers/views/userviews.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/urls.py b/rowers/urls.py
index 5a4484da..06047059 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -662,6 +662,7 @@ urlpatterns = [
     re_path(r'^me/messages/$', views.user_messages, name='user_messages'),
     re_path(r'^me/messages/delete/$', views.user_messages_delete_all, name='user_messages_delete_all'),
     re_path(r'^me/messages/(?P<id>\d+)/markread/$', views.user_message_markread, name='user_message_markread'),
+    re_path(r'^me/messages/(?P<id>\d+)/delete/$', views.user_message_delete, name='user_message_delete'),
     re_path(r'^me/messages/user/(?P<userid>\d+)/$', views.user_messages, name='user_messages'),
     re_path(r'^me/delete/$', views.remove_user, name='remove_user'),
     re_path(r'^survey/$', views.survey, name='survey'),
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 629be7a2..ddd4fe73 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -279,7 +279,6 @@ def user_message_delete(request,id=0): # pragma: no cover
         messages.error(request,'Could not find this message')
         url = reverse('user_messages')
         return HttpResponseRedirect(url)
-        
 
     if msg.receiver == request.user.rower:
         msg.delete()

From ab33759bd298a9efed2d12fd42ed654c25f959ed Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 13 Dec 2024 12:49:26 +0100
Subject: [PATCH 2/5] better organized export page

---
 rowers/models.py                           |  70 ++++++++
 rowers/templates/rower_exportsettings.html | 199 ++++++++++++++-------
 rowers/views/statements.py                 |   8 +-
 rowers/views/userviews.py                  |  28 ++-
 4 files changed, 240 insertions(+), 65 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index f4715081..3ac826ff 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -4561,6 +4561,76 @@ class RowerExportForm(ModelForm):
             'intervals_auto_import',
             'intervals_auto_export',
         ]
+        
+class RowerExportFormStrava(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'stravaexportas',
+            'strava_auto_export',
+            'strava_auto_import',
+            'strava_auto_delete',            
+        ]
+
+class RowerExportFormIntervals(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'intervals_auto_import',
+            'intervals_auto_export',
+        ]
+
+class RowerExportFormGarmin(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'garminactivity',
+            ]
+
+class RowerExportFormPolar(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'polar_auto_import',
+        ]
+
+class RowerExportFormConcept2(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'c2_auto_export',
+            'c2_auto_import',
+        ]
+
+class RowerExportFormSportTracks(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'sporttracks_auto_export',
+        ]
+
+class RowerExportFormTrainingPeaks(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'trainingpeaks_auto_export',
+            'rp3_auto_import',
+        ]
+
+class RowerExportFormRP3(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'rp3_auto_import',
+        ]
+
+class RowerExportFormNK(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'nk_auto_import'
+        ]
+    
 
 # Simple form to set rower's Functional Threshold Power
 class SimpleRowerPowerForm(ModelForm):
diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html
index b6aae035..9625a472 100644
--- a/rowers/templates/rower_exportsettings.html
+++ b/rowers/templates/rower_exportsettings.html
@@ -7,8 +7,10 @@
 {% block main %}
 <h1>Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
+<form enctype="multipart/form-data" action="" method="post">
+  {% csrf_token %}
 <ul class="main-content">
-  <li class="grid_2">
+  <li class="grid_4">
     <p>You are currently connected to:
       {% if rower.c2token is not None and rower.c2token != '' %}
       Concept2 Logbook,
@@ -41,44 +43,140 @@
       Intervals.icu
       {% endif %}
     </p>
-  
-{% if form.errors %}
-<p style="color: red;">
-  Please correct the error{{ form.errors|pluralize }} below.
-</p>
-{% endif %}
-<p>
-<form enctype="multipart/form-data" action="" method="post">
-  <table>
-    {{ form.as_table }}
-  </table>
-  {% csrf_token %}
-  <input type="submit" value="Save">
-</form>
-</p>
-{% if rower.garmintoken and rower.garmintoken != '' %}
-<p>
-  <em>You are connected to Garmin.</em> Switching off Garmin Connect sync is on the
-  <a href="https://connect.garmin.com/modern/settings/accountInformation">Account settings</a>
-  page. Look for the "Rowsandall" app.
-</p>
-{% endif %}
-<p>
-  Garmin Connnect has no manual sync, so connecting your account to your Garmin account will
-  automatically auto-sync workouts from Garmin to Rowsandall (but not in the other direction). If you
-  want to export our structured workout sessions to your Garmin device, you have to set the "Garmin Activity"
-  to a activity type that is supported by your watch. Not all watches support "Custom" activities, so
-  you may have to set your activity to Run or Ride while rowing.
-</p>
-<p>
-  Strava Auto Import also imports activity changes on Strava to Rowsandall, except when you delete
-  a workout on Strava. If you want Deletions to propagate to Rowsandall, tick the Strava Auto Delete
-  check box.
-</p>
+    <p>
+      Click on the icons to establish the connection or to renew the authorization.
+    </p>
   </li>
-  <li class="grid_2">
+  <li class="grid_4">
+      <h2>API Key</h2>
+    <p>{{ apikey }}</p>
+    <p>
+      <a href="/rowers/me/regenerateapikey/">Regenerate</a>
+    </p>
+    <p>This API key can be used to access the Rowsandall API. It is used by some third party applications to access your data. Keep it secret.</p>
+  </li>
+
+    {% if form.errors %}
+  <li class="rounder">
+    <p style="color: red;">
+      Please correct the error{{ form.errors|pluralize }} below.
+    </p>
+  </li>
+    {% endif %}
+  <li class="rounder">
+    <h2>Polar</h2>
+    <table>
+      {{ forms.polar.as_table }}      
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
+                                                 alt="connect with Polar" width="130"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>Concept2</h2>
+    <table>
+      {{ forms.c2.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/c2authorize/"><img src="/static/img/blueC2logo.png" alt="connect with Concept2" width="120"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>NK</h2>
+    <table>
+      {{ forms.nk.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>SportTracks</h2>
+    <table>
+      {{ forms.sporttracks.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/sporttracksauthorize/"><img src="/static/img/sporttracks-button.png" alt="connect with SportTracks" width="120"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>TrainingPeaks</h2>
+    <table>
+      {{ forms.trainingpeaks.as_table }}
+      <input type="submit" value="Save">
+    </table>
+  </li>
+  <li class="rounder">
+    <h2>Rojabo</h2>
+    <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
+						 alt="connect with Rojabo" width="130"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>Intervals.icu</h2>
+    <table>
+      {{ forms.intervals.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
+						    alt="connect with intervals.icu"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>Garmin Connect</h2>
+    <table>
+      {{ forms.garmin.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/garminauthorize"><img src="/static/img/garmin_badge_130.png"
+						 alt="connect with Garmin" width="130"></a></p>
+
+    <p>
+      Garmin Connnect has no manual sync, so connecting your account to your Garmin account will
+      automatically auto-sync workouts from Garmin to Rowsandall (but not in the other direction). If you
+      want to export our structured workout sessions to your Garmin device, you have to set the "Garmin Activity"
+      to a activity type that is supported by your watch. Not all watches support "Custom" activities, so
+      you may have to set your activity to Run or Ride while rowing.
+    </p>
+    {% if rower.garmintoken and rower.garmintoken != '' %}
+    <p>
+      <em>You are connected to Garmin.</em> Switching off Garmin Connect sync is on the
+      <a href="https://connect.garmin.com/modern/settings/accountInformation">Account settings</a>
+      page. Look for the "Rowsandall" app.
+    </p>
+    {% endif %}
+  </li>
+  <li class="rounder">
+    <h2>Strava</h2>
+      <p><input type="submit" value="Save"></p>
+      {{ forms.strava.as_p }}
+    <p><a href="/rowers/me/stravaauthorize/"><img src="/static/img/ConnectWithStrava.png" alt="connect with strava" width="120"></a></p>
+    <p>
+      Strava Auto Import also imports activity changes on Strava to Rowsandall, except when you delete
+      a workout on Strava. If you want Deletions to propagate to Rowsandall, tick the Strava Auto Delete
+      check box.
+    </p>
+
+  </li>
+  <li class="rounder">
+    <h2>TrainingPeaks</h2>
+    <table>
+      {{ forms.trainingpeaks.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
+					      alt="connect with Polar" width="130"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>RP3</h2>
+    <table>
+      {{ forms.rp3.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
+					      alt="connect with RP3" width="130"></a></p>
+  </li>    
     {% if grants %}
+  <li class="rounder">
     <h2>Applications</h2>
+    <p>
+      These applications have access to your Rowsandall data.
+      </p>
     <table width="100%">
       <thead>
         <tr>
@@ -99,35 +197,12 @@
         {% endfor %}
       </tbody>
     </table>
+    <li>
     {% endif %}
-    <h2>API Key</h2>
-    <p>{{ apikey }}</p>
-    <p>
-      <a href="/rowers/me/regenerateapikey/">Regenerate</a>
-    </p>
-    This API key can be used to access the Rowsandall API. It is used by some third party applications to access your data. Keep it secret.
-  </li>
 
 </ul>
-    <p>Click on one of the icons below to connect to the service of your
-      choice or to renew the authorization.</p>
-    <p><a href="/rowers/me/stravaauthorize/"><img src="/static/img/ConnectWithStrava.png" alt="connect with strava" width="120"></a></p>
-    <p><a href="/rowers/me/c2authorize/"><img src="/static/img/blueC2logo.png" alt="connect with Concept2" width="120"></a></p>
-    <p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
-    <p><a href="/rowers/me/sporttracksauthorize/"><img src="/static/img/sporttracks-button.png" alt="connect with SportTracks" width="120"></a></p>
-    <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
-                                                 alt="connect with Polar" width="130"></a></p>
-    <p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
-					      alt="connect with Polar" width="130"></a></p>
-    
-    <p><a href="/rowers/me/garminauthorize"><img src="/static/img/garmin_badge_130.png"
-						 alt="connect with Garmin" width="130"></a></p>
-    <p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
-					      alt="connect with RP3" width="130"></a></p>
-    <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
-						 alt="connect with Rojabo" width="130"></a></p>
-<p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
-						alt="connect with intervals.icu" height="30"></a></p>
+</form>
+
 
 {% endblock %}
 
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 01771ce6..09ac2fa1 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -179,7 +179,13 @@ from rowers.models import ( RowerPowerForm, RowerHRZonesForm, SimpleRowerPowerFo
                             IndoorVirtualRaceForm, PlannedSessionCommentForm, Alert,
                             Condition, StaticChartRowerForm, FollowerForm,
                             VirtualRaceAthleteForm, InstantPlanForm, DataRowerForm,
-                            StepEditorForm, iDokladToken )
+                            StepEditorForm, iDokladToken,
+                            RowerExportFormStrava, RowerExportFormPolar,
+                            RowerExportFormSportTracks, RowerExportFormTrainingPeaks,
+                            RowerExportFormConcept2, RowerExportFormGarmin,
+                            RowerExportFormIntervals, RowerExportFormRP3,
+                            RowerExportFormNK, 
+                           )
 from rowers.models import (
     FavoriteForm, BaseFavoriteFormSet, SiteAnnouncement, BasePlannedSessionFormSet,
     get_course_timezone, BaseConditionFormSet,
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index ddd4fe73..d2d22e25 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -457,19 +457,42 @@ def rower_exportsettings_view(request, userid=0):
         'polar_auto_import': 'polartoken',
         'c2_auto_export': 'c2token',
         'c2_auto_import': 'c2token',
-        'runkeeper_auto_export': 'runkeepertoken',
         'sporttracks_auto_export': 'sporttrackstoken',
         'strava_auto_export': 'stravatoken',
         'strava_auto_import': 'stravatoken',
         'strava_auto_delete': 'stravatoken',
         'trainingpeaks_auto_export': 'tptoken',
         'rp3_auto_import': 'rp3token',
-        'nk_auto_import': 'nktoken'
+        'nk_auto_import': 'nktoken',
+        'intervals_auto_export': 'intervals_token',
     }
     r = getrequestrowercoachee(request, userid=userid)
+    
+    forms = {
+        'polar': RowerExportFormPolar(instance=r),
+        'c2': RowerExportFormConcept2(instance=r),
+        'sporttracks': RowerExportFormSportTracks(instance=r),
+        'strava': RowerExportFormStrava(instance=r),
+        'trainingpeaks': RowerExportFormTrainingPeaks(instance=r),
+        'rp3': RowerExportFormRP3(instance=r),
+        'intervals': RowerExportFormIntervals(instance=r),
+        'nk': RowerExportFormNK(instance=r),
+        'garmin': RowerExportFormGarmin(instance=r),
+    }
 
     if request.method == 'POST':
         form = RowerExportForm(request.POST)
+        forms = {
+            'polar': RowerExportFormPolar(request.POST, instance=r),
+            'c2': RowerExportFormConcept2(request.POST, instance=r),
+            'sporttracks': RowerExportFormSportTracks(request.POST, instance=r),
+            'strava': RowerExportFormStrava(request.POST, instance=r),
+            'trainingpeaks': RowerExportFormTrainingPeaks(request.POST, instance=r),
+            'rp3': RowerExportFormRP3(request.POST, instance=r),
+            'intervals': RowerExportFormIntervals(request.POST, instance=r),
+            'nk': RowerExportFormNK(request.POST, instance=r),
+            'garmin': RowerExportFormGarmin(request.POST, instance=r),
+        }
         if form.is_valid():
             cd = form.cleaned_data
             if r.rowerplan == 'basic':  # pragma: no cover
@@ -528,6 +551,7 @@ def rower_exportsettings_view(request, userid=0):
 
     return render(request, 'rower_exportsettings.html',
                   {'form': form,
+                   'forms': forms,
                    'rower': r,
                    'breadcrumbs': breadcrumbs,
                    'grants': grants,

From a7d48d711f7875b5ea3a6ce13503fda3306e067c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 13 Dec 2024 13:15:48 +0100
Subject: [PATCH 3/5] adding resampling on demand, untested

---
 rowers/integrations/intervals.py           |  13 ++++++++++-
 rowers/models.py                           |   2 ++
 rowers/templates/rower_exportsettings.html |  26 ++++++++++-----------
 rowers/tests/testdata/testdata.tcx.gz      | Bin 3999 -> 4000 bytes
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py
index 4e0ac680..1cdcbfb0 100644
--- a/rowers/integrations/intervals.py
+++ b/rowers/integrations/intervals.py
@@ -101,7 +101,16 @@ class IntervalsIntegration(SyncIntegration):
 
     def createworkoutdata(self, w, *args, **kwargs) -> str:
         dozip = kwargs.get('dozip', True)
-        filename = w.csvfilename
+        # resample if wanted by user, not tested
+        if w.user.intervals_resample_to_1s:
+            datadf, id, msgs = dataprep.resample(
+                w.id, w.user, w, overwrite=False
+            )
+            w_resampled = Workout.objects.get(id=id)
+            filename = w_resampled.csvfilename
+        else:
+            w_resampled = None
+            filename = w.csvfilename
         try:
             row = rowingdata(csvfile=filename)
         except IOError: # pragma: no cover
@@ -128,6 +137,8 @@ class IntervalsIntegration(SyncIntegration):
         except TypeError:
             newnotes = 'from'+w.workoutsource+' via rowsandall.com'
 
+        if w.user.intervals_resample_to_1s and w_resampled:
+            w_resampled.delete()
         row.exporttotcx(tcxfilename, notes=newnotes, sport=mytypes.intervalsmapping[w.workouttype])
         if dozip:
             gzfilename = tcxfilename + '.gz'
diff --git a/rowers/models.py b/rowers/models.py
index 3ac826ff..cd2500f7 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1174,6 +1174,7 @@ class Rower(models.Model):
     c2_auto_import = models.BooleanField(default=False)
     intervals_auto_export = models.BooleanField(default=False)
     intervals_auto_import = models.BooleanField(default=False)
+    intervals_resample_to_1s = models.BooleanField(default=False, verbose_name='Resample to 1s on export')
     sporttrackstoken = models.CharField(
         default='', max_length=200, blank=True, null=True)
     sporttrackstokenexpirydate = models.DateTimeField(blank=True, null=True)
@@ -4578,6 +4579,7 @@ class RowerExportFormIntervals(ModelForm):
         fields = [
             'intervals_auto_import',
             'intervals_auto_export',
+            'intervals_resample_to_1s',
         ]
 
 class RowerExportFormGarmin(ModelForm):
diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html
index 9625a472..0d7d3858 100644
--- a/rowers/templates/rower_exportsettings.html
+++ b/rowers/templates/rower_exportsettings.html
@@ -64,13 +64,13 @@
   </li>
     {% endif %}
   <li class="rounder">
-    <h2>Polar</h2>
+    <h2>Intervals.icu</h2>
     <table>
-      {{ forms.polar.as_table }}      
+      {{ forms.intervals.as_table }}
       <input type="submit" value="Save">
     </table>
-    <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
-                                                 alt="connect with Polar" width="130"></a></p>
+    <p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
+						    alt="connect with intervals.icu"></a></p>
   </li>
   <li class="rounder">
     <h2>Concept2</h2>
@@ -103,20 +103,20 @@
       <input type="submit" value="Save">
     </table>
   </li>
+  <li class="rounder">
+    <h2>Polar</h2>
+    <table>
+      {{ forms.polar.as_table }}      
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
+                                                 alt="connect with Polar" width="130"></a></p>
+  </li>
   <li class="rounder">
     <h2>Rojabo</h2>
     <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
 						 alt="connect with Rojabo" width="130"></a></p>
   </li>
-  <li class="rounder">
-    <h2>Intervals.icu</h2>
-    <table>
-      {{ forms.intervals.as_table }}
-      <input type="submit" value="Save">
-    </table>
-    <p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
-						    alt="connect with intervals.icu"></a></p>
-  </li>
   <li class="rounder">
     <h2>Garmin Connect</h2>
     <table>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index f15cf38957d0b2a3b4cba860a3eabe8396f81f14..3a4eca337f44e3c892acabb79b59b31fb7ee2684 100644
GIT binary patch
literal 4000
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
GfB^tD?Jjo!

literal 3999
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
F0RYzQKaKzZ


From dfad4865c908abb4b8b87c6a25d8d698b307c21f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sat, 14 Dec 2024 13:58:23 +0100
Subject: [PATCH 4/5] ready for merge back

---
 rowers/dataprep.py                         |   4 +-
 rowers/forms.py                            |  20 +++++---
 rowers/integrations/intervals.py           |   1 +
 rowers/models.py                           |   2 +-
 rowers/templates/rower_exportsettings.html |  53 +++++++++------------
 rowers/tests/testdata/testdata.tcx.gz      | Bin 4000 -> 3999 bytes
 rowers/uploads.py                          |  36 +++++++-------
 rowers/views/userviews.py                  |   1 +
 rowers/views/workoutviews.py               |  11 -----
 static/img/intervals_logo_with_name.png    | Bin 0 -> 18456 bytes
 10 files changed, 61 insertions(+), 67 deletions(-)
 create mode 100644 static/img/intervals_logo_with_name.png

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 827a9717..28bf84be 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -369,7 +369,7 @@ def workout_summary_to_df(
     return df
 
 
-def resample(id, r, parent, overwrite='copy'):
+def resample(id, r, parent, overwrite=False):
     data, row = getrowdata_db(id=id)
     messages = []
 
@@ -393,7 +393,7 @@ def resample(id, r, parent, overwrite='copy'):
     data['pace'] = data['pace'] / 1000.
     data['time'] = data['time'] / 1000.
 
-    if overwrite == 'overwrite':
+    if overwrite == True:
         # remove CP data
         try:
             cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=parent.id)
diff --git a/rowers/forms.py b/rowers/forms.py
index 0ebc5fb3..506f900f 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -67,13 +67,12 @@ class FlexibleDecimalField(forms.DecimalField):
 
 
 class ResampleForm(forms.Form):
-    resamplechoices = (
-        ('overwrite', 'Overwrite Workout'),
-        ('copy', 'Create a Duplicate Workout')
-    )
-
+    # add resamplechoice field, the result is a True or False boolean, labels are "overwrite" and "create copy"
     resamplechoice = forms.ChoiceField(
-        initial='copy', choices=resamplechoices, label='Copy behavior')
+        required=True,
+        choices=((True, 'overwrite'), (False, 'create copy')),
+        label='Resample choice',
+        widget=forms.RadioSelect)
 
 
 class TrainingZonesForm(forms.Form):
@@ -582,6 +581,11 @@ class UploadOptionsForm(forms.Form):
         races = VirtualRace.objects.filter(
             registration_closure__gt=timezone.now())
 
+        # set upload_to_X based on r.X_auto_export
+        for field in ['C2', 'Strava', 'SportTracks', 'TrainingPeaks', 'Intervals']:
+            if getattr(r, field.lower()+'_auto_export') and r.rowerplan in ['pro', 'plan','coach']:
+                self.fields['upload_to_'+field].initial = True
+
         registrations = IndoorVirtualRaceResult.objects.filter(
             race__in=races,
             userid=r.id)
@@ -665,6 +669,10 @@ class TeamUploadOptionsForm(forms.Form):
     upload_to_TrainingPeaks = forms.BooleanField(initial=False,
                                                  required=False,
                                                  label='Export to TrainingPeaks')
+
+    upload_to_Intervals = forms.BooleanField(initial=False,
+                                                 required=False,
+                                                 label='Export to TrainingPeaks')
     # do_physics = forms.BooleanField(initial=False,required=False,label='Power Estimate (OTW)')
     makeprivate = forms.BooleanField(initial=False, required=False,
                                      label='Make Workout Private')
diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py
index 1cdcbfb0..7db883ae 100644
--- a/rowers/integrations/intervals.py
+++ b/rowers/integrations/intervals.py
@@ -17,6 +17,7 @@ import os
 from uuid import uuid4
 from django.utils import timezone
 from datetime import timedelta
+import rowers.dataprep as dataprep
 
 from rowsandall_app.settings import (
     INTERVALS_CLIENT_ID, INTERVALS_REDIRECT_URI, INTERVALS_CLIENT_SECRET, SITE_URL
diff --git a/rowers/models.py b/rowers/models.py
index cd2500f7..047d8d0a 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -4561,6 +4561,7 @@ class RowerExportForm(ModelForm):
             'rp3_auto_import',
             'intervals_auto_import',
             'intervals_auto_export',
+            'intervals_resample_to_1s'
         ]
         
 class RowerExportFormStrava(ModelForm):
@@ -4616,7 +4617,6 @@ class RowerExportFormTrainingPeaks(ModelForm):
         model = Rower
         fields = [
             'trainingpeaks_auto_export',
-            'rp3_auto_import',
         ]
 
 class RowerExportFormRP3(ModelForm):
diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html
index 0d7d3858..13418d15 100644
--- a/rowers/templates/rower_exportsettings.html
+++ b/rowers/templates/rower_exportsettings.html
@@ -64,13 +64,12 @@
   </li>
     {% endif %}
   <li class="rounder">
-    <h2>Intervals.icu</h2>
+    <h2>NK</h2>
     <table>
-      {{ forms.intervals.as_table }}
+      {{ forms.nk.as_table }}
       <input type="submit" value="Save">
     </table>
-    <p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_icu.png"
-						    alt="connect with intervals.icu"></a></p>
+    <p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
   </li>
   <li class="rounder">
     <h2>Concept2</h2>
@@ -81,12 +80,27 @@
     <p><a href="/rowers/me/c2authorize/"><img src="/static/img/blueC2logo.png" alt="connect with Concept2" width="120"></a></p>
   </li>
   <li class="rounder">
-    <h2>NK</h2>
+    <h2>RP3</h2>
     <table>
-      {{ forms.nk.as_table }}
+      {{ forms.rp3.as_table }}
       <input type="submit" value="Save">
     </table>
-    <p><a href="/rowers/me/nkauthorize/"><img src="/static/img/NKLiNKLogbook.png" alt="connect with NK Logbook" width="120"></a></p>
+    <p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
+					      alt="connect with RP3" width="130"></a></p>
+  </li>    
+  <li class="rounder">
+    <h2>Rojabo</h2>
+    <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
+						 alt="connect with Rojabo" width="130"></a></p>
+  </li>
+  <li class="rounder">
+    <h2>Intervals.icu</h2>
+    <table>
+      {{ forms.intervals.as_table }}
+      <input type="submit" value="Save">
+    </table>
+    <p><a href="/rowers/me/intervalsauthorize"><img src="/static/img/intervals_logo_with_name.png"
+						    alt="connect with intervals.icu"></a></p>
   </li>
   <li class="rounder">
     <h2>SportTracks</h2>
@@ -102,6 +116,8 @@
       {{ forms.trainingpeaks.as_table }}
       <input type="submit" value="Save">
     </table>
+    <p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
+					      alt="connect with Polar" width="130"></a></p>
   </li>
   <li class="rounder">
     <h2>Polar</h2>
@@ -112,11 +128,6 @@
     <p><a href="/rowers/me/polarauthorize/"><img src="/static/img/Polar_connectwith_btn_white.png"
                                                  alt="connect with Polar" width="130"></a></p>
   </li>
-  <li class="rounder">
-    <h2>Rojabo</h2>
-    <p><a href="/rowers/me/rojaboauthorize"><img src="/static/img/rojabo.png"
-						 alt="connect with Rojabo" width="130"></a></p>
-  </li>
   <li class="rounder">
     <h2>Garmin Connect</h2>
     <table>
@@ -153,24 +164,6 @@
     </p>
 
   </li>
-  <li class="rounder">
-    <h2>TrainingPeaks</h2>
-    <table>
-      {{ forms.trainingpeaks.as_table }}
-      <input type="submit" value="Save">
-    </table>
-    <p><a href="/rowers/me/tpauthorize/"><img src="/static/img/TP_logo_horz_2_color.png"
-					      alt="connect with Polar" width="130"></a></p>
-  </li>
-  <li class="rounder">
-    <h2>RP3</h2>
-    <table>
-      {{ forms.rp3.as_table }}
-      <input type="submit" value="Save">
-    </table>
-    <p><a href="/rowers/me/rp3authorize"><img src="/static/img/logo-rp3-full-black.png"
-					      alt="connect with RP3" width="130"></a></p>
-  </li>    
     {% if grants %}
   <li class="rounder">
     <h2>Applications</h2>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 3a4eca337f44e3c892acabb79b59b31fb7ee2684..dd7306f84921784d4337eb7cf60575abe39ca49f 100644
GIT binary patch
delta 257
zcmV+c0sj7=AD<rwABzYG4t`y+2dNH!Xhm$tM;^XA?teH~><+lIJJZMCm_J{BTJ63+
zczBUGo?U#{_gR<To{O`$n{NHGJ2}}tt@LrVK7QHtT{>^Kd%F^qPsbfRc-_A`ySVb2
zJUBl;SsitK`stT1#^t%cI$8Ser`M~KmzO{HxAZ=yL$5rX4_lsg|4En3&Vs9OpTFL1
zwN9J8eA;ij;quXbasGoB>81~VU7jqv%`$PwpFTXgEBAHqq+1_9esuWrv&?4u=WhEi
z=`DWt`t*-wx-)=#0K5MW7FWL5J^AfpI=r(*y;`T|@GzlVUOY-q<BxRd!#n>2op#5N
H#DD<+W`c@3

delta 258
zcmV+d0sa1;AD|xxABzYG+aFx92dNH!vHLS{=(;6*cijJQu-F}NXLqKLzcGKl{IuGA
zfAH`kaXh>Du<x@jy*(FaZ#UigWp{G2eOl?`YJL2&>$`N`ZufR2DxZ!!c<{P^b#`&(
zHF<D;ezH31`t;K;UyRFhe|56--A}JqCoeC5?r-UROov{1I3Kn=?f#Q4nVki3S3iHf
z+iIOQd-=5AcEjbP{o?!wFVamP{<=I_cAI75kUxERbXV@{;7PYWe*Eb0=VzJC_Rrn+
zU(#Fr?Dgp%%XDV|_W*YPA1tnXv3v5{$8>mSi+Z(A&*5Q0xx9Fkp2i>P(ua5c2dhPx
I_QZez0LCki$p8QV

diff --git a/rowers/uploads.py b/rowers/uploads.py
index 71f07553..fae902d5 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -245,23 +245,6 @@ def do_sync(w, options, quick=False):
             dologging('c2_log.log','Error C2')
             pass
 
-    if do_strava_export:  # pragma: no cover
-        strava_integration = StravaIntegration(w.user.user)
-        try:
-            id = strava_integration.workout_export(w)
-            dologging(
-                'strava_export_log.log',
-                'exporting workout {id} as {type}'.format(
-                    id=w.id,
-                    type=w.workouttype,
-                )
-            )
-        except NoTokenError:  # pragma: no cover
-            id = 0
-            message = "Please connect to Strava first"
-        except Exception as e:
-            dologging('stravalog.log', e)
-
     if do_icu_export:
         intervals_integration = IntervalsIntegration(w.user.user)
         try:
@@ -334,4 +317,23 @@ def do_sync(w, options, quick=False):
             dologging('tp_export.log','No Token Error')
             return 0
 
+    # we do Strava last. 
+    if do_strava_export:  # pragma: no cover
+        strava_integration = StravaIntegration(w.user.user)
+        try:
+            id = strava_integration.workout_export(w)
+            dologging(
+                'strava_export_log.log',
+                'exporting workout {id} as {type}'.format(
+                    id=w.id,
+                    type=w.workouttype,
+                )
+            )
+        except NoTokenError:  # pragma: no cover
+            id = 0
+            message = "Please connect to Strava first"
+        except Exception as e:
+            dologging('stravalog.log', e)
+
+
     return 1
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index d2d22e25..cf004032 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -465,6 +465,7 @@ def rower_exportsettings_view(request, userid=0):
         'rp3_auto_import': 'rp3token',
         'nk_auto_import': 'nktoken',
         'intervals_auto_export': 'intervals_token',
+        'intervals_resample_to_1s': 'intervals_token',
     }
     r = getrequestrowercoachee(request, userid=userid)
     
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 14112726..0412c7ff 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -5609,17 +5609,6 @@ def workout_upload_view(request,
             return response
     else:
         if not is_ajax:
-            if r.c2_auto_export and ispromember(r.user):  # pragma: no cover
-                uploadoptions['upload_to_C2'] = True
-
-            if r.strava_auto_export and ispromember(r.user):  # pragma: no cover
-                uploadoptions['upload_to_Strava'] = True
-
-            if r.sporttracks_auto_export and ispromember(r.user):  # pragma: no cover
-                uploadoptions['upload_to_SportTracks'] = True
-
-            if r.trainingpeaks_auto_export and ispromember(r.user):  # pragma: no cover
-                uploadoptions['upload_to_TrainingPeaks'] = True
 
             form = DocumentsForm(initial=docformoptions)
             optionsform = UploadOptionsForm(initial=uploadoptions,
diff --git a/static/img/intervals_logo_with_name.png b/static/img/intervals_logo_with_name.png
new file mode 100644
index 0000000000000000000000000000000000000000..b448dd4e6a12f8d5d9b8888035ce6ea20d3f3f26
GIT binary patch
literal 18456
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

literal 0
HcmV?d00001


From 0cf8704bd6bddb87b7644d810fe09198cb1cb6e5 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sat, 14 Dec 2024 14:14:40 +0100
Subject: [PATCH 5/5] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4001 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index dd7306f84921784d4337eb7cf60575abe39ca49f..f05208b7635b1a0be253904dc3acd3f4a6c0d0bb 100644
GIT binary patch
literal 4001
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
H#DD<+r2IT+

literal 3999
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
F0RaAiDCqzI