moved user and workout permission checks to rules

updated workoutviews, rest of views not done
doesn't pass tests

rowers/tests/statements.py

@@ -7,12 +7,12 @@ try:
     FileNotFoundError
 except NameError:
     FileNotFoundError = None
-    
+
 try:
     OSError
 except NameError:
     OSError = None
-    
+
 import pytest
 
 pytestmark = pytest.mark.django_db
@@ -26,7 +26,7 @@ from django.core.management import call_command
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.utils.six import StringIO
 from django.test.client import RequestFactory
-from rowers.views import checkworkoutuser,c2_open, multi_compare_view
+from rowers.views import c2_open, multi_compare_view
 
 from rowers.forms import (
     DocumentsForm,CNsummaryForm,RegistrationFormUniqueEmail,
@@ -101,22 +101,22 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
         fromstring = 'test_%s_' % mod.__name__
     except AttributeError:
         fromstring = 'none_'
-        
+
     row = rdata(filename)
     totaldist = row.df['cum_dist'].max()
     totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
     totaltime = totaltime+row.df.loc[row.df.index[0],' ElapsedTime (sec)']
-    
-	
+
+
     hours = int(totaltime/3600.)
 
     minutes = int((totaltime - 3600.*hours)/60.)
     seconds = int(totaltime - 3600.*hours - 60.*minutes)
     tenths = int(10*(totaltime - 3600.*hours - 60.*minutes - seconds))
-    
+
     duration = "%s:%s:%s.%s" % (hours,minutes,seconds,tenths)
     duration = datetime.time(hour=hours,minute=minutes,second=seconds)
-    
+
     workoutdate = row.rowdatetime.date()
     workoutstarttime = row.rowdatetime
 
@@ -139,7 +139,7 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
         'duration':duration,
         'totaldist':totaldist,
         }
-    
+
     return thedict
 
 class UserFactory(factory.DjangoModelFactory):
@@ -168,11 +168,11 @@ class RaceFactory(factory.DjangoModelFactory):
     sessiontype = 'indoorrace'
     sessionvalue = 1
     sessionmode = 'time'
-    
+
 class WorkoutFactory(factory.DjangoModelFactory):
     class Meta:
         model = Workout
-        
+
     name = factory.LazyAttribute(lambda _: faker.word())
     notes = faker.text()
     startdatetime = get_random_file(name=faker.word())['startdatetime']
@@ -220,5 +220,3 @@ def cleanup(request):
 
 
     request.addfinalizer(remove_test_files)
-        
-