From c4426d8a0b927412ba5945bd7635e11478338fc1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 1 Mar 2024 12:26:36 +0100 Subject: [PATCH] Increasing coverage --- rowers/dataprep.py | 14 +-- rowers/interactiveplots.py | 7 +- rowers/tests/statements.py | 2 +- rowers/tests/test_analysis.py | 123 ++++++++++++++++++++++++++ rowers/tests/test_aworkouts.py | 28 ++++++ rowers/tests/test_basicrower.py | 12 +++ rowers/tests/test_uploads.py | 30 +------ rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes rowers/views/analysisviews.py | 47 +++++----- rowers/views/importviews.py | 32 +++---- rowers/views/userviews.py | 14 +-- rowers/views/workoutviews.py | 2 +- 12 files changed, 226 insertions(+), 85 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 35a7ec9f..f206a457 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -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): diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 5bc84a34..4c03a9bb 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -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 diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index 7fa4e1ed..3b88c2e2 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -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'] diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index fe0997e4..8c7bc3e0 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -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) diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index 595f0148..fdbb7e75 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -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) diff --git a/rowers/tests/test_basicrower.py b/rowers/tests/test_basicrower.py index 39a9b1f6..934c7737 100644 --- a/rowers/tests/test_basicrower.py +++ b/rowers/tests/test_basicrower.py @@ -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) diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py index 9c6ba94b..68a61119 100644 --- a/rowers/tests/test_uploads.py +++ b/rowers/tests/test_uploads.py @@ -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') diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index f67f2da08debcff3873da3041d8086f2cfd88f25..e380513e867d867d4c7b9150dbb1e0a971ee706e 100644 GIT binary patch literal 4000 zcmV;R4`1*fiwFpRxZ!02|8!+@bYx+4VJ>uIcmVC4NpBoC7J%>m6@m}RVG#CP__!#F zf^35^U}u8F$mBMtNENwfq?VvAFZuUFc000ctB^ctieMG!gQ2djt?R2tzMV&3zPUI* zc-3ET*O!|w9;1QB2VWjPI(mNHtvBn<**E=W=&!%+hVIvH+aIKzH`^~BzZizA!`15b z>(}P2yS`X&%*o}&Dt);&o2B;fu%r9A5O-kN01uub-SA6QKJH^9wJzLyU+zT5i`e8-64Xm#`H-40(RQR~k7fAs0@f9!_->#K|1t2z9Bm43<1 z<|mu4`)=6&&|g1WZ(a`lzlU2tBAw>v?)+tcj5b|l|L40atnRqPt*@VTZ`KztFaA$A zAnuMExZ@JHzJ9XVy{g0S$Gf+pPh@Yl+dVO}5Zml0)T%I03 z>ozaD^F;Bzt+)5?PX7De-S4(sU9LC7?ald%^bY)mcX7Ad`$vB8N{F%JugUI!2NJkV zf&51l_9X5`@ZJN4JD%@uhnvxB`_W~e|M1ISo(b+8!#_M@I_JN-VMt;Vk5>D?KD_2C zUG&4BclRyk7vV0vTIviYNxN7Db!3C{z@8s;Mcm0%#63Yoa6!SHlHOF1d$>P$s!QIj zRK(pGVpNUtX^7y0+~Z=nJ6jR=nB?7x*Km&|<(*+M+cdn!v$Fv;oz8>xZ#s{<-dG}&uCfq9< z=PR<~giQn+HQa-gwBMH`@1Y{@&Nv{@=yg$w>hsHycZ7-*JBfx_=cYv{OP(Jc7Z*gHDkAR;I-L^-oi91hTWF*G zB;qG%S)>(ucPw@)h~;EE`6& znkX&#q8av${6yrP0jne*U^X&e+dN-Ul-360)2pbm=OY;3G`zXb^MWRcyvm+ufT9tb z1&#JK$-G#To-L4uJmPG0`xd1gC-00G44Nn{6Bf1SmqflIdp=ueY*q6-GnzOP^4RA2 zyUBCTy=6escyiKy5_f^guEDF2r8KuDjKnAPePszTNKqiAGoN7=bOw=Lf#pSC@Ptcwy5{E$^10rce%H!7HGC? zMdgFYWAovSk-(}8}D>cS{q}@oSY?*ucyX_ zbMCG4h?>z}5N0Fu&7L189}NYFK}9|`-G2TN8=>4SMHQtLhNj!kU*^S{kaT;M%-gbA z*Rj>oPD0)rVO_*Vq%8U7!<&G-O|T7mtIE0-*T~*s~=H4!e zd`0#=Swjw4HO~vpCij+G{ro6-Z_pyCMtes^?fC_fcT^Gi+&O_*)8F2CE;`RIiF`%6 zebUxAqH5JL7q~@f7eHPNfT+5hyT~m{JO9z1y%EuMLiEtc-W~~T#!9qQGDJ8W06slljGCd zVrN3WHXmN7hrD2}rB$tI;iYK({E}q8CJj&6cp=pI@Vs*+{q~ER=PR=3ll*cdRgI1J zu2odtlYB){T8RdjKsDM2Hyho)d2dI^%ORlgN*|t&MOPtTl*~&-&d z$-JwGyf+908mlf~n2pRg^5f*AacQvEjP`*-QG0$#qkX7{Jd&{%qbBP*aBMPvPx7%M z@?sz;M|)dzrNTvdaw;0_(Hk$K>Xs5*(bY+p(Dz})V7m0*H41p8Y`&s;UaixQh!hMR1tcgTV#1u zp$~30QePQ*cJ-i7cA5YZUgQqA>< zWy@`rgq|xxAG3xZby8n;)xw5;8uYmns$*4V7N!}iY4{63FL}UMg=`Upibm^~q~=v* z+;K4EF{m_rbj_Q0U*j&+gFcPj;BtRF4SHX+5AK69GNBoFqv)*xAl6BJu(Lsr&A1yy z?-P1m6OEkBRTMop^pl{ECR(LShrksz?x=b5ra+&R^@zH%8>H;`Z&E*d^kSUXqNlR0 z(v~FkP!alIL`c;D8!1_YzM-GDOULKVnAVA?j5|sSg3P3S4z^|KN6}luUe`V+FN`sp z&PmO#A4l&E1qr$V-$T*DdTeUm6zDMtu(IF|Dd226;$ln797WFtovv#ZQY^Y~>7oXF zstCO^U`dye%fPc)KkS^o2F?kOJ^LtH{J@XG<>#Y*SVoqb2kP0oM9=btFLD%+fId=nl}l0HUb!RQt!fS z27GJ@TBGQlv8Y?i5ZT9~jnk;v^^>5Fh9X*>h9Am?Z@78$ra*5g_s`OK^Ek$)=FNY= zw_-q)g;y3~Hu3t}lCdia+S;VCA;qXdPt@l6`J)#wQMqt2TBf3ryXM2620feTkaXxR z&t`eE=ExmKziXN3Rcf9U+gv*HcjWF`CZgBP^-gA!pw-ecN6?2|%S6yEd4twVGw$YY z*N5CP(TbqTk!wS%zPT^@P!al&J80>;YS>sde8X+Pp8`FiVHT&7dV#Xb)$@YXJg5l0 z-L+Owsd-Ykjnb0p>up8oy&75mj9^B--Z9o4+HMz41&|6|{BWW|OMX)Vxvj$xgElby+$NT^sP{o|~7@vk}Tp z8V!1yPYFhAqco1*84EelQiGmD8}R4v$h9${CsGw&IU8qFY1^`NM$roy*81?BgErSM z0KFI@t(xbdW#rDi@G9h%iI}$O&YQ=mu64ONs<&t*$6papFw zK`*(X3hAWYO3}z2G&OG$^ue%T&`G_xqNy59&6@;0CF72itrfg;&5=8Imrl$r6G6MC zt@nO5b3L`7?I`+OWX+%o-}vC0UB3YI(MYoHbW$JvZ0ve!YTg)nCL`AB!Z!gzv+Eat zUUK0T=+I+P^m(bEHsDWyJ{Vxs^}`Q2d4DG8sd@9p(C3w`0fP=b$JwB7>(`H?XA^{U zk-PMwl+^HZCyIuC0`$&!wo&EM2@XrTbQXnPDncLgnzo>mdXGg1eBVkira&)boW-EZ z(g~qxrR{^zx0<_g^pdM@f+{07#G;k94;t`WFP(ApA+Kqxi`+#hy4cyGH2hk!bOd%Q zSp#~NBR8VV#-#(TZ{8^S-AdNFb?zdS4cbDR>nB0)bM=i9J^R_LZrSGgQS^BwYerIe z^P=@dt8b|F&6@;0?-nsv8Fx`)TitTz-n@+7<-#i^dKZgIeQT6D4f>c1uXJ{O4A7dV z&D@)p(C=2VRz~h(#MT*m0qCtsGrej76ar{Ha_@`YPlf*N);~5Jt)6yQHy^&g9Qy6? zC+EZG-<|gt{bo4$bhqi#gKjv0H@^R^KNWCY_!T}m8$Lf;?GJdgKhqz-F@L`KwBCPz z^v!kRczOMH-|xHh_FP}S-gcYQ?)-fBw9?1*=Ipc^x^&)d|8^xR?~XhA>gDj_^7__m z^3~PV`TC?A(oes6F>cQN(aF+xU%yAI}2`q{&=_b zCT;feZol1zn@9V>`H!Bbn?C-rKkvJ3pE%@CZy(*Q`#O5sZO)#2d;Hz^na%Fc{q`Ty zTm1dYi(mV6X8@l8?EgPn-TGqxuIcmVC4TW=Ic7J%RR6&4T4!zwlBQl~DC zaYP`iMFKVoD4VxcV&?BpuloLcf3bM` z_N_VYE>2f#b98pPNMCM_UM)|%&EopQ7jNk9?iBmoyKgwl{iA;MX4Sv{fJ=Ir8lK>)b;iX@kz0nQq>5qCt z=H2GyUmy7Qu7A*-oL#Jzo5dUa>;3=i`lH?c%gamQw_R!w&`l5B{l>e8clP!UK0JW* zGxEnz8{Y3dJ3qVV@7?`p|7v-0clTxb`q9fn0(3us{6O#=dEeqbITIamguemo0~{>U zP9OJw+@0?|>${8o`Ra6e@9tk6dwHRB=<~C_JIRMVTOOUQUv3VC{lVg^t)C8fxZ1rz zPnPM&Zqj|`d--DHr@cSoJ46fzi_1@+cDSEJtvg=+W0~&$x2|9Qe15upHT(DH>6ct? zezg91+4Y-Wmlsb~>(~AA-~E*zkxuh_ck+69h&Ekh_vfc8EUvl4m9L+4?^dU;PybIh zAnuwQxaJa9zJ9dczN-EE!|hwKOk^*&Tz!x)m+1i?66VLa`}+#Ti`DUQy0vBh>g?s= zlWzUGJ4qBj+j@2H?&!at-TijU`PpjSU)`L)NbkTmyo=l2K0oq{S3-;(eoeLq+>*dm z3go|{up@Cjg3lf>T=RUlJ6w)lo3AeW{MSFec_z4a4FB?s>74)S`aX$GJXq}h`tq8K zbkQ$=-u1VbUxe%MYN<1rB<*4q)R7HN1ABhZ6>%q55%&ZU!370(N_ta4?&0R#sV;f9 zQW1A&h*34lry+t1a*wm&?rcTeW0H3(Uc)_>ly`>NaQ78)x3nGSor1d!h6-}WTX4s! zxCf|+yCm*Os5IKVH*O-_>yr1t6>;|_cyJnh-no)y9MgQb`+B$w7$4AT?9gyotqY+EP1{Kd8&&% zRWrrYJ|t64bfz4ll=R)OosZ13R7BpIn3Q^z%#)ZBb!3eIqDsSyv7|jeC-OE_ zL_X>1OsGn}f><(2XK6;GJyt|MntwZS#CZQCb^}Pp_iNo{wOB)9|J~&kLF)@+y0t0g6U! zW;EK@B=cfTdbU6s@`#hs?OT*~n7lJyFleH*Ojy*OpA-3t?D=e=u~p6U%xL07$YY!5 zuP4tr_m%-kzdzw6!Kz#A*f_tsA$BdkspV=Hz7$pYREfoGJiwzTn~8! zBLRY{Nrva5GVhyiKMHv^Y*AG6eBh!Qo^LWg3VCNRqNrp(+M?duCiCNv-{#(`TAZ3-tx8#b-d}vnPDCE7Nh)(0Zwd{)K z+lMyVk3pVc+Y(Eo+gt03>h__<=SLw=#xX=y6FezPeohsYt|IbctT3zQc~`WSc2?x2 zBJ#l`?y3w-TehN7pvn9gE)pb8_ZHzMdKz z&bhbFBWgx_L70rpH+z1Vd^8jw1{L|(bo=Q?Y=m;R6jhW~7@BTBeVG?)LelM3GH=Uf zUB^~SI|_Mkgmn=ck+S5Q4{rqWHo-RNtt#tUTqA!|^0p%KWP;aKSBb~T#OIsL50e*T z302iq63W)qwH}z`kPn6sRh<(gmaVbzO}8I|Jc5ZxtnuDDz?OSEeVIo#5{NWWT8Gmi z&&`uFNZ#eFYgH#iM_5$1pA-3-M*C<0F=*oRj;UxBwQuqHG05lK+kipS_tse|ntMAZ z@)gGl>3dr^6EJlc{P z-mUWRnua$_o^$t8mG{;sOE9(!%*m4%&^;Z!Fe$azfcPDuo*PQOL7F z()GX$q3Eh*b0S~UJWpbRVANz_hKNNoGiXNhyswCSFp^|mQ)v-_n#@lzJ2t*=xFcS zTGV5Z-{s!w=J^ncT6J?GUy&zAl7+?uD)KQD&B<|Xo*#w0Gri5Z8t}0q^ql5;0@YlP5GI4ZwgJB;sdt6}Nj29a zmMyoL6MC))easqu)Jc8WRSO&XanR>ZsE$>cS(s+5rs2;3z2pI36|zMXDjKbylbTnN zamT@s$Dq>i(KT=0O^v%y5BfBAgUkK#H0XWNKDf8a$b@Fx4WhROfLJH>!A=G}Hsfv( zy-(gS5frb(2s&XnrM|S9RgR>xTEIH8v}h()+6f5ZjiF$ze)Y%(Tj0ji=N81 zN}H3^Lq+I=5g}CrY@}on`i6emE*+mcV_GMoGVUlT2r`lOIoOt^A4G2rdtLjSyfDUO zIwv)|ei*$s6eQ>dd=Etn>#?bMW1z<*z{-LI;Pa}Yfnbh@rtNU`X`rL!9F zsUq~wfF)f-w7Gs1^n@l7fhs|ZX*z3~H6Q*kdTRnJ zt8bXyWSXY6ES+KW-gqml((u`qUFU{c&D|L2bB3j$uD+h7Y&#WdYThX5*$80NNxch` z8St?sXbqxw#-eU5Lu4O|Hcq2v*N=ie8j5Ij8h$7nzTxK08w0(i+&@d_&EpuGnm7Fc z---cI7G7C|$;9hxOUAA!Xls+kh7_X;JyDzMr;lF1MCHQ8Xqk#e?wSvO9Q16WL(-wQ zJelRqnj?1@{kCPISE+ecY;);M-;uj*nTTFD*E^X^f>uk*96%qoEfYbvIKR!SI;w2^PnR1 zcH3G(rRGWDHcE4+oZMUA`GRbw3VAxpj24fviXBlT^-A4Jb+g0L=LFTobo@LSM! z9Q4*WL{xRvkZ7AXZ~Bg0_Qo?=RnXRfn@p-kQ}YJVCp*nL)Me>7bZx+&dTw4q&qgRa zX*B3*IwcsbjnXiBXDsAIOAUGsZNQ(tBiF`+o=8=AKYLZ4T%1`Im%94CXmtzSQko=p(a zMefpzQc}auohTam5zss1*+!L1CpawW(wP-{sR(_{YubWN>OB@6@O>-67z4eKaTbFr zODBY)mA1D+-)ioL(Mztr395|T5Q|pY-fF;ay>y1rhrFh(E^-&4=wfHH((r4^(h=CM zWDV$5j@*bc8J7;UzIlV_w<}re*13yRHfRfNt{(-x&($|d^z0|Ix@DW|2hr!1tQkq= z&5PC-t-hhwH*Xa5yj{dxW!y!HZFS3ud-F1SmkY0y=v^!-^{r9rIOt<8ywchAF+gjc zHgRuWLcd+fS{b>E5nE^M8KAc&&Gf1TPza#)$h|3gKNk8ATR(0%SUm2|FF!mz>zA9u z?@sz3e>qv6F4z6u_uEb1?{)niyz_sC&c`JMegWSd_dgyib_d+qo$2Fm%%3kmt#;oZ zJh(_4&n`af`?O1M&&Ao>O}Bp8ot$i+R{FSFAHVGSE}ggAyRK|D;Q1XTjCaU+=bB zr_EkI?YG@<`Dnj5|H1Qg(}%w;PnO+gnKx4B!WV-Tw!RD_`uM{Pr;&-r1sFt\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() diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index dbf08d5e..b03e5eb7 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -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', diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 83fbcadd..b22a7da4 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -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,