sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Increasing coverage

Browse Source
This commit is contained in:
Sander Roosendaal
2024-03-01 12:26:36 +01:00
parent eb33bd9a8a
commit c4426d8a0b
12 changed files with 226 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -120,10 +120,10 @@ from rowers.datautils import rpetotss
def rscore_approx(row):
if row['rscore'] > 0:
return row['rscore']
if row['rscore'] == 0:
if row['rscore'] == 0: # pragma: no cover
if row['hrtss'] > 0:
return row['hrtss']
else:
else: # pragma: no cover
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600
try:
@@ -135,7 +135,7 @@ def rscore_approx(row):
w = Workout.objects.get(id=row['id'])
trimp, hrtss = workout_trimp(w)
rscore, normp = workout_rscore(w)
if row['rpe'] and row['rpe'] > 0:
if row['rpe'] and row['rpe'] > 0: # pragma: no cover
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600
return int(rpetotss[row['rpe']]*dd)
@@ -143,7 +143,7 @@ def rscore_approx(row):
minutes = row['duration'].hour*60+row['duration'].minute
return minutes
return 0
return 0 # pragma: no cover
thetimezone = get_current_timezone()
@@ -177,7 +177,7 @@ def workout_goldmedalstandard(workout, reset=False):
if workout.workouttype in otwtypes:
try:
factor = 100./(100.-workout.user.otwslack)
except ZeroDivisionError:
except ZeroDivisionError: # pragma: no cover
factor = 1.
workout.user.otwslack = 0
workout.user.save()
@@ -186,8 +186,8 @@ def workout_goldmedalstandard(workout, reset=False):
workout.goldmedalseconds = goldmedalseconds
workout.save()
return goldmedalstandard, goldmedalseconds
else:
return 0, 0
return 0, 0 # pragma: no cover
def check_marker(workout):

7
rowers/interactiveplots.py
View File

@@ -4426,6 +4426,7 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
df_plot
)
TIPS = OrderedDict([
('x','@x'),
('median','@median'),
@@ -4515,7 +4516,6 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
script = ""
div = "Something went wrong with the chart"
return (script, div)
@@ -4531,6 +4531,7 @@ def interactive_chart(id=0, promember=0, intervaldata={}):
columns = ['time', 'pace', 'hr', 'fpace', 'ftime', 'spm']
datadf = dataprep.getsmallrowdata_db(columns, ids=[id])
datadf.dropna(axis=0, how='any', inplace=True)
row = Workout.objects.get(id=id)
@@ -4578,6 +4579,7 @@ def interactive_chart(id=0, promember=0, intervaldata={}):
)
plot.line('time', 'pace', source=source, legend_label="Pace", name="pace")
try:
plot.title.text = row.name
except ValueError: # pragma: no cover
@@ -4647,7 +4649,6 @@ def interactive_chart(id=0, promember=0, intervaldata={}):
hover.mode = 'mouse'
# hover.name = ["spm", "pace"]
script, div = components(plot)
return [script, div]
@@ -5915,7 +5916,7 @@ def interactive_flex_chart2(id, r, promember=0,
popt, pcov = optimize.curve_fit(func, x1, y1)
ytrend = func(x1, popt[0], popt[1])
rowdata['ytrend'] = ytrend
except TypeError:
except TypeError: # pragma: no cover
rowdata['ytrend'] = y1
# prepare data

2
rowers/tests/statements.py
View File

@@ -198,7 +198,7 @@ class WorkoutFactory(factory.DjangoModelFactory):
startdatetime = FuzzyDateTime(start_dt=one_month_ago, force_year=datetime.date.today().year)
starttime = get_random_file(name=faker.word())['starttime']
workouttype='water'
date=timezone.now().date()
date=startdatetime.evaluate(2,None, False).date()
duration=get_random_file(name=faker.word())['duration']
distance=get_random_file(name=faker.word())['totaldist']
csvfilename=get_random_file(name=faker.word())['filename']

123
rowers/tests/test_analysis.py
View File

@@ -25,6 +25,11 @@ class ListWorkoutTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -79,6 +84,10 @@ class PlannedSessionTests(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -130,6 +139,22 @@ class ForcecurveTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
result = get_random_file(filename='rowers/tests/testdata/quiske_in_stroke.csv')
self.winstroke = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
starttime=result['starttime'],
startdatetime=result['startdatetime'],
duration=result['duration'],
distance=result['totaldist'],
workouttype = 'water',
)
self.factory = RequestFactory()
self.password = faker.word()
@@ -143,6 +168,7 @@ class ForcecurveTest(TestCase):
except (IOError, FileNotFoundError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db)
def test_forcecurve_plot(self, mocked_getsmallrowdata_db):
login = self.c.login(username=self.u.username, password = self.password)
@@ -182,7 +208,62 @@ class ForcecurveTest(TestCase):
response = self.c.get(url)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/forcecurveanalysis/1/delete/'
response = self.c.get(url)
self.assertEqual(response.status_code, 200)
form_data = {}
response = self.c.post(url, form_data, follow=True)
expected_url = '/rowers/analysis/forcecurveanalysis/'
self.assertRedirects(response, expected_url=expected_url, status_code=302,target_status_code=200)
def test_instroke_analysis(self):
login = self.c.login(username=self.u.username, password = self.password)
self.assertTrue(login)
encoded1 = str(encoder.encode_hex(self.winstroke.id))
url = '/rowers/workout/'+encoded1+'/instroke/interactive/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
# saving
form_data = {
'spm_min': 19,
'spm_max': 25,
'activeminutesmin': 0,
'activeminutesmax': 10,
'individual_curves': False,
'notes': 'aap',
'name': 'sdsd',
'metric': 'boat accelerator curve',
'_save_as_new':'Save'
}
form = InstrokeForm(form_data,choices=['boat accelerator curve', 'oar angle velocity curve'])
result = form.is_valid()
if not result:
print(form.errors)
self.assertTrue(form.is_valid())
response = self.c.post(url, form_data)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/instrokeanalysis/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/instrokeanalysis/1/delete/'
response = self.c.get(url)
self.assertEqual(response.status_code, 200)
form_data = {}
response = self.c.post(url, form_data, follow=True)
expected_url = '/rowers/analysis/instrokeanalysis/'
self.assertRedirects(response, expected_url=expected_url, status_code=302,target_status_code=200)
@@ -198,6 +279,10 @@ class WorkoutCompareTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -296,6 +381,10 @@ class WorkoutBoxPlotTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -393,6 +482,10 @@ class WorkoutHistoTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -490,6 +583,10 @@ class History(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(20, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -577,6 +674,10 @@ class GoldMedalScores(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(20, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
result = get_random_file(filename='rowers/tests/testdata/onwater2.csv')
self.w1 = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
@@ -677,6 +778,10 @@ class WorkoutFlexallTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -774,6 +879,10 @@ class WorkoutStatsTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
today = datetime.date.today()
i = 0
@@ -1082,6 +1191,10 @@ class MarkerPerformanceTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -1095,6 +1208,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg2k.date = self.werg2k.startdatetime.date()
self.werg2k.save()
# need a 2k, 5k, 1h row
self.werg5k = WorkoutFactory(
@@ -1104,6 +1219,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg5k.date = self.werg5k.startdatetime.date()
self.werg5k.save()
# need a 2k, 5k, 1h row
self.werg1h = WorkoutFactory(
@@ -1113,6 +1230,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg1h.date = self.werg1h.startdatetime.date()
self.werg1h.save()
def tearDown(self):
for workout in self.user_workouts:
@@ -1280,6 +1399,10 @@ class AlertTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)

28
rowers/tests/test_aworkouts.py
View File

@@ -254,6 +254,34 @@ class WorkoutViewTest(TestCase):
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db')
@patch('rowers.middleware.myqueue')
def test_resample(self, mocked_sqlalchemy, mocked_getsmallrowdata_db,
mocked_myqueue):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_resample_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
form_data = {
'resamplechoice': 'copy',
}
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
form_data = {
'resamplechoice': 'overwrite',
}
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db')
@pytest.mark.django_db(transaction=True)

12
rowers/tests/test_basicrower.py
View File

@@ -61,3 +61,15 @@ class SimpleViewTest(TestCase):
self.assertRedirects(response,
expected_url='/rowers/list-workouts/',
status_code=302,target_status_code=200)
def test_start_coachtrial(self):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = '/rowers/startcoachtrial/'
response = self.c.get(url,follow=True)
self.assertRedirects(response,
expected_url='/rowers/list-workouts/',
status_code=302,target_status_code=200)

30
rowers/tests/test_uploads.py
View File

@@ -28,15 +28,6 @@ class ViewTest(TestCase):
self.nu = datetime.datetime.now()
def test_upload_view_notloggedin(self):
response = self.c.post('/rowers/workout/upload/',follow=True)
self.assertRedirects(response, expected_url='/login/?next=/rowers/workout/upload/',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db)
def test_upload_view_sled(self, mocked_sqlalchemy,mocked_getsmallrowdata_db):
@@ -129,7 +120,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@patch('rowers.dataprep.create_engine')
@@ -230,7 +221,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@@ -271,7 +262,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@patch('rowers.dataprep.create_engine')
@@ -341,19 +332,6 @@ class ViewTest(TestCase):
self.assertEqual(response.status_code, 200)
filename = 'rowers/tests/testdata/crewnerddata.CSV'
f = open(filename,'rb')
file_data = {'file': f}
form_data = {}
form = CNsummaryForm(form_data,file_data)
response = self.c.post('rowers/workout/'+encoded1+'/crewnerdsummary',
form_data,
follow=True)
f.close()
self.assertEqual(response.status_code, 200)
w = Workout.objects.get(id=1)
f_to_be_deleted = w.csvfilename
try:
@@ -660,7 +638,7 @@ class ViewTest(TestCase):
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.TCXParser')
def test_upload_view_TCX_CN(self, mocked_sqlalchemy,
def test_upload_view_TCX_Rim(self, mocked_sqlalchemy,
mocked_tcx_parser):
self.c.login(username='john',password='koeinsloot')

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

47
rowers/views/analysisviews.py
View File

@@ -56,7 +56,7 @@ def analysis_new(request,
try:
thesession = PlannedSession.objects.get(id=session)
if not can_view_session(user, thesession):
if not can_view_session(user, thesession): # pragma: no cover
raise PermissionDenied("you cannot view this session")
except PlannedSession.DoesNotExist:
thesession = None
@@ -102,7 +102,7 @@ def analysis_new(request,
try:
waterboattype = options['waterboattype']
except KeyError:
except KeyError: # pragma: no cover
pass
if request.method == 'POST':
@@ -188,7 +188,7 @@ def analysis_new(request,
pass
rankingtypes = [False,True]
if ranking:
if ranking: # pragma: no cover
rankingtypes = [True]
@@ -272,7 +272,7 @@ def analysis_new(request,
request.session['options'] = options
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
ids = options.get('ids',[])
tw = []
for id in ids:
@@ -526,7 +526,7 @@ def trendflexdata(workouts, options, userid=0):
extratitle = ' '+u.first_name+' '+u.last_name
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
return df
script, div = interactive_multiflex(df, xparam, yparam,
@@ -561,7 +561,7 @@ def flexalldata(workouts, options):
extratitle = ' '+u.first_name+' '+u.last_name
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
workstrokesonly = not includereststrokes
columns = [xparam, yparam1, yparam2, 'spm', 'driveenergy', 'distance']
ids = [int(w.id) for w in workouts]
@@ -603,7 +603,7 @@ def histodata(workouts, options):
extratitle = ' '+u.first_name+' '+u.last_name
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
workstrokesonly = not includereststrokes
ids = [int(w.id) for w in workouts]
df = dataprep.getsmallrowdata_db([plotfield], ids=ids,
@@ -640,7 +640,7 @@ def cpdata(workouts, options):
})
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
return powerdf
if powerdf.empty: # pragma: no cover
@@ -869,7 +869,7 @@ def comparisondata(workouts, options):
}
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
workstrokesonly = not includereststrokes
columns = [xparam, yparam1,
'ftime', 'distance', 'fpace',
@@ -950,7 +950,7 @@ def boxplotdata(workouts, options):
extratitle = ' '+u.first_name+' '+u.last_name
savedata = options.get('savedata',False)
if savedata:
if savedata: # pragma: no cover
return datadf
script, div = interactive_boxchart(datadf, plotfield,
@@ -1425,7 +1425,7 @@ def rankings_view2(request, userid=0,
wcdurations = options['wcdurations']
wcpower = options['wcpower']
lastupdated = options['lastupdated']
except KeyError:
except KeyError: # pragma: no cover
pass
try:
userid = options['userid']
@@ -2017,7 +2017,7 @@ class ForceCurveAnalysisDelete(DeleteView):
def get_object(self, *args, **kwargs):
obj = super(ForceCurveAnalysisDelete, self).get_object(*args, **kwargs)
if obj.rower != self.request.user.rower:
if obj.rower != self.request.user.rower: # pragma: no cover
raise PermissionDenied("You are not allowed to delete this Analysis")
return obj
@@ -2039,8 +2039,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
analyses = None
chart = instroke_multi_interactive_chart
def handle_no_permission(self):
def handle_no_permission(self): # pragma: no cover
if self.request.user.is_anonymous:
url = reverse('login')+'?next='+self.request.path
return HttpResponseRedirect(url)
@@ -2079,7 +2078,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
super(SavedAnalysisView, self).setup(request, *args, **kwargs)
self.r = getrequestrower(request, userid=self.userid)
if self.r is not None and not is_coach_user(self.request.user, self.r.user):
if self.r is not None and not is_coach_user(self.request.user, self.r.user): # pragma: no cover
raise PermissionDenied("You are not allowed to see analyses for this user")
self.analyses = self.analysis_class.objects.filter(rower=self.r).order_by("-date","-id")
@@ -2087,7 +2086,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
startdate = request.GET.get('startdate')
enddate = request.GET.get('enddate')
self.searchform = SearchForm()
if query:
if query: # pragma: no cover
query_list = query.split()
if self.analysis_class == InStrokeAnalysis:
self.analyses = self.analyses.filter(
@@ -2111,13 +2110,13 @@ class SavedAnalysisView(UserPassesTestMixin, View):
)
self.searchform = SearchForm(initial={'q': query})
date_initial = {}
if startdate:
if startdate: # pragma: no cover
try:
self.analyses = self.analyses.filter(date__gte=startdate)
date_initial['startdate'] = startdate
except ValidationError:
messages.error(request,"{startdate} is not a valid start date".format(startdate=startdate))
if enddate:
if enddate: # pragma: no cover
self.analyses = self.analyses.filter(date__lte=enddate)
date_initial['enddate'] = enddate
self.dateform = DateRangeForm(initial=date_initial)
@@ -2136,7 +2135,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
'dateform': self.dateform,
})
def post(self, request, *args, **kwargs):
def post(self, request, *args, **kwargs): # pragma: no cover
form = self.form_class(request.POST)
if form.is_valid():
@@ -2211,7 +2210,7 @@ class InStrokeAnalysisDelete(DeleteView):
def get_object(self, *args, **kwargs):
obj = super(InStrokeAnalysisDelete, self).get_object(*args, **kwargs)
if obj.rower != self.request.user.rower:
if obj.rower != self.request.user.rower: # pragma: no cover
raise PermissionDenied("You are not allowed to delete this Analysis")
return obj
@@ -2356,7 +2355,7 @@ def alert_report_view(request, id=0, userid=0, nperiod=0):
stats = alert_get_stats(alert, nperiod=nperiod)
is_ajax = request_is_ajax(request)
if is_ajax:
if is_ajax: # pragma: no cover
return JSONResponse({
"stats": stats,
})
@@ -2772,7 +2771,7 @@ def history_view_data(request, userid=0):
df = getsmallrowdata_db(columns, ids=ids)
try:
df['deltat'] = df['time'].diff().clip(lower=0)
except KeyError:
except KeyError: # pragma: no cover
pass
df = dataprep.clean_df_stats(df, workstrokesonly=True,
ignoreadvanced=True, ignorehr=False)
@@ -2825,7 +2824,7 @@ def history_view_data(request, userid=0):
ddict['powermean'] = int(wavg(ddf, 'power', 'deltat'))
try:
ddict['powermax'] = ddf['power'].max().astype(int)
except KeyError:
except KeyError: # pragma: no cover
ddict['powermax'] = 0
ddict['nrworkouts'] = a_workouts.count()
listofdicts.append(ddict)
@@ -2840,7 +2839,7 @@ def history_view_data(request, userid=0):
try:
totalsdict['powermean'] = int(wavg(df, 'power', 'deltat'))
totalsdict['powermax'] = df['power'].max().astype(int)
except KeyError:
except KeyError: # pragma: no cover
totalsdict['powermean'] = 0
totalsdict['powermax'] = 0
try:

32
rowers/views/importviews.py
View File

@@ -41,7 +41,7 @@ def workout_export_view(request, id=0, source='c2'):
integration = importsources[source](request.user)
try:
id = integration.workout_export(w)
except NoTokenError:
except NoTokenError: # pragma: no cover
return HttpResponseRedirect(integration.make_authorization_url())
messages.info(
@@ -73,7 +73,7 @@ def rower_rojabo_authorize(request): # pragma: no cover
return HttpResponseRedirect(url)
@login_required()
def rower_integration_authorize(request, source='c2'):
def rower_integration_authorize(request, source='c2'): # pragma: no cover
try:
integration = importsources[source](request.user)
except KeyError:
@@ -107,7 +107,7 @@ def rower_polar_authorize(request, source='polar'): # pragma: no cover
def rower_integration_token_refresh(request, source='c2'):
try:
integration = importsources[source](request.user)
except KeyError:
except KeyError: # pragma: no cover
url = reverse('workouts_view')
return HttpResponseRedirect(url)
try:
@@ -217,7 +217,7 @@ def rower_process_polarcallback(request):
try:
error = polar_user_data['error']
if error['error_type'] == 'user_already_registered':
if error['error_type'] == 'user_already_registered': # pragma: no cover
s = error['message']
tester = re.compile(r'.*userid:(?P<id>\d+)')
testresult = tester.match(s)
@@ -371,7 +371,7 @@ def workout_import_view(request, source='c2'):
r = getrequestrower(request)
try:
integration = importsources[source](request.user)
except KeyError:
except KeyError: # pragma: no cover
messages.error(request,"This integration is not supported")
url = reverse('workouts_view')
return HttpResponseRedirect(url)
@@ -428,7 +428,7 @@ def workout_import_view(request, source='c2'):
startdate=startdate,
enddate=enddate
)
except NoTokenError:
except NoTokenError: # pragma: no cover
messages.error(request,"You must first make the connection to {source}".format(
source=source
))
@@ -504,7 +504,7 @@ def rower_process_stravacallback(request):
try:
res = strava_integration.get_token(code,logfile='strava_log.log')
except NoTokenError:
except NoTokenError: # pragma: no cover
message = "Something went wrong with the Strava authorization"
messages.error(request, message)
url = reverse('rower_exportsettings_view')
@@ -526,7 +526,7 @@ def rower_process_stravacallback(request):
r.save()
try:
_ = strava_integration.set_strava_athlete_id()
except NoTokenError:
except NoTokenError: # pragma: no cover
messages.error(request,'Something went wrong storing your Strava ID. Please authorize again')
url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url)
@@ -540,7 +540,7 @@ def rower_process_stravacallback(request):
messages.error(request, message)
url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url)
return HttpResponseRedirect(url) # pragma: no cover
# Process SportTracks callback
@@ -653,7 +653,7 @@ def rower_process_testcallback(request): # pragma: no cover
message="This functionality requires a Pro plan or higher",
redirect_field_name=None)
@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
def workout_rojaboimport_view(request, message="", userid=0):
def workout_rojaboimport_view(request, message="", userid=0): # pragma: no cover
r = getrequestrower(request, userid=userid)
if r.user != request.user:
messages.error(
@@ -728,21 +728,21 @@ def workout_rojaboimport_view(request, message="", userid=0):
item['warm_up']['steps'],
warmup=True
)
except KeyError:
except KeyError: # pragma: no cover
pass
try:
steps = steps + rojabo_stuff.stepsconvert(
item['primary']['steps'],
startid=len(steps)
)
except KeyError:
except KeyError: # pragma: no cover
pass
try:
steps = steps + rojabo_stuff.stepsconvert(
item['cool_down']['steps'],
cooldown=True,
startid=len(steps))
except KeyError:
except KeyError: # pragma: no cover
pass
if steps:
@@ -755,7 +755,7 @@ def workout_rojaboimport_view(request, message="", userid=0):
ps.save()
messages.info(request,'Saved planned session {id}'.format(id=ps.id))
except KeyError:
except KeyError: # pragma: no cover
pass
except KeyError:
pass
@@ -1019,7 +1019,7 @@ def garmin_details_view(request):
def workout_getimportview(request, externalid, source='c2', do_async=True):
try:
integration = importsources[source](request.user)
except (TypeError, NotImplementedError, KeyError):
except (TypeError, NotImplementedError, KeyError): # pragma: no cover
return reverse("workouts_view")
if 'startdate' in request.session and source == 'nk': # pragma: no cover
startdate = request.session.get('startdate')
@@ -1051,7 +1051,7 @@ def workout_getimportview(request, externalid, source='c2', do_async=True):
# Imports all new workouts from SportTracks
@login_required()
def workout_getsporttracksworkout_all(request):
def workout_getsporttracksworkout_all(request): # pragma: no cover
st_integration = importsources['sporttracks'](request.user)
try:
_ = st_integration.get_workouts()

14
rowers/views/userviews.py
View File

@@ -258,7 +258,7 @@ def user_messages(request,userid=0):
'rower':r})
@login_required()
def user_message_delete(request,id=0):
def user_message_delete(request,id=0): # pragma: no cover
try:
msg = UserMessage.objects.get(id=id)
except UserMessage.DoesNotExist:
@@ -278,7 +278,7 @@ def user_message_delete(request,id=0):
@login_required()
def user_message_markread(request,id=0):
def user_message_markread(request,id=0): # pragma: no cover
try:
msg = UserMessage.objects.get(id=id)
except UserMessage.DoesNotExist:
@@ -448,13 +448,13 @@ def rower_exportsettings_view(request, userid=0):
if not user_is_not_basic(r.user): # pragma: no cover
if not user_is_coachee(r.user):
doset = False
if not doset:
if not doset: # pragma: no cover
before = getattr(r, attr)
if before == value:
doset = True
if doset:
setattr(r, attr, value)
else:
else: # pragma: no cover
if user_is_not_basic(r.user):
messages.error(
request, 'Could not set '+attr+'. You need to create the connection first.')
@@ -605,7 +605,7 @@ def rower_simpleprefs_view(request, userid=0):
r = getrequestrowercoachee(request, userid=userid, notpermanent=True)
firsttime = False
if not r.ftpset:
if not r.ftpset: # pragma: no cover
r.ftpset = True
r.save()
firsttime = True
@@ -623,7 +623,7 @@ def rower_simpleprefs_view(request, userid=0):
form = SimpleRowerPowerForm(instance=r)
if request.method == 'POST':
if request.method == 'POST': # pragma: no cover
form = SimpleRowerPowerForm(request.POST, instance=r)
if form.is_valid():
form.save(commit=True)
@@ -714,7 +714,7 @@ def rower_prefs_view(request, userid=0, message=""):
r.pw_ut1,
r.pw_at,
r.pw_tr, r.pw_an])/r.ftp
if cogganzones:
if cogganzones: # pragma: no cover
powerfrac = np.array([55.,75.,90.,105.,120.])
powerzones = ['Rest',
'Active Recovery',

2
rowers/views/workoutviews.py
View File

@@ -3299,7 +3299,6 @@ def instroke_chart_interactive(request, id=0, analysis=0, userid=0):
rowdata = rrdata(csvfile=w.csvfilename)
instrokemetrics = rowdata.get_instroke_columns()
form = InstrokeForm(choices=instrokemetrics)
breadcrumbs = [
@@ -3513,6 +3512,7 @@ def instroke_chart_interactive(request, id=0, analysis=0, userid=0):
name=name,notes=notes,
)
# change to range spm_min to spm_max
vals, units, typ = rowdata.updateinterval_range(
' Cadence (stokes/min)', spm_min, spm_max,