@@ -130,38 +127,6 @@
This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save in the Updated Summary section. You can use the restore original button to restore the original values.
- -This is a quick way to enter the intervals using a special mini-language.
You enter something like 8x500m/3min, press "Update" and the site will interpret this for you and update the summary on the right. If you're happy with the result, press the green Save button to update the values. Nothing will be changed permanently until you hit Save.
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 3c7a1624..2ee4bf9d 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -559,7 +559,7 @@ def iterrows(df): # pragma: no cover return df.iterrows() @register.filter(name='times') -def times(number): +def times(number): # pragma: no cover return range(number) @register.simple_tag @@ -567,7 +567,7 @@ def get_df_iloc(data,i,j): # pragma: no cover return data.iloc(i,j) @register.simple_tag -def get_field_id(id,s,form): +def get_field_id(id,s,form): # pragma: no cover field_name = s+str(id) return form.__getitem__(field_name) diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py index 8c0d1f51..66ba56bf 100644 --- a/rowers/tests/mocks.py +++ b/rowers/tests/mocks.py @@ -713,6 +713,13 @@ def mocked_requests(*args, **kwargs): with open('rowers/tests/testdata/c2jsonworkoutdata.txt','r') as infile: c2workoutdata = json.load(infile) + with open('rowers/tests/testdata/c2_timezone.json','r') as infile: + c2timezoneworkoutdata = json.load(infile) + + with open('rowers/tests/testdata/c2_timezone2.json','r') as infile: + c2timezoneworkoutdata2 = json.load(infile) + + with open('rowers/tests/testdata/c2jsonstrokedata.txt','r') as infile: c2strokedata = json.load(infile) @@ -1181,7 +1188,12 @@ def mocked_requests(*args, **kwargs): if c2strokestester.match(args[0]): return MockResponse(c2strokedata,200) elif c2importtester.match(args[0]): - return MockResponse(c2workoutdata,200) + if '12' in args[0]: + return MockResponse(c2workoutdata,200) + elif '31' in args[0]: + return MockResponse(c2timezoneworkoutdata2,200) + else: + return MockResponse(c2timezoneworkoutdata,200) elif c2workoutlisttester.match(args[0]): return MockResponse(c2workoutlist,200) elif 'access_token' in args[0]: diff --git a/rowers/tests/test_emails.py b/rowers/tests/test_emails.py index 8b8bf8ca..ea6fdfec 100644 --- a/rowers/tests/test_emails.py +++ b/rowers/tests/test_emails.py @@ -427,7 +427,7 @@ workout bike self.assertEqual(len(ws),1) w = ws[0] - self.assertEqual(w.workouttype,'Bike') + self.assertEqual(w.workouttype,'bike') @@ -575,7 +575,7 @@ race 1 self.assertIn('Successfully processed email attachments',out.getvalue()) ws = Workout.objects.filter(name="johnsworkout") - + self.assertEqual(len(ws),1) w = ws[0] diff --git a/rowers/tests/test_imports.py b/rowers/tests/test_imports.py index 233ad051..bfef0eee 100644 --- a/rowers/tests/test_imports.py +++ b/rowers/tests/test_imports.py @@ -158,6 +158,7 @@ class C2Objects(DjangoTestCase): self.r.c2token = '12' self.r.c2refreshtoken = 'ab' self.r.tokenexpirydate = arrow.get(datetime.datetime.now()+datetime.timedelta(days=1)).datetime + self.r.defaulttimezone = 'Europe/Prague' self.r.save() self.c.login(username='john',password='koeinsloot') @@ -261,6 +262,39 @@ class C2Objects(DjangoTestCase): self.assertEqual(response.status_code, 200) + @patch('rowers.c2stuff.requests.get', side_effect=mocked_requests) + @patch('rowers.dataprep.create_engine') + def test_c2_import_tz(self, mock_get, mocked_sqlalchemy): + + response = self.c.get('/rowers/workout/c2import/22/',follow=True) + + self.assertRedirects(response, + expected_url='/rowers/workout/'+encoded2+'/edit/', + status_code=302,target_status_code=200) + + self.assertEqual(response.status_code, 200) + + w = Workout.objects.get(id=2) + self.assertEqual(w.timezone,'Europe/Prague') + + @patch('rowers.c2stuff.requests.get', side_effect=mocked_requests) + @patch('rowers.dataprep.create_engine') + def test_c2_import_tz2(self, mock_get, mocked_sqlalchemy): + + response = self.c.get('/rowers/workout/c2import/31/',follow=True) + + self.assertRedirects(response, + expected_url='/rowers/workout/'+encoded2+'/edit/', + status_code=302,target_status_code=200) + + self.assertEqual(response.status_code, 200) + + w = Workout.objects.get(id=2) + self.assertEqual(w.timezone,'Europe/Amsterdam') + + self.assertEqual(w.starttime.strftime("%H:%M:%S"),"20:04:56") + + @patch('rowers.dataprep.create_engine') def test_strokedata(self, mocked_sqlalchemy): @@ -309,6 +343,7 @@ class C2Objects(DjangoTestCase): res = tasks.handle_c2_async_workout(alldata,self.u.id,self.r.c2token,33991243,0,self.r.defaulttimezone) self.assertEqual(res,1) + @override_settings(TESTING=True) class C2ObjectsTokenExpired(DjangoTestCase): def setUp(self): diff --git a/rowers/utils.py b/rowers/utils.py index 9fa0825b..defdd0af 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -524,7 +524,6 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high if metric=='power': # pragma: no cover with open('data.txt', 'w') as outfile: json.dump(s.json(), outfile) - print('saved to file') for data in s.json(): y = None @@ -589,18 +588,15 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7): seconds = 0 distance = 0 rscore = 0 - durationtype = step['durationType'] + durationtype = step.get('durationType',0) + value = step.get('durationValue',0) - if step['durationValue'] == 0: # pragma: no cover + if value == 0: # pragma: no cover return 0,0,0 - try: - targettype = step['targetType'] - except KeyError: # pragma: no cover - targettype = 0 + targettype = step.get('targetType',0) if durationtype == 'Time': - value = step['durationValue'] seconds = value/1000. distance = avgspeed*seconds rscore = 60.*seconds/3600. @@ -616,6 +612,8 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7): elif valuelow != 0 and valuehigh != 0: # pragma: no cover distance = seconds*(valuelow+valuehigh)/2. velomid = (valuelow+valuehigh)/2000. + else: + velomid = avgspeed veloratio = (velomid/ftv)**(3.0) rscoreperhour = 100.*veloratio @@ -657,22 +655,21 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7): rscore = 100*(avgpower/ftp)*seconds/3600. return seconds,distance,rscore - elif durationtype == 'Distance': # pragma: no cover - value = step['durationValue'] + elif durationtype == 'Distance': distance = value/100. seconds = distance/avgspeed - rscore = 60*seconds/3600. + rscore = 60.*float(seconds)/3600. - if targettype == 'Speed': + if targettype == 'Speed': # pragma: no cover value = step.get('targetValue',0) valuelow = step.get('targetValueLow',0) valuehigh = step.get('targetValueHigh',0) velomid = 0 - if value != 0: # pragma: no cover + if value != 0: seconds = distance/value velomid = value/1000. - elif valuelow != 0 and valuehigh != 0: # pragma: no cover + elif valuelow != 0 and valuehigh != 0: velomid = (valuelow+valuehigh)/2000. seconds = distance/velomid @@ -680,7 +677,7 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7): rscoreperhour = 100.*veloratio rscore = rscoreperhour*seconds/3600. - if targettype == 'Power': + if targettype == 'Power': # pragma: no cover value = step.get('targetValue',0) valuelow = step.get('targetValueLow',0) valuehigh = step.get('targetValueHigh',0) @@ -702,7 +699,7 @@ def step_to_time_dist(step,avgspeed = 3.2,ftp=200,ftspm=25,ftv=3.7): rscore = 100.*(avgpower/ftp)*seconds/3600. - if targettype == 'Cadence': + if targettype == 'Cadence': # pragma: no cover value = step.get('targetValue',0) valuelow = step.get('targetValueLow',0) valuehigh = step.get('targetValueHigh',0) @@ -1167,3 +1164,53 @@ def request_is_ajax(request): # is_ajax = True return is_ajax + +def intervals_to_string(vals, units, typ): + if vals is None or units is None or typ is None: # pragma: no cover + return '' + if len(vals) != len(units) or len(vals) != len(typ): # pragma: no cover + return '' + + s = '' + previous = 'rest' + for i in range(len(vals)): + if typ[i] == 'rest' and previous == 'rest': + if units[i] == 'min': # pragma: no cover + val = int(vals[i])*60 + unit = 'sec' + else: + val = int(vals[i]) + if units[i] == 'meters': # pragma: no cover + unit = 'm' + if units[i] == 'seconds': + unit = 'sec' + s += '+0min/{val}{unit}'.format(val=val,unit=unit) + elif typ[i] == 'rest': # pragma: no cover + if units[i] == 'min': + val = int(vals[i])*60 + unit = 'sec' + else: + val = int(vals[i]) + if units[i] == 'meters': + unit = 'm' + if units[i] == 'seconds': + unit = 'sec' + s += '/{val}{unit}'.format(val=val,unit=unit) + previous = 'rest' + else: # pragma: no cover # work interval + if units[i] == 'min': + val = int(vals[i])*60 + unit = 'sec' + else: + val = int(vals[i]) + if units[i] == 'meters': + unit = 'm' + if units[i] == 'seconds': + unit = 'sec' + s += '+{val}{unit}'.format(val=val,unit=unit) + previous = 'work' + + if s[0] == '+': + s = s[1:] + + return s diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 1993490b..08922a89 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -2099,6 +2099,7 @@ def workout_getimportview(request,externalid,source = 'c2',do_async=False): + workoutdate = startdatetime.astimezone( pytz.timezone(timezone_str) ).strftime('%Y-%m-%d') diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 67f62298..b74f1616 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -91,7 +91,7 @@ from django.utils.datastructures import MultiValueDictKeyError from django.utils import timezone,translation from django.core.mail import send_mail, BadHeaderError from rowers.forms import ( - SummaryStringForm,IntervalUpdateForm,StrokeDataForm, + SummaryStringForm,StrokeDataForm, StatsOptionsForm,PredictedPieceForm,DateRangeForm,DeltaDaysForm, FitnessMetricForm,PredictedPieceFormNoDistance, EmailForm, RegistrationForm, RegistrationFormTermsOfService, @@ -1161,7 +1161,7 @@ def get_my_teams(user): return teams # Used for the interval editor - translates seconds to a time object -def get_time(second): +def get_time(second): # pragma: no cover if (second<=0) or (second>1e9): hours = 0 minutes=0 diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index a273601f..ec44ea1a 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -13,6 +13,7 @@ import numpy from rowers.mailprocessing import send_confirm import rowers.uploads as uploads import rowers.utils as utils +from rowers.utils import intervals_to_string from urllib.parse import urlparse, parse_qs from json.decoder import JSONDecodeError @@ -2297,7 +2298,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0) intervaldata['itime'] = itime intervaldata['itype'] = itype - rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', debug=False,smoothwindow=15., activewindow = [startsecond,endsecond]) summary = rowdata.allstats() @@ -2316,7 +2317,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0) intervaldata['itime'] = itime intervaldata['itype'] = itype - rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', debug=False,smoothwindow=15., activewindow = [startsecond,endsecond]) summary = rowdata.allstats() @@ -2336,7 +2337,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0) intervaldata['itime'] = itime intervaldata['itype'] = itype - rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger', debug=False,smoothwindow=15., activewindow = [startsecond,endsecond]) summary = rowdata.allstats() @@ -4812,7 +4813,7 @@ def workout_upload_api(request): totalDistance = post_data.get('totalDistance',None) elapsedTime = post_data.get('elapsedTime',None) summary = post_data.get('summary',None) - + timezone = post_data.get('timezone',None) r = None if form.is_valid(): @@ -4904,6 +4905,13 @@ def workout_upload_api(request): return JSONResponse(status=200,data=message) w = Workout.objects.get(id=id) + if timezone is not None: # pragma: no cover + w.startdatetime = w.startdatetime.astimezone(pytz.timezone(timezone)) + w.workoutdate = w.startdatetime.strftime('%Y-%m-%d') + w.starttime = w.starttime.strftime('%H:%M:%S') + w.timezone = timezone + w.save() + if make_plot: # pragma: no cover @@ -6240,7 +6248,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" if powerorpace == 'power' and power is not None: try: - rowdata.updateinterval_metric( + vals, units, typ = rowdata.updateinterval_metric( ' Power (watts)',power,mode='larger', debug=False,smoothwindow=15., activewindow=[activesecondsmin,activesecondsmax], @@ -6250,7 +6258,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" elif powerorpace == 'pace': # pragma: no cover try: velo = 500./pace_secs - rowdata.updateinterval_metric( + vals, units, typ = rowdata.updateinterval_metric( ' AverageBoatSpeed (m/s)',velo,mode='larger', debug=False,smoothwindow=15., activewindow=[activesecondsmin,activesecondsmax], @@ -6259,7 +6267,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" messages.error(request,'Error updating pace') elif powerorpace == 'work': # pragma: no cover try: - rowdata.updateinterval_metric( + vals, units, typ = rowdata.updateinterval_metric( 'driveenergy',work,mode='larger', debug=False,smoothwindow=15., activewindow=[activesecondsmin,activesecondsmax], @@ -6268,13 +6276,17 @@ def workout_summary_edit_view(request,id,message="",successmessage="" messages.error(request,'Error updating Work per Stroke') elif powerorpace == 'spm': # pragma: no cover try: - rowdata.updateinterval_metric( + vals, units, typ = rowdata.updateinterval_metric( ' Cadence (stokes/min)',spm,mode='larger', debug=False,smoothwindow=2., activewindow=[activesecondsmin,activesecondsmax],) except: messages.error(request,'Error updating SPM') + intervalString = '' + if vals is not None: + intervalString = intervals_to_string(vals, units, typ) + intervalstats = rowdata.allstats() itime,idist,itype = rowdata.intervalstats_values() nrintervals = len(idist) @@ -6296,7 +6308,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" 'activeminutesmin': activeminutesmin, 'activeminutesmax': activeminutesmax, } - form = SummaryStringForm() + form = SummaryStringForm(initial={'intervalstring':intervalString}) powerupdateform = PowerIntervalUpdateForm(initial=data) savebutton = 'savepowerpaceform' formvalues = { @@ -6368,7 +6380,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" pace_secs = 120. if powerorpace == 'power' and power is not None: - rowdata.updateinterval_metric(' Power (watts)',power,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' Power (watts)',power,mode='larger', debug=False,smoothwindow=15, activewindow=[activesecondsmin,activesecondsmax], ) @@ -6376,7 +6388,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" elif powerorpace == 'pace': # pragma: no cover try: velo = 500./pace_secs - rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger', debug=False,smoothwindow=15, activewindow=[activesecondsmin,activesecondsmax], ) @@ -6384,7 +6396,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" messages.error(request,'Error updating pace') elif powerorpace == 'work': # pragma: no cover try: - rowdata.updateinterval_metric( + vals, units, typ = rowdata.updateinterval_metric( 'driveenergy',work,mode='larger', debug=False,smoothwindow=15., activewindow=[activesecondsmin,activesecondsmax],) @@ -6392,7 +6404,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" messages.error(request,'Error updating Work per Stroke') elif powerorpace == 'spm': # pragma: no cover try: - rowdata.updateinterval_metric(' Cadence (stokes/min)',spm,mode='larger', + vals, units, typ = rowdata.updateinterval_metric(' Cadence (stokes/min)',spm,mode='larger', debug=False,smoothwindow=2., activewindow=[activesecondsmin,activesecondsmax], ) @@ -6400,6 +6412,11 @@ def workout_summary_edit_view(request,id,message="",successmessage="" messages.error(request,'Error updating SPM') + intervalString = '' + if vals is not None: + intervalString = intervals_to_string(vals, units, typ) + + intervalstats = rowdata.allstats() itime,idist,itype = rowdata.intervalstats_values() nrintervals = len(idist) @@ -6414,135 +6431,10 @@ def workout_summary_edit_view(request,id,message="",successmessage="" 'activeminutesmax': activeminutesmax, } powerupdateform = PowerIntervalUpdateForm(initial=cd) - form = SummaryStringForm() - - - form = SummaryStringForm() - - # we are saving the results obtained from the detailed form - elif request.method == 'POST' and "savedetailform" in request.POST: # pragma: no cover - savebutton = 'savedetailform' - form = SummaryStringForm() - nrintervals = int(request.POST['nrintervals']) - detailform = IntervalUpdateForm(request.POST,aantal=nrintervals) - itime = [] - idist = [] - itype = [] - ivalues = [] - iunits = [] - itypes = [] - iresults = [] - for i in range(nrintervals): - try: - t = datetime.datetime.strptime(request.POST['intervalt_%s' % i],"%H:%M:%S.%f") - except ValueError: - t = datetime.datetime.strptime(request.POST['intervalt_%s' % i],"%H:%M:%S") - - timesecs = 3600*t.hour+60*t.minute+t.second+t.microsecond/1.e6 - itime += [timesecs] - idist += [int(request.POST['intervald_%s' % i])] - itype += [int(request.POST['type_%s' % i])] - - if itype[i] == 3: # rest - itypes += ['rest'] - ivalues += [timesecs] - iresults += [idist[i]] - iunits += ['seconds'] - if itype[i] == 5 or itype[i] == 2: # distance based work - itypes += ['work'] - ivalues += [idist[i]] - iresults += [timesecs] - iunits += ['meters'] - if itype[i] == 4 or itype[i] == 1: # time based work - itypes += ['work'] - ivalues += [timesecs] - iresults += [idist[i]] - iunits += ['seconds'] - - - rowdata.updateintervaldata(ivalues,iunits,itypes,iresults=iresults) - intervalstats = rowdata.allstats() - row.summary = intervalstats - try: - row.notes += "\n"+s - except TypeError: - pass - - row.save() - rowdata.write_csv(f1,gzip=True) - dataprep.update_strokedata(encoder.decode_hex(id),rowdata.df) - messages.info(request,"Updated interval data saved") - - form = SummaryStringForm() - powerupdateform = PowerIntervalUpdateForm(initial={ - 'power': int(normp), - 'pace': avpace, - 'selector': 'power', - 'work': int(normw), - 'spm': int(normspm), - 'activeminutesmin': 0, - 'activeminutesmax': activeminutesmax, - }) - - - # we are processing the details form - elif request.method == 'POST' and "nrintervals" in request.POST: # pragma: no cover - savebutton = 'savedetailform' - nrintervals = int(request.POST['nrintervals']) - detailform = IntervalUpdateForm(request.POST,aantal=nrintervals) - if detailform.is_valid(): - cd = detailform.cleaned_data - itime = [] - idist = [] - itype = [] - ivalues = [] - iunits = [] - itypes = [] - iresults = [] - for i in range(nrintervals): - t = cd['intervalt_%s' % i] - timesecs = t.total_seconds() - itime += [timesecs] - idist += [cd['intervald_%s' % i]] - itype += [cd['type_%s' % i]] - - if itype[i] == '3': # rest - itypes += ['rest'] - ivalues += [timesecs] - iresults += [idist[i]] - iunits += ['seconds'] - if itype[i] == '5' or itype[i] == '2': # distance based work - itypes += ['work'] - ivalues += [idist[i]] - iresults += [timesecs] - iunits += ['meters'] - if itype[i] == '4' or itype[i] == '1': # time based work - itypes += ['work'] - ivalues += [timesecs] - iresults += [idist[i]] - iunits += ['seconds'] - - rowdata.updateintervaldata(ivalues,iunits, - itypes,iresults=iresults) - intervalstats = rowdata.allstats() - - - form = SummaryStringForm() - powerupdateform = PowerIntervalUpdateForm() + form = SummaryStringForm(initial={'intervalstring':intervalString}) - initial = {} - for i in range(nrintervals): - try: - initial['intervald_%s' % i] = idist[i] - initial['intervalt_%s' % i] = get_time(itime[i]) - initial['type_%s' % i] = itype[i] - except IndexError: # pragma: no cover - pass - - - detailform = IntervalUpdateForm(aantal=nrintervals,initial=initial) # create interactive plot try: @@ -6562,13 +6454,11 @@ def workout_summary_edit_view(request,id,message="",successmessage="" div = '' # render page - return render(request, 'summary_edit.html', {'form':form, 'activeminutesmax':activeminutesmax, 'activeminutesmin':activeminutesmin, 'maxminutes': maxminutes, - 'detailform':detailform, 'powerupdateform':powerupdateform, 'workout':row, 'rower':r,