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

5
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 != '':
timezone_str = pendulum.instance(startdatetime).timezone.name try:
timezone_str = pendulum.instance(startdatetime).timezone.name
except ValueError:
timezone_str = 'Ect/GMT'
else: else:
startdatetime = row.rowdatetime startdatetime = row.rowdatetime

32
rowers/views/importviews.py
View File

@@ -1161,23 +1161,23 @@ 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()
if key == 'type' and r.strava_auto_import:
try:
w.workouttype = mytypes.stravamappinginv[value]
w.save() w.save()
if key == 'type': except KeyError: # pragma: no cover
try: with open('strava_webhooks.log','a') as f:
w.workouttype = mytypes.stravamappinginv[value] f.write('\n')
w.save() f.write(timestamp)
except KeyError: # pragma: no cover f.write(' ')
with open('strava_webhooks.log','a') as f: f.write('Workout type not found: '+str(value))
f.write('\n') return HttpResponse(status=200)
f.write(timestamp)
f.write(' ')
f.write('Workout type not found: '+str(value))
return HttpResponse(status=200)
return HttpResponse(status=200) return HttpResponse(status=200)