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

added menu items

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-07 18:14:27 +01:00
parent 07e9a5abf1
commit d88a0f7aea
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -1437,18 +1437,16 @@ def handle_nonpainsled(f2, fileformat, summary=''):
f_to_be_deleted = f2 f_to_be_deleted = f2
# should delete file # should delete file
f2 = f2[:-4] + 'o.csv' f2 = f2[:-4] + 'o.csv'
try:
row2 = rrdata(df = row.df) row2 = rrdata(df = row.df)
if fileformat == 'speedcoach2': if 'speedcoach2' in fileformat:
# impeller consistency # impeller consistency
impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3) impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3)
if impellerdata and consistent: if impellerdata and consistent:
impeller = True impeller = True
if impellerdata and not consistent: if impellerdata and not consistent:
row2.use_gps() row2.use_gpsdata()
row2.write_csv(f2, gzip=True) row2.write_csv(f2, gzip=True)
except:
return (0,'',0,0,'',impeller)
# os.remove(f2) # os.remove(f2)
try: try:

12
rowers/templates/menu_workout.html
View File

@@ -287,6 +287,18 @@
<i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power <i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
</a> </a>
</li> </li>
{% if 'speedcoach2' in workout.workoutsource %}
<li id="advanced-usegps">
<a href="/rowers/workout/{{ workout.id|encode }}/otwusegps/">
<i class="fas fa-satellite"></i>&nbsp;Use GPS data
</a>
</li>
<li id="advanced-useimpeller">
<a href="/rowers/workout/{{ workout.id|encode }}/otwuseimpeller/">
<i class="fas fa-wind-turbine fa-rotate-180"></i>&nbsp;Use Impeller data
</a>
</li>
{% endif %}
{% endif %} {% endif %}
<li id="advanced-instroke"> <li id="advanced-instroke">
<a href="/rowers/workout/{{ workout.id|encode }}/instroke/"> <a href="/rowers/workout/{{ workout.id|encode }}/instroke/">

1
templates/newbase.html
View File

@@ -43,6 +43,7 @@
<link rel="stylesheet" href="/static/css/resetnew.css" /> <link rel="stylesheet" href="/static/css/resetnew.css" />
<link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css"> <link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css">
<link rel="stylesheet" href="/static/fontawesome/css/all.min.css"> <link rel="stylesheet" href="/static/fontawesome/css/all.min.css">
<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.12.0/css/all.css" integrity="sha384-ekOryaXPbeCpWQNxMwSWVvQ0+1VrStoPJq54shlYhR8HzQgig1v5fas6YgOqLoKz" crossorigin="anonymous">
<link rel="stylesheet" href="/static/css/styles2.min.css"> <link rel="stylesheet" href="/static/css/styles2.min.css">
<link rel="stylesheet" href="/static/css/text2.css" /> <link rel="stylesheet" href="/static/css/text2.css" />
<link rel="stylesheet" href="/static/css/rowsandall2.min.css" /> <link rel="stylesheet" href="/static/css/rowsandall2.min.css" />