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

Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-11 09:41:28 +01:00
parent 47dbb0f23c 647547098d
commit dc425445b2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/c2stuff.py
View File

@@ -529,8 +529,8 @@ def createc2workoutdata(w):
try: try:
spm[0] = spm[1] spm[0] = spm[1]
except IndexError: except (KeyError,IndexError):
pass spm = 0*t
try: try:
hr = row.df[' HRCur (bpm)'].astype(int) hr = row.df[' HRCur (bpm)'].astype(int)
except ValueError: except ValueError:

3
rowers/templates/workflow.html
View File

@@ -2,6 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% load tz %} {% load tz %}
{% load leaflet_tags %}
{% get_current_timezone as TIME_ZONE %} {% get_current_timezone as TIME_ZONE %}
@@ -13,6 +14,8 @@
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %} {{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
{% block meta %} {% block meta %}
{% leaflet_js %}
{% leaflet_css %}
<script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script> <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
<script async="true" type="text/javascript"> <script async="true" type="text/javascript">
Bokeh.set_log_level("info"); Bokeh.set_log_level("info");