list view improved

rowers/views/statements.py

@@ -367,6 +367,14 @@ def get_workout_permitted(user,id):
     
     return w
         
+def get_workout_permittedview(user,id):
+    w = get_workout(id)
+    
+    if (checkworkoutuserview(user,w)==False):
+        raise PermissionDenied("Access denied")
+    
+    return w
+        
 def getvalue(data):
     perc = 0
     total = 1
@@ -944,7 +952,9 @@ from rowers.utils import (
 
 import rowers.datautils as datautils
 
-from rowers.models import checkworkoutuser,checkaccessuser,checkviewworkouts
+from rowers.models import (
+    checkworkoutuser,checkaccessuser,checkviewworkouts,checkworkoutuserview
+    )
 
 # Check if a user is a Coach member
 def iscoachmember(user):

rowers/views/workoutviews.py

@@ -737,8 +737,8 @@ def team_comparison_select(request,
 
     if id:
         firstworkout = get_workout(id)
-        if not checkworkoutuser(request.user,firstworkout):
-            raise PermissionDenied("You are not allowed to sue this workout")
+        if not checkworkoutuserview(request.user,firstworkout):
+            raise PermissionDenied("You are not allowed to use this workout")
 
         firstworkoutquery = Workout.objects.filter(id=encoder.decode_hex(id))
         workouts = firstworkoutquery | workouts
@@ -1160,10 +1160,9 @@ def multi_compare_view(request,id=0,userid=0):
 # List Workouts    
 @login_required()
 def workouts_view(request,message='',successmessage='',
-                  startdatestring='',
-                  enddatestring='',
                   teamid=0,rankingonly=False,rowerid=0,userid=0):
 
+    startdate,enddate = get_dates_timeperiod(request,defaulttimeperiod='lastyear')
     request.session['referer'] = absolute(request)['PATH']
     r = getrequestrower(request,rowerid=rowerid,userid=userid)
 
@@ -1171,15 +1170,6 @@ def workouts_view(request,message='',successmessage='',
     if not checkviewworkouts(request.user,r):
         raise PermissionDenied("Access denied")
 
-    if startdatestring:
-        startdate = iso8601.parse_date(startdatestring)
-    else:
-        startdate = datetime.date.today()-datetime.timedelta(days=365)
-
-    if enddatestring:
-        enddate = iso8601.parse_date(enddatestring)
-    else:
-        enddate = datetime.date.today()
 
 
     startdate = datetime.datetime.combine(startdate,datetime.time())
@@ -1352,7 +1342,7 @@ def workouts_view(request,message='',successmessage='',
                 'name':'Workouts'
                 },
         ]
-    
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')    
     return render(request, 'list_workouts.html',
                   {'workouts': workouts,
                    'active': 'nav-workouts',
@@ -1368,6 +1358,7 @@ def workouts_view(request,message='',successmessage='',
                    'teams':get_my_teams(request.user),
                    'interactiveplot':script,
                    'the_div':div,
+                   'timeperiod':timeperiod,
                    })
 
 
@@ -2489,7 +2480,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
 
     # prepare data frame
     datadf,row = dataprep.getrowdata_db(id=encoder.decode_hex(id))
-    if (checkworkoutuser(request.user,row)==False):
+    if (checkworkoutuserview(request.user,row)==False):
         raise PermissionDenied('Access Denied')
 
     datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
@@ -2725,7 +2716,7 @@ def workout_workflow_view(request,id):
     request.session['referer'] = absolute(request)['PATH']
     request.session['lastworkout'] = id
     request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
-    row = get_workout_permitted(request.user,id)
+    row = get_workout_permittedview(request.user,id)
     
     r = getrower(request.user)
     result = request.user.is_authenticated() and ispromember(request.user)