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

Merge branch 'develop' into feature/freecoach

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-08 16:59:25 +02:00
parent 2baa9b6ba9 278d8ac903
commit 4a2ba9540f
3 changed files with 2532 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2523
b90680ee-35d5-4633-9974-fdc4bba4c68f.tcx Normal file
View File

File diff suppressed because it is too large Load Diff

17
rowers/dataprep.py
View File

@@ -1203,7 +1203,10 @@ def parsenonpainsled(fileformat,f2,summary):
fileformat = fileformat+'v'+str(empowerfirmware) fileformat = fileformat+'v'+str(empowerfirmware)
else: else:
fileformat = 'speedcoach2v0' fileformat = 'speedcoach2v0'
summary = row.allstats() try:
summary = row.allstats()
except ZeroDivisionError:
summary = ''
print(summary) print(summary)
print('aap',hasrecognized) print('aap',hasrecognized)
@@ -1225,18 +1228,14 @@ def handle_nonpainsled(f2, fileformat, summary=''):
inboard = 0.88 inboard = 0.88
hasrecognized = False hasrecognized = False
try: row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
except:
pass
# Handle c2log # Handle c2log
if (fileformat == 'c2log' or fileformat == 'rowprolog'): if (fileformat == 'c2log' or fileformat == 'rowprolog'):
return (0,0,0,0,0) return (0,'',0,0,'')
if not hasrecognized: if not hasrecognized:
return (0,0,0,0,0) return (0,'',0,0,'')
f_to_be_deleted = f2 f_to_be_deleted = f2
# should delete file # should delete file
@@ -1245,7 +1244,7 @@ def handle_nonpainsled(f2, fileformat, summary=''):
row2 = rrdata(df = row.df) row2 = rrdata(df = row.df)
row2.write_csv(f2, gzip=True) row2.write_csv(f2, gzip=True)
except: except:
return (0,0,0,0,0) return (0,'',0,0,'')
# os.remove(f2) # os.remove(f2)
try: try:

2
rowers/middleware.py
View File

@@ -1,6 +1,6 @@
from django.utils import timezone from django.utils import timezone
from rowers.models import Workout, PowerTimeFitnessMetric, Rower from rowers.models import Workout, PowerTimeFitnessMetric, Rower, PaidPlan
import datetime import datetime
from rowers.utils import myqueue from rowers.utils import myqueue
import django_rq import django_rq