diff --git a/rowers/dataprep.py b/rowers/dataprep.py index b1522cc8..b1871fc9 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1842,7 +1842,10 @@ parsers = { def get_startdate_time_zone(r,row,startdatetime=None): 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: startdatetime = row.rowdatetime diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index dea39d19..c3e7ac18 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1161,23 +1161,23 @@ def strava_webhook_view(request): except MultipleObjectsReturned: # pragma: no cover rs = Rower.objects.filter(strava_owner_id=strava_owner) r = rs[0] - if r.strava_auto_import: - for key, value in updates.items(): - for w in ws: - if key == 'title': - w.name = value + + for key, value in updates.items(): + for w in ws: + if key == 'title': + w.name = value + w.save() + if key == 'type' and r.strava_auto_import: + try: + w.workouttype = mytypes.stravamappinginv[value] w.save() - if key == 'type': - try: - w.workouttype = mytypes.stravamappinginv[value] - w.save() - except KeyError: # pragma: no cover - with open('strava_webhooks.log','a') as f: - f.write('\n') - f.write(timestamp) - f.write(' ') - f.write('Workout type not found: '+str(value)) - return HttpResponse(status=200) + except KeyError: # pragma: no cover + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('Workout type not found: '+str(value)) + return HttpResponse(status=200) return HttpResponse(status=200)