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

Merge branch 'release/v13.43'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-14 20:07:16 +02:00
parent 612020d7b6 1a8010ad1b
commit 31b2afc03f
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tasks.py
View File

@@ -608,7 +608,7 @@ def handle_check_race_course(self,
f.write(b'--- LOG of all gate times---') f.write(b'--- LOG of all gate times---')
for path,polygon in zip(paths,polygons): for path,polygon in zip(paths,polygons):
( secs,meters,completed) = coursetime_paths(rowdata2, ( secs,meters,completed) = coursetime_paths(rowdata,
[path],polygons=[polygon],logfile=logfile) [path],polygons=[polygon],logfile=logfile)
with open(logfile,'ab') as f: with open(logfile,'ab') as f:
line = " time: {t} seconds, distance: {m} meters".format(t=secs,m=meters) line = " time: {t} seconds, distance: {m} meters".format(t=secs,m=meters)

32
rowers/views/importviews.py
View File

@@ -1082,7 +1082,9 @@ def strava_webhook_view(request):
f.write('KeyError line 10576') f.write('KeyError line 10576')
return HttpResponse(status=200) return HttpResponse(status=200)
try: try:
w = Workout.objects.get(uploadedtostrava=stravaid) ws = Workout.objects.filter(uploadedtostrava=stravaid)
if len(ws) == 0:
return HttpResponse(status=200)
except Workout.DoesNotExist: except Workout.DoesNotExist:
timestamp = time.strftime('%b-%d-%Y_%H%M', t) timestamp = time.strftime('%b-%d-%Y_%H%M', t)
with open('strava_webhooks.log','a') as f: with open('strava_webhooks.log','a') as f:
@@ -1101,22 +1103,22 @@ def strava_webhook_view(request):
f.write(' ') f.write(' ')
f.write('Rower not found') f.write('Rower not found')
return HttpResponse(status=200) return HttpResponse(status=200)
print(updates)
for key, value in updates.items(): for key, value in updates.items():
if key == 'title': for w in ws:
w.name = value if key == 'title':
w.save() w.name = value
if key == 'type':
try:
w.workouttype = mytypes.stravamappinginv[value]
w.save() w.save()
except KeyError: if key == 'type':
with open('strava_webhooks.log','a') as f: try:
f.write('\n') w.workouttype = mytypes.stravamappinginv[value]
f.write(timestamp) w.save()
f.write(' ') except KeyError:
f.write('Workout type not found: '+str(value)) with open('strava_webhooks.log','a') as f:
return HttpResponse(status=200) f.write('\n')
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)