diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html index 537521b6..77956eac 100644 --- a/rowers/templates/rower_exportsettings.html +++ b/rowers/templates/rower_exportsettings.html @@ -6,31 +6,30 @@

Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}

You are currently connected to: - {% if r.c2token %} + {% if rower.c2token is not None %} Concept2 Logbook, {% endif %} - {% if r.sporttrackstoken %} + {% if rower.sporttrackstoken is not None %} SportTracks, {% endif %} - {% if r.underarmourtoken %} + {% if rower.underarmourtoken is not None %} Under Armour (MapMyFitness), {% endif %} - {% if r.tptoken %} + {% if rower.tptoken is not None %} TrainingPeaks, {% endif %} - {% if r.polartoken %} + {% if rower.polartoken is not None %} Polar, {% endif %} - {% if r.garmintoken %} + {% if rower.garmintoken is not None %} Garmin Connect, {% endif %} - {% if r.stravatoken %} + {% if rower.stravatoken is not None %} Strava, {% endif %} - {% if r.runkeepertoken %} + {% if rower.runkeepertoken is not None %} Runkeeper. {% endif %} - Strava,

{% if form.errors %} diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index ef6e402c..f4f0dd1f 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1071,6 +1071,34 @@ def strava_webhook_view(request): ws = Workout.objects.filter(uploadedtostrava=stravaid) if ws.count()==0: job = stravastuff.async_get_workout(r.user,stravaid) + elif aspect_type == 'delete': + try: + stravid = data['object_id'] + except KeyError: + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('KeyError line 10576') + try: + ws = Workout.objects.filter(uploadedtostrava=stravaid) + if ws.count() == 0: + return HttpResponse(status=200) + except Workout.DoesNotExist: + return HttpResponse(status=200) + try: + r = Rower.objects.get(strava_owner_id=strava_owner) + except Rower.DoesNotExist: + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + with open('strava_webhooks.log','a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('Rower not found') + return HttpResponse(status=200) + for w in ws: + if w.user == r: + w.delete() elif aspect_type == 'update': try: updates = data['updates']