redirects to boxchart workout picker when ids messed up
This commit is contained in:
@@ -95,6 +95,15 @@ from scipy.signal import savgol_filter
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
def get_workouts(ids,userid):
|
||||||
|
workouts = []
|
||||||
|
for id in ids:
|
||||||
|
w = Workout.objects.get(id=id)
|
||||||
|
if w.user.user.id == userid:
|
||||||
|
workouts.append[w]
|
||||||
|
|
||||||
|
return workouts
|
||||||
|
|
||||||
def filter_df(datadf,fieldname,value,largerthan=True):
|
def filter_df(datadf,fieldname,value,largerthan=True):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -3124,7 +3124,18 @@ def boxplot_view(request,userid=0,
|
|||||||
workstrokesonly = not includereststrokes
|
workstrokesonly = not includereststrokes
|
||||||
ids = request.session['ids']
|
ids = request.session['ids']
|
||||||
request.session['ids'] = ids
|
request.session['ids'] = ids
|
||||||
workouts = [Workout.objects.get(id=id) for id in ids]
|
workouts = dataprep.get_workouts(ids,userid)
|
||||||
|
if not workouts:
|
||||||
|
message = 'Error: Workouts in session storage do not belong to this user.'
|
||||||
|
messages.error(request,message)
|
||||||
|
url = reverse(user_boxplot_select,
|
||||||
|
kwargs={
|
||||||
|
'userid':userid,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
|
# workouts = [Workout.objects.get(id=id) for id in ids]
|
||||||
|
|
||||||
labeldict = {
|
labeldict = {
|
||||||
int(w.id): w.__unicode__() for w in workouts
|
int(w.id): w.__unicode__() for w in workouts
|
||||||
|
|||||||
Reference in New Issue
Block a user