got team upload working
This commit is contained in:
@@ -5285,10 +5285,6 @@ def workout_upload_view(request,
|
||||
|
||||
if 'uploadoptions' in request.session:
|
||||
uploadoptions = request.session['uploadoptions']
|
||||
try:
|
||||
_ = uploadoptions['landingpage']
|
||||
except KeyError: # pragma: no cover
|
||||
uploadoptions['landingpage'] = r.defaultlandingpage
|
||||
else:
|
||||
request.session['uploadoptions'] = uploadoptions
|
||||
|
||||
@@ -5310,6 +5306,7 @@ def workout_upload_view(request,
|
||||
if 'file' in request.FILES and request.FILES['file'] is not None:
|
||||
filename, file_path = handle_uploaded_file(request.FILES['file'])
|
||||
else:
|
||||
messages.error(request,"No file attached")
|
||||
return HttpResponseRedirect(reverse("workout_upload_view"))
|
||||
|
||||
uploadoptions['file'] = file_path
|
||||
@@ -5346,6 +5343,8 @@ def team_workout_upload_view(request, userid=0, message="",
|
||||
'plottype': 'timeplot',
|
||||
}):
|
||||
|
||||
r = getrower(request.user)
|
||||
|
||||
if 'uploadoptions' in request.session:
|
||||
uploadoptions = request.session['uploadoptions']
|
||||
else:
|
||||
@@ -5365,11 +5364,22 @@ def team_workout_upload_view(request, userid=0, message="",
|
||||
make_plot = uploadoptions['make_plot']
|
||||
plottype = uploadoptions['plottype']
|
||||
|
||||
form = DocumentsForm(initial=uploadoptions)
|
||||
optionsform = TeamUploadOptionsForm(initial=uploadoptions)
|
||||
rowerform = TeamInviteForm(userid=userid)
|
||||
rowerform.fields.pop('email')
|
||||
|
||||
rowers = Rower.objects.filter(
|
||||
coachinggroups__in=[r.mycoachgroup]
|
||||
).distinct()
|
||||
|
||||
rowerform.fields['user'].queryset = User.objects.filter(
|
||||
rower__in=rowers).distinct()
|
||||
|
||||
r = getrower(request.user)
|
||||
if request.method == 'POST':
|
||||
form = DocumentsForm(request.POST, request.FILES)
|
||||
optionsform = TeamUploadOptionsForm(request.POST)
|
||||
|
||||
rowerform = TeamInviteForm(request.POST)
|
||||
rowerform.fields.pop('email')
|
||||
rowers = Rower.objects.filter(
|
||||
@@ -5379,156 +5389,53 @@ def team_workout_upload_view(request, userid=0, message="",
|
||||
rowerform.fields['user'].queryset = User.objects.filter(
|
||||
rower__in=rowers).distinct()
|
||||
rowerform.fields['user'].required = True
|
||||
if form.is_valid() and rowerform.is_valid():
|
||||
f = request.FILES.get('file', False)
|
||||
if f:
|
||||
res = handle_uploaded_file(f)
|
||||
else: # pragma: no cover
|
||||
messages.error(request, 'No file attached')
|
||||
response = render(request,
|
||||
'team_document_form.html',
|
||||
{'form': form,
|
||||
'teams': get_my_teams(request.user),
|
||||
'optionsform': optionsform,
|
||||
'rowerform': rowerform,
|
||||
})
|
||||
return response
|
||||
|
||||
t = form.cleaned_data['title']
|
||||
offline = form.cleaned_data['offline']
|
||||
boattype = form.cleaned_data['boattype']
|
||||
workouttype = form.cleaned_data['workouttype']
|
||||
if rowerform.is_valid():
|
||||
u = rowerform.cleaned_data['user']
|
||||
r = getrower(u)
|
||||
if not can_add_workout_member(request.user, r): # pragma: no cover
|
||||
message = 'Please select a rower'
|
||||
messages.error(request, message)
|
||||
messages.info(request, successmessage)
|
||||
response = render(request,
|
||||
'team_document_form.html',
|
||||
{'form': form,
|
||||
'teams': get_my_teams(request.user),
|
||||
'optionsform': optionsform,
|
||||
'rowerform': rowerform,
|
||||
})
|
||||
|
||||
return response
|
||||
|
||||
workouttype = form.cleaned_data['workouttype']
|
||||
|
||||
if optionsform.is_valid():
|
||||
make_plot = optionsform.cleaned_data['make_plot']
|
||||
plottype = optionsform.cleaned_data['plottype']
|
||||
|
||||
uploadoptions = {
|
||||
'makeprivate': False,
|
||||
'make_plot': make_plot,
|
||||
'plottype': plottype,
|
||||
'upload_to_C2': False,
|
||||
}
|
||||
|
||||
if form.is_valid() and rowerform.is_valid() and optionsform.is_valid():
|
||||
uploadoptions = form.cleaned_data.copy()
|
||||
uploadoptions.update(optionsform.cleaned_data)
|
||||
uploadoptions.update(rowerform.cleaned_data)
|
||||
request.session['uploadoptions'] = uploadoptions
|
||||
|
||||
f1 = res[0] # file name
|
||||
f2 = res[1] # file name incl media directory
|
||||
|
||||
if not offline:
|
||||
id, message, f2 = dataprep.new_workout_from_file(
|
||||
r, f2,
|
||||
workouttype=workouttype,
|
||||
boattype=boattype,
|
||||
makeprivate=False,
|
||||
title=t,
|
||||
notes=''
|
||||
)
|
||||
else: # pragma: no cover
|
||||
_ = myqueue(
|
||||
queuehigh,
|
||||
handle_zip_file,
|
||||
r.user.email,
|
||||
t,
|
||||
f2,
|
||||
emailbounced=r.emailbounced
|
||||
)
|
||||
|
||||
messages.info(
|
||||
request,
|
||||
"The file was too large to process in real time."
|
||||
" It will be processed in a background process."
|
||||
" The user will receive an email when it is ready"
|
||||
)
|
||||
|
||||
url = reverse('team_workout_upload_view')
|
||||
response = HttpResponseRedirect(url)
|
||||
return response
|
||||
|
||||
if not id: # pragma: no cover
|
||||
messages.error(request, message)
|
||||
url = reverse('team_workout_upload_view')
|
||||
response = HttpResponseRedirect(url)
|
||||
return response
|
||||
elif id == -1: # pragma: no cover
|
||||
message = 'The zip archive will be processed in the background." \
|
||||
" The files in the archive will only be uploaded without the extra actions." \
|
||||
" You will receive email when the workouts are ready.'
|
||||
messages.info(request, message)
|
||||
url = reverse('team_workout_upload_view')
|
||||
response = HttpResponseRedirect(url)
|
||||
return response
|
||||
|
||||
if 'file' in request.FILES and request.FILES['file'] is not None:
|
||||
filename, file_path = handle_uploaded_file(request.FILES['file'])
|
||||
else:
|
||||
successmessage = "The workout was added to the user's account"
|
||||
messages.info(request, successmessage)
|
||||
messages.error(request,"No file attached")
|
||||
return HttpResponseRedirect(reverse("team_workout_upload_view"))
|
||||
|
||||
uploadoptions['file'] = file_path
|
||||
u = rowerform.cleaned_data['user']
|
||||
r = getrower(u)
|
||||
if not can_add_workout_member(request.user, r): # pragma: no cover
|
||||
message = 'Please select a rower'
|
||||
messages.error(request, message)
|
||||
|
||||
uploadoptions['user'] = u.id
|
||||
|
||||
response = upload_handler(uploadoptions, file_path)
|
||||
if response["status"] not in ["processing"]:
|
||||
messages.error(request, response["message"])
|
||||
url = reverse('team_workout_upload_view')
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
messages.info(request, response["message"])
|
||||
|
||||
response = HttpResponseRedirect(url)
|
||||
w = Workout.objects.get(id=id)
|
||||
|
||||
r = getrower(request.user)
|
||||
if (make_plot): # pragma: no cover
|
||||
id, jobid = uploads.make_plot(r, w, f1, f2, plottype, t)
|
||||
elif r.staticchartonupload:
|
||||
plottype = r.staticchartonupload
|
||||
id, jobid = uploads.make_plot(r, w, f1, f2, plottype, t)
|
||||
|
||||
# redirect to workouts_view
|
||||
url = reverse('team_workout_upload_view')
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
response = render(request,
|
||||
'team_document_form.html',
|
||||
{'form': form,
|
||||
'teams': get_my_teams(request.user),
|
||||
'active': 'nav-workouts',
|
||||
'breadcrumbs': breadcrumbs,
|
||||
'optionsform': optionsform,
|
||||
'rowerform': rowerform,
|
||||
})
|
||||
messages.error(request, "error")
|
||||
|
||||
return response
|
||||
else:
|
||||
form = DocumentsForm()
|
||||
optionsform = TeamUploadOptionsForm(initial=uploadoptions,
|
||||
request=request,raceid=raceid)
|
||||
rowerform = TeamInviteForm(userid=userid)
|
||||
rowerform.fields.pop('email')
|
||||
|
||||
rowers = Rower.objects.filter(
|
||||
coachinggroups__in=[r.mycoachgroup]
|
||||
).distinct()
|
||||
|
||||
rowerform.fields['user'].queryset = User.objects.filter(
|
||||
rower__in=rowers).distinct()
|
||||
|
||||
return render(request, 'team_document_form.html',
|
||||
response = render(request,
|
||||
'team_document_form.html',
|
||||
{'form': form,
|
||||
# 'teams':get_my_teams(request.user),
|
||||
'optionsform': optionsform,
|
||||
'teams': get_my_teams(request.user),
|
||||
'active': 'nav-workouts',
|
||||
'breadcrumbs': breadcrumbs,
|
||||
# 'rower':r,
|
||||
'optionsform': optionsform,
|
||||
'rowerform': rowerform,
|
||||
})
|
||||
|
||||
return response
|
||||
|
||||
|
||||
# A page with all the recent graphs (searchable on workout name)
|
||||
@login_required()
|
||||
|
||||
Reference in New Issue
Block a user