From bb485896b599b30770d89deff8ad9f68ebb0282b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 27 Dec 2024 15:32:28 +0100
Subject: [PATCH] fixing intervals.icu import

---
 rowers/integrations/intervals.py           |   5 ++++-
 rowers/management/commands/processemail.py |  20 ++++++++++----------
 rowers/templates/plannedsessions.html      |   8 ++++++++
 rowers/tests/testdata/testdata.tcx.gz      | Bin 3999 -> 4000 bytes
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py
index 182a8863..20cce3ca 100644
--- a/rowers/integrations/intervals.py
+++ b/rowers/integrations/intervals.py
@@ -497,7 +497,10 @@ class IntervalsIntegration(SyncIntegration):
             # got data
             if data:
                 ps.name = data['name']
-                ps.comment = data['description']
+                try:
+                    ps.comment = data['description']
+                except KeyError:
+                    ps.comment = ''
                 ps.startdate = arrow.get(data['start_date_local']).datetime
                 ps.enddate = arrow.get(data['end_date_local']).datetime
                 ps.preferreddate = arrow.get(data['start_date_local']).datetime
diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py
index be02ab17..9ea9dfc0 100644
--- a/rowers/management/commands/processemail.py
+++ b/rowers/management/commands/processemail.py
@@ -117,16 +117,16 @@ class Command(BaseCommand):
                 lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
                 dologging('processemail.log', ''.join('!! ' + line for line in lines))
 
-        rowers = Rower.objects.filter(intervals_auto_import=True)
-        for r in rowers:
-            try:
-                if user_is_not_basic(r.user) or user_is_coachee(r.user):
-                    intervals_integration = IntervalsIntegration(r.user)
-                    _ = intervals_integration.get_workouts()
-            except:
-                exc_type, exc_value, exc_traceback = sys.exc_info()
-                lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
-                dologging('processemail.log', ''.join('!! ' + line for line in lines))
+        #rowers = Rower.objects.filter(intervals_auto_import=True)
+        #for r in rowers:
+        #    try:
+        #        if user_is_not_basic(r.user) or user_is_coachee(r.user):
+        #            intervals_integration = IntervalsIntegration(r.user)
+        #            _ = intervals_integration.get_workouts()
+        #    except:
+        #        exc_type, exc_value, exc_traceback = sys.exc_info()
+        #        lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
+        #        dologging('processemail.log', ''.join('!! ' + line for line in lines))
 
         self.stdout.write(self.style.SUCCESS(
             'Successfully processed email attachments'))
diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index ece78a74..83728c8b 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -137,8 +137,16 @@
 	    <a class="small"
 	       href="https://intervals.icu/?w={{ ps.preferreddate }}"><i class="fa-kit fa-solid-wave-pulse-circle-check"></i></a>
 	    {% else %}
+	    {% if request.GET.startdate %}
 	    <a class="small"
 	       href="/rowers/sessions/{{ ps.id }}/tointervals/?next={{ request.path }}?startdate={{ request.GET.startdate }}&enddate={{ request.GET.enddate }}"><i class="fa-solid fa-wave-pulse"></i></a>
+	    {% elif request.GET.when %}
+	    <a class="small"
+	       href="/rowers/sessions/{{ ps.id }}/tointervals/?next={{ request.path }}?when={{ request.GET.when }}"><i class="fa-solid fa-wave-pulse"></i></a>
+	    {% else %}
+	    <a class="small"
+	       href="/rowers/sessions/{{ ps.id }}/tointervals/?next={{ request.path }}"><i class="fa-solid fa-wave-pulse"></i></a>
+	    {% endif %}
 	    {% endif %}
 	  </td>
 	  {% endif %}
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 5ad9c17224df1cd0cedbe94efe8de6480b3d4c2e..3db752f72704f3932e7a7a74a4cd18814f3a1667 100644
GIT binary patch
delta 257
zcmV+c0sj7<AD|xwABzYG;ia(#st$ig=#P&0h#h=)-2ZT}*d1_ZcczcOF@L`NwAy`t
z@bDsWJiGX?@3StwJr`$hH{JSWcXG0QTIu6zef+ZPyL8@e_jV;JpN>0t@Vb9>c5&r3
zd2oJyvO4Pe^wTe2jLUO>b+Yu`Pp?-eFE4-YZ|QwZhhBL&AGSR0{*x}5odt1MKYzX3
zYMnNF`Ly45!{wv>;`|3M(oG-!x;$BSn`PpVKYe&~SMKZJNw+?J{OIuKXPM3R&)xQ4
z(p&uO_30nWbY}qf0CxW$EUtX9d-B`Iba-crdbLi^;bB6#ym*wJ#vkd@hj;!5_8QFg
H#DD<+$UBf9

delta 256
zcmV+b0ssD>AD<rvABzYGNO-XZst$jlJ3<Dw0N)+=KO8J}2i)16>EmzApD#bHcHbX7
zyht3+E<Wu0tV?gt#o60Uw|?23oNS*~`nXyjzwG)howwV)U5U!4;|?CY?q8i<TzO3%
zoS&bpj=Dbm^vf6H^4wpYEPeOW>($B2%b)vOdLPrFS02uXEl<1uq)TRJ!PRijU+=bB
zr_EkI?YG@<`Dnj5|G|rN(}%w<PnO+gnK<N6A0FM6`#N~it&bl+I{f)rX0!csxBZv&
z7C(D^`o}We8NfY&-Tw!RD_`uM{Pr;&-r1sFt<!UOm{2Y+9;K)8N4oUko&N!FlV=jd
GfB^vRo{JR#