sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v16.4.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-16 22:02:08 +02:00
parent 4e43bd9492 4b0f5132f0
commit 7b0ac720f0
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprep.py
View File

@@ -1842,7 +1842,10 @@ parsers = {
def get_startdate_time_zone(r,row,startdatetime=None): def get_startdate_time_zone(r,row,startdatetime=None):
if startdatetime is not None and startdatetime != '': if startdatetime is not None and startdatetime != '':
try:
timezone_str = pendulum.instance(startdatetime).timezone.name timezone_str = pendulum.instance(startdatetime).timezone.name
except ValueError:
timezone_str = 'Ect/GMT'
else: else:
startdatetime = row.rowdatetime startdatetime = row.rowdatetime

4
rowers/views/importviews.py
View File

@@ -1161,13 +1161,13 @@ def strava_webhook_view(request):
except MultipleObjectsReturned: # pragma: no cover except MultipleObjectsReturned: # pragma: no cover
rs = Rower.objects.filter(strava_owner_id=strava_owner) rs = Rower.objects.filter(strava_owner_id=strava_owner)
r = rs[0] r = rs[0]
if r.strava_auto_import:
for key, value in updates.items(): for key, value in updates.items():
for w in ws: for w in ws:
if key == 'title': if key == 'title':
w.name = value w.name = value
w.save() w.save()
if key == 'type': if key == 'type' and r.strava_auto_import:
try: try:
w.workouttype = mytypes.stravamappinginv[value] w.workouttype = mytypes.stravamappinginv[value]
w.save() w.save()