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

Merge branch 'develop' into feature/magicintervals

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-28 09:20:29 +02:00
parent 51b7b2387a 6d821c2093
commit cb3e74019b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/tasks.py
View File

@@ -2806,7 +2806,7 @@ def handle_update_wps(rid,types,ids,mode,debug=False,**kwargs):
return 0 return 0
try: try:
wps_median = int(df.loc[mask,'driveenergy'].median()) wps_median = int(df.loc[mask,'driveenergy'].median())
except ValueError: except ValueError: # pragma: no cover
return 0 return 0
if mode == 'water': if mode == 'water':
@@ -3029,7 +3029,7 @@ def df_from_summary(data):
weightclass = data['weight_class'] weightclass = data['weight_class']
try: try:
title = data['name'] title = data['name']
except KeyError: except KeyError: # pragma: no cover
title = "" title = ""
try: try:
t = data['comments'].split('\n', 1)[0] t = data['comments'].split('\n', 1)[0]
@@ -3049,7 +3049,10 @@ def df_from_summary(data):
times = [0] times = [0]
distances = [0] distances = [0]
spms = [splits[0]['stroke_rate']] spms = [splits[0]['stroke_rate']]
try:
hrs = [splits[0]['heart_rate']['average']] hrs = [splits[0]['heart_rate']['average']]
except KeyError: # pragma: no cover
hrs = [0]
for split in splits: for split in splits:
time += split['time']/10. time += split['time']/10.
@@ -3057,7 +3060,10 @@ def df_from_summary(data):
times.append(time) times.append(time)
distances.append(elapsed_distance) distances.append(elapsed_distance)
spms.append(split['stroke_rate']) spms.append(split['stroke_rate'])
try:
hrs.append(split['heart_rate']['average']) hrs.append(split['heart_rate']['average'])
except KeyError: # pragma: no cover
hrs.append(0)
df = pd.DataFrame({ df = pd.DataFrame({
'TimeStamp (sec)': times, 'TimeStamp (sec)': times,
@@ -3090,7 +3096,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
try: try:
has_strokedata = data['stroke_data'] has_strokedata = data['stroke_data']
except KeyError: except KeyError: # pragma: no cover
has_strokedata = True has_strokedata = True
@@ -3146,7 +3152,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
dologging('debuglog.log',s.text) dologging('debuglog.log',s.text)
has_strokedata = False has_strokedata = False
if not has_strokedata: if not has_strokedata: # pragma: no cover
df = df_from_summary(data) df = df_from_summary(data)
else: else:
dologging('debuglog.log',json.dumps(s.json())) dologging('debuglog.log',json.dumps(s.json()))

4
rowers/tests/test_imports.py
View File

@@ -21,6 +21,7 @@ import json
import rowers.utils as utils import rowers.utils as utils
from django.db import transaction from django.db import transaction
import rowers.garmin_stuff as gs import rowers.garmin_stuff as gs
@@ -342,6 +343,9 @@ class C2Objects(DjangoTestCase):
self.assertEqual(str(timezone),'America/Los_Angeles') self.assertEqual(str(timezone),'America/Los_Angeles')
df = tasks.df_from_summary(data)
self.assertEqual(len(df),8)
got = arrow.get(startdatetime).isoformat() got = arrow.get(startdatetime).isoformat()
want = arrow.get('2021-05-23 09:11:37.100000-07:00').isoformat() want = arrow.get('2021-05-23 09:11:37.100000-07:00').isoformat()