Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop
This commit is contained in:
@@ -529,8 +529,8 @@ def createc2workoutdata(w):
|
||||
|
||||
try:
|
||||
spm[0] = spm[1]
|
||||
except IndexError:
|
||||
pass
|
||||
except (KeyError,IndexError):
|
||||
spm = 0*t
|
||||
try:
|
||||
hr = row.df[' HRCur (bpm)'].astype(int)
|
||||
except ValueError:
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
{% load tz %}
|
||||
{% load leaflet_tags %}
|
||||
|
||||
{% get_current_timezone as TIME_ZONE %}
|
||||
|
||||
@@ -13,6 +14,8 @@
|
||||
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
|
||||
|
||||
{% block meta %}
|
||||
{% leaflet_js %}
|
||||
{% leaflet_css %}
|
||||
<script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
|
||||
<script async="true" type="text/javascript">
|
||||
Bokeh.set_log_level("info");
|
||||
|
||||
Reference in New Issue
Block a user