Merge branch 'develop' into feature/workoutslist

rowers/views/analysisviews.py

@@ -8,6 +8,7 @@ from rowers.views.statements import *
 import collections
 import simplejson
 from jinja2 import Template,Environment,FileSystemLoader
+from rowers.rower_rules import can_view_session
 
 def floatformat(x,prec=2): # pragma: no cover
     return '{x}'.format(x=round(x,prec))
@@ -34,7 +35,7 @@ defaultoptions = {
                   message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
                   redirect_field_name=None)
 @permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
-def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
+def analysis_new(request,userid=0,function='boxplot',teamid=0,id='',session=0):
     r = getrequestrower(request, userid=userid)
     user = r.user
     userid = user.id
@@ -52,6 +53,13 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
     except Team.DoesNotExist:
         theteam = None
 
+    try:
+        thesession = PlannedSession.objects.get(id=session)
+        if not can_view_session(user,thesession):
+            raise PermissionDenied("you cannot view this session")
+    except PlannedSession.DoesNotExist:
+        thesession = None
+
 
     if 'options' in request.session:
         options = request.session['options']
@@ -199,6 +207,8 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
                                           startdatetime__lte=enddate,
                                           workouttype__in=modalities,
         )
+    elif thesession is not None:
+        workouts = get_workouts_session(r,thesession)
     else:
         workouts = Workout.objects.filter(user=r,
                                           startdatetime__gte=startdate,