From 7a9385f1bfb3679eb5648399f8eee513d8f21d57 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 26 Dec 2024 17:17:04 +0100
Subject: [PATCH 1/3] fixing timezone error c2 import

---
 rowers/dataprep.py                    |   7 ++++--
 rowers/dataroutines.py                |  33 +++++++++++++++++++++-----
 rowers/tests/testdata/testdata.tcx.gz | Bin 4002 -> 4000 bytes
 rowers/views/workoutviews.py          |   2 ++
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index a824f571..acce7fa3 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1156,7 +1156,8 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                           consistencychecks=False,
                           startdatetime='',
                           workoutid='',
-                          impeller=False):
+                          impeller=False,
+                          timezone=''):
 
     message = None
 
@@ -1173,7 +1174,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
     row = rdata(f2, rower=rr)
 
     startdatetime, startdate, starttime, timezone_str, partofday = get_startdate_time_zone(
-        r, row, startdatetime=startdatetime)
+        r, row, startdatetime=startdatetime, timezone=timezone)
 
     if title is None or title == '':
         title = 'Workout'
@@ -1463,6 +1464,7 @@ def new_workout_from_file(r, f2,
                           rpe=-1,
                           makeprivate=False,
                           startdatetime='',
+                          timezone='',
                           notes='',
                           workoutid='',
                           oarlockfirmware='',
@@ -1641,6 +1643,7 @@ def new_workout_from_file(r, f2,
         workoutsource=workoutsource,
         summary=summary,
         startdatetime=startdatetime,
+        timezone=timezone, 
         rpe=rpe,
         inboard=inboard, oarlength=oarlength,
         seatnumber=seatnumber, boatname=boatname,
diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 001f6fcb..d020faf6 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -905,7 +905,7 @@ def clean_df_stats_pl(datadf, workstrokesonly=True, ignorehr=True,
     return datadf
 
 
-def getpartofday(row, r):
+def getpartofday(row, r, startdatetime=None, timezone=''):
     workoutstartdatetime = row.rowdatetime
     try:  # pragma: no cover
         latavg = row.df[' latitude'].mean()
@@ -932,6 +932,8 @@ def getpartofday(row, r):
         workoutstartdatetime = row.rowdatetime
 
     h = workoutstartdatetime.astimezone(pytz.timezone(timezone_str)).hour
+    if startdatetime is not None:
+        h = startdatetime.hour
 
     if h < 12:  # pragma: no cover
         return "Morning"
@@ -1170,7 +1172,9 @@ parsers = {
 }
 
 
-def get_startdate_time_zone(r, row, startdatetime=None):
+def get_startdate_time_zone(r, row, startdatetime=None, timezone=''):
+    if timezone != '':
+        preserve_timezone = True
     if isinstance(startdatetime, str):
         try:
             startdatetime = pendulum.parse(startdatetime)
@@ -1184,15 +1188,15 @@ def get_startdate_time_zone(r, row, startdatetime=None):
             timezone_str = 'Ect/GMT'
     elif startdatetime == '':
         startdatetime = row.rowdatetime
-    else:
-        startdatetime = row.rowdatetime
+    #else:
+    #    startdatetime = row.rowdatetime
 
     try:
         _ = startdatetime.tzinfo
     except AttributeError:  # pragma: no cover
         startdatetime = row.rowdatetime
 
-    partofday = getpartofday(row, r)
+    partofday = getpartofday(row, r, startdatetime=startdatetime, timezone=timezone)
 
     if startdatetime.tzinfo is None or str(startdatetime.tzinfo) in ['tzutc()', 'Ect/GMT']:
         timezone_str = 'UTC'
@@ -1200,6 +1204,8 @@ def get_startdate_time_zone(r, row, startdatetime=None):
             startdatetime = timezone.make_aware(startdatetime)
         except ValueError:  # pragma: no cover
             pass
+        except AttributeError:
+            pass
 
         try:
             latavg = row.df[' latitude'].mean()
@@ -1232,8 +1238,23 @@ def get_startdate_time_zone(r, row, startdatetime=None):
         timezone_str = str(startdatetime.tzinfo)
 
     try:
-        startdatetime = startdatetime.astimezone(pytz.timezone(timezone_str))
+        if not preserve_timezone:
+            startdatetime = startdatetime.astimezone(pytz.timezone(timezone_str))
     except UnknownTimeZoneError:
+        try:
+            offset = timezone_str.strip("(TimeZone('')").split(":")
+            hours = int(offset[0])
+            minutes = int(offset[1])
+            tz_offset = datetime.timedelta(hours=hours, minutes=minutes)
+            tz = datetime.timezone(tz_offset)
+            utc_offset = tz.utcoffset(datetime.utcnow()).total_seconds()
+            for zone in pytz.all_timezones:
+                if pytz.timezone(zone).utcoffset(datetime.utcnow()).total_seconds() == utc_offset:
+                    timezone_str = zone
+                    break
+        except Exception as e:
+            pass
+
         startdatetime = startdatetime.astimezone(pytz.utc)
         
     startdate = startdatetime.strftime('%Y-%m-%d')
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b4e8bb72205b09cbe511f32621f2e294a7633432..b3805e75c0c5ee1d3c677fdb474083dbcfbf304f 100644
GIT binary patch
literal 4000
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
GfB^subT<tE

literal 4002
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
I(!_uP0C_$<*#H0l

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 26ec16f8..07ce9525 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4981,6 +4981,7 @@ def workout_upload_api(request):
     garminid = post_data.get('garminid','')
     workoutid = post_data.get('id','')
     startdatetime = post_data.get('startdatetime', '')
+    timezone = post_data.get('timezone','')
     oarlockfirmware = post_data.get('oarlockfirmware', None)
     inboard = post_data.get('inboard', None)
     oarlength = post_data.get('oarlength', None)
@@ -5079,6 +5080,7 @@ def workout_upload_api(request):
             notes=notes,
             uploadoptions=post_data,
             startdatetime=startdatetime,
+            timezone=timezone,
             oarlockfirmware=oarlockfirmware,
             inboard=inboard,
             oarlength=oarlength,

From a3fd2ccb3c3265b42fb3ff3183ce57c152322a32 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 26 Dec 2024 17:32:08 +0100
Subject: [PATCH 2/3] fixing time zone errors

---
 rowers/dataroutines.py                |   1 +
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 2 files changed, 1 insertion(+)

diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index d020faf6..c828d047 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1173,6 +1173,7 @@ parsers = {
 
 
 def get_startdate_time_zone(r, row, startdatetime=None, timezone=''):
+    preserve_timezone = False
     if timezone != '':
         preserve_timezone = True
     if isinstance(startdatetime, str):
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b3805e75c0c5ee1d3c677fdb474083dbcfbf304f..feb1c75cf583d9a465adb8b1c98cef7bec065e87 100644
GIT binary patch
literal 4000
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
GfB^u{hDKrl

literal 4000
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
GfB^subT<tE


From c2ed25d659346035a8883915455136790e9e6897 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 26 Dec 2024 17:49:21 +0100
Subject: [PATCH 3/3] fixing time zones, tested

---
 rowers/tests/test_unit_tests.py       |   4 ++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rowers/tests/test_unit_tests.py b/rowers/tests/test_unit_tests.py
index bb571703..2546d575 100644
--- a/rowers/tests/test_unit_tests.py
+++ b/rowers/tests/test_unit_tests.py
@@ -543,7 +543,7 @@ class DataPrepTests(TestCase):
             ) = dataprep.get_startdate_time_zone(self.r,row,startdatetime=aware)
 
         self.assertEqual(timezone_str,'America/Los_Angeles')
-        self.assertEqual(partofday,'Morning')
+        self.assertEqual(partofday,'Evening')
         want = arrow.get('2021-06-15 19:55:13.400000-07:00').isoformat()
         got = arrow.get(startdatetime).isoformat()
 
@@ -569,7 +569,7 @@ class DataPrepTests(TestCase):
             ) = dataprep.get_startdate_time_zone(self.r,row)
 
         self.assertEqual(timezone_str,'America/Los_Angeles')
-        self.assertEqual(partofday,'Morning')
+        self.assertEqual(partofday,'Evening')
         want = arrow.get('2021-06-15 19:55:13.400000-07:00').isoformat()
         got = arrow.get(startdatetime).isoformat()
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index feb1c75cf583d9a465adb8b1c98cef7bec065e87..a7322de64d2ac744dd54cc30a06159b8726082eb 100644
GIT binary patch
delta 1310
zcmV+(1>yRjAD|xwABzYGjD?W~Ab()?TllyriUP;ZU<}xvATctz4JuMc?ir~isLR{G
zAF|t#Wm|>hNmB%?KpzZsb!}Z=J@V~5{O;ZP+1{Jw)n;|E{&pV??C*Vd^x*L2RkvEN
z)~An`>wbClr0cuiy3KMg?Y!Q6yZ@^1FAo-rw{PE?)9&hgwKm5W=Zo~^=70Fr^1RzD
zZa;kShW2--IOyK}g|j?5?pJSC{rex@^~-g>!5b%dw^@C1hPP}ku1*&OfQw(BKl^!m
ziifN9rtj9r%XHLcb+9|{vy0=d-~QS=-N2sys5fNZZBG9Dz`u9><L>O@YPH-f-r%3_
z|9jUT@Ah9_Ukd-)r3L}r^?%UaZ`?n6u(x;k;Q^$dkw1Ri@P6;-%Zsc2+x>s`ua;N)
zyD!t%Pfv~r&^-isNbnN*z~TWp6CH7czX2Qo94^vMf9(IPyWIP^@2>intMlcz`+s)q
z^@Y-*FE9G;EFbps^7vwXvN;m=hl?+^emvmGYWD^`U#1_sN%xuW<$tq{ANT$P-w|Rs
zTwH(pxWl6)YTfDbAIo(2KXv```^)p~tJ%N5OuyuM^V9YB%dX%2xV(D4TEFg>|L$-6
zh;*7?y0h2IBedxvyFWi(VR6ePZhZZ`d$&4&eg1#C0dcq7z%7@!@%7X7_EqiQA8p@?
zWg>gM<>rGtS*8bkM1Pnc<L>Vp6t7mNr|H&~{i}<UqvzfFb$6C1ezNuE-rezkKe_wu
zmdlIPy1%(Of05pSzwj<@cl-3n&t3^JcK9{f9&k?rHz|<+g2Il(?Fc@3z;Mg+-R^Kb
zdTqYA?8_g2{mV1Ktz-D-XH4h(SJ(GRY~tZ!_t)pwT%?PB{s{AKzs39_+=i2=0wMu-
zlgk1t4DC4Y6x?kvRFFH~gOdUSWePpWQ(fe#nkk+RlW_xa0lkys18@R+ACpxCgaJE~
z+5{{CJCg?mG7C2MR@DN{maV9~7n4K<I04&}eFd@syOS^m)e^gsuSmDIVAzYwljG5r
z)bQ?=lNSeR0Xvg{2NeMTla~id0Z5bL2W0_ZlSl}00WOoe2ssnj|FoL%-sR4>F6zd6
z1jeE%_xF<q2|)pflSm1D6KdRrdeEn_8(i*>r$O(F_QAbZv)BoV0U)<66TM2!vtpY|
zXZnuZZOcUTy1CxTWD>MmTIK-yux*op3mE}-lbZ`B0o#+p3oQa~i?i_y-2p(o7y4Fn
zH;i6#^-WM^<c3(Z()L~he(R+(j6UQwZFP~m2t^k=o0W!NOO}qnb|q^-uX5x@l*zbs
zp!LlgM892=4h}B??UOzZEPw4v*2>6TjMzG3&j7tOX{J{#fI<MRNA6wG`?1h}*!stY
z!^N}i^7_Mzi+;H|`s%Fz=7+Q8`EuRweZAfE^<LNS!8`xEJz)qg{%+x`)Bc;o#qNLy
zyEFaq8}sMuPpjSchmWrk$BU~E`@ZPX+jDjCcGIm-y0f$G(@Gy#>wnXeuJ6)$yWQKB
zsC+!`@X_o3)y36~*W}UV<=N`E>(fuaelf1k{l&@Bci+EWot<3&++WiBm=3-1a6W8#
z-u)+CGCK=ye*SW|)jDnV@^QcIhU-WB+4&D&rkg(cX?eEnHp|2zfBNv~Zrs=5vu=I*
z^vTf=FEX3$pS$fprZ>0v#q0Cmmg&v_9s=zCKV01SV)x{?kLl>a7WHbKp2OpWa(VS6
UJ&oVerH>x`4}sL=`ow?%0ObAc1poj5

delta 1346
zcmV-I1-<&9AD|xwABzYG9fFYtAb$|{Tllyrih^u|F<@tc#K`0}C`%o=XQY<UUEcov
zkll_f+bSeanj%;Q`e3N5YwP;zk#Fbm*KaN_4qh!c+tt<jt3xz!c<}YfqvL0rZna*m
z&%ax)`{m~QuJ4|A+vP#pdA<GW@I~KWA1xNIU%xiz-R5$&Hm6sYi}dC8^nb<jvfD21
zK78?t4)>=x>fZc?vwU;fuU@VCw?Dk;m+O3kw@&b8yZYb^ui0E}&KCrLi{G9;`DJ&C
zFIMYq->pxV>8S1MXn)=(SEpUS`?dGFfdl<fugJXFp8ffOfA9M5x{IsLYPns!!av{t
z_pU$P@4vjc6#lhK4FbCFp?~||czE*Y;NbY(14ut3e|*2;?ZGeCSDXH;!+-WKmYc)<
zm+9-rXD0;cz5w}x;2H9f#UpYiI^qa_12_UWUZkD=*#Aj)eeg@)ZTe@c%jH*xe|GH6
zh0>wVuKMmGANI@g^lE*!JrVZDi%+(`Kj8b-{tbG%Oh0y;?la%ZM}HgN@BIh96U1=5
zxcT&chi{Uob?3`}EYscp-1W<EuP=A6X8-m&{gRu_kJsNWyMFuAa`SYxe%UYo-QW5V
z=`_D~7cZA5XwyaZf4;xM;*Lw)`ub`2W_9`U^8a)L;_kSCJ1%kS>&NTetJ=Rk*}WCZ
zMD}LO?FV_bOb_^kFn>SB{ol7JZdT{#>DHG0i>tGfr``HxcabQ5u=V!d-RXZnxcl9f
z>#Nnezr8tsk=}v7@GkCl`|!w*UI{UF_%+!b@IV5$DUkn!!k)z42tIhgaL4oA?Qk=C
zZ9lo}v!8zZ%QL~9WBA8sOy~Sp*Y`<m;_+ht*T>gfq>Fz1^9Sy}#rz`Ng_EfQA_4c4
z%mOP6-8k<Q+-)#akUKtrlLG@~3IoVfUF4~nDV~m#aszPzgOlU~a02@flU4+T0XLJ|
z1S|o2lL!Se3oiFo)dJ0yt*CqulSKtM0lSla1+oGAlQ9O>68n;`NVm6O*o(@O<I$GX
z@E(+t7zb$=dy=mxN-NO-6R1Y};3lKnH}CBLc{u`;m<LJ$Nt5FTWdUN7NeFQPK9jo$
zITP9cw3_kW<<7S*>c)En#-b_r50eK8K>>-ANeO)uYutr;(5JB*T<(vjLGO$9!F^D(
z*$IgOI(ID-y-LlqVw+26`i|UP%S80Lx!%cS60}-c<^cMzYnceTC2!DrX~x~u?fQ^g
zCR!0xIdW}i)i?K(oC_uayOYBUEduX~v+@hw0YH5a`c`u{j9zl}O;BazhFG-H_CW)F
z>!mY{KIAoRb&<OWMHf4pm4;tSmX5$~C2K&ha^yyo$+&c&_01bZzgv?J4le=SlRpkD
zf89#f%E(=e*g9j+0KGM7rdKV1LIABt?tRhwvCzNU`p1Uj#gp#(=EILy{c?Nq*+u{5
z4;RbJ<+?xke7EWIgRVb-H~#nM_KZ94p9lEty#Mleu|MF^{!D-T#{Bu_(`x_y@pqfV
z@oMvK-ygg5_H3?RZ@cwbcX6?MTIu6ze|>(|^<6q|w|~15mG{RTfAg|`akaVintXG8
zeX%<2`t;LpUW}V_e{!<)-M24S7iTv=_t*43rbBN%oOfHEcK=D2%+7+_pFiDgwN9J8
zyx(uP;pWkPbpGRK>84M9US2G_?J{x5pWZ#XTlaPRq+6dq{{G~LA2XZXpZo1UIHkAv
z$CsDSm+8&`z5v+&f4sQ$#s10f9@ELA9qQFOJ%{fS%H`(!^faEQOP@UY9|O<Q>BN8m
E0HE9cjsO4v