intervals.icu fixes
This commit is contained in:
@@ -942,7 +942,6 @@ def intervals_webhook_view(request):
|
||||
|
||||
webhook_type = None
|
||||
|
||||
|
||||
for event in events:
|
||||
try:
|
||||
athlete_id = event['athlete_id']
|
||||
@@ -964,6 +963,9 @@ def intervals_webhook_view(request):
|
||||
if webhook_type.lower() == 'activity_uploaded':
|
||||
integration.import_activities(event)
|
||||
|
||||
if webhook_type.lower() == 'activity_updated':
|
||||
integration.update_activities(event)
|
||||
|
||||
if webhook_type.lower() == 'activity_deleted':
|
||||
integration.delete_activities(event)
|
||||
|
||||
|
||||
@@ -1131,20 +1131,10 @@ def workouts_join_select(request,
|
||||
|
||||
r = getrequestrower(request, userid=userid)
|
||||
|
||||
if 'waterboattype' in request.session:
|
||||
waterboattype = request.session['waterboattype']
|
||||
else:
|
||||
waterboattype = mytypes.waterboattype+mytypes.ergtype
|
||||
waterboattype = mytypes.waterboattype+mytypes.ergtype
|
||||
|
||||
if 'modalities' in request.session:
|
||||
modalities = request.session['modalities']
|
||||
if len(modalities) > 1: # pragma: no cover
|
||||
modality = 'all'
|
||||
else:
|
||||
modality = modalities[0]
|
||||
else:
|
||||
modalities = [m[0] for m in mytypes.workouttypes]
|
||||
modality = 'all'
|
||||
modalities = [m[0] for m in mytypes.workouttypes]
|
||||
modality = 'all'
|
||||
|
||||
if request.method == 'POST':
|
||||
dateform = DateRangeForm(request.POST)
|
||||
@@ -1154,8 +1144,6 @@ def workouts_join_select(request,
|
||||
enddate = dateform.cleaned_data['enddate']
|
||||
startdatestring = startdate.strftime('%Y-%m-%d')
|
||||
enddatestring = enddate.strftime('%Y-%m-%d')
|
||||
request.session['startdate'] = startdatestring
|
||||
request.session['enddate'] = enddatestring
|
||||
if modalityform.is_valid():
|
||||
modality = modalityform.cleaned_data['modality']
|
||||
waterboattype = modalityform.cleaned_data['waterboattype']
|
||||
@@ -1164,11 +1152,7 @@ def workouts_join_select(request,
|
||||
else:
|
||||
modalities = [modality]
|
||||
|
||||
if modality != 'water': # pragma: no cover
|
||||
waterboattype = [b[0] for b in mytypes.boattypes]
|
||||
|
||||
request.session['modalities'] = modalities
|
||||
request.session['waterboattype'] = waterboattype
|
||||
else:
|
||||
dateform = DateRangeForm(initial={
|
||||
'startdate': startdate,
|
||||
@@ -1211,6 +1195,7 @@ def workouts_join_select(request,
|
||||
startdatetime__lte=enddate,
|
||||
workouttype__in=modalities).order_by("-date", "-starttime").exclude(boattype__in=negtypes)
|
||||
|
||||
|
||||
query = request.GET.get('q')
|
||||
if query: # pragma: no cover
|
||||
query_list = query.split()
|
||||
@@ -4954,6 +4939,7 @@ def workout_upload_api(request):
|
||||
message = {'status': 'false', 'message': 'invalid credentials'}
|
||||
return JSONResponse(status=403, data=message)
|
||||
|
||||
|
||||
form = DocumentsForm(post_data)
|
||||
optionsform = TeamUploadOptionsForm(post_data)
|
||||
rowerform = TeamInviteForm(post_data)
|
||||
|
||||
Reference in New Issue
Block a user