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

import cross training allowed

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-08 11:29:07 +01:00
parent d785404815
commit 7d51bb9356
4 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/stravastuff.py
View File

@@ -185,7 +185,8 @@ def get_strava_workout(user,stravaid):
if nr_rows == 0:
return (0,"Error: Time data had zero length")
except IndexError:
return (0,"Error: No Distance information in the Strava data")
d = 0*t
# return (0,"Error: No Distance information in the Strava data")
except KeyError:
return (0,"something went wrong with the Strava import")

20
rowers/templates/plannedsessionsmanage.html
View File

@@ -92,13 +92,29 @@
$('#id_plannedsession').on('click', function(evt) {
var selectedsession = $("input:radio[name='plannedsession']:checked").val();
var url = window.location.pathname
var url = window.location.pathname;
if (url.indexOf("/session/") >= 0) {
url = url.replace(/\/session\/\d+/g, "/session/"+selectedsession);
} else {
url += "/session/"+selectedsession
}
window.location.replace(url);
// window.location.replace(url);
$.getJSON(url, function(json) {
var workouts = json['workouts'];
for (i=0; i < workouts.length; i++) {
var wid = workouts[i][0];
var wcheck = workouts[i][2];
if (wcheck) {
$(":checkbox").filter(function() {
return this.value == wid;
}).prop("checked",true);
} else {
$(":checkbox").filter(function() {
return this.value == wid;
}).prop("checked",false);
}
}
});
});
});
</script>

19
rowers/templates/planningbuttons.html
View File

@@ -1,20 +1,27 @@
{% load rowerfilters %}
<div class="grid_2 alpha">
<p>
{% if timeperiod and rower %}
<a class="button gray small" href="/rowers/sessions/{{ timeperiod }}/rower/{{ rower.id }}">Plan Overview</a>
{% elif timeperiod %}
<a class="button gray small" href="/rowers/sessions/{{ timeperiod }}">Plan Overview</a>
{% else %}
<a class="button gray small" href="/rowers/sessions">Plan Overview</a>
{% endif %}
</p>
</div>
<div class="grid_2">
<p>
<a class="button gray small" href="/rowers/sessions/review">Review Sessions</a>
</p>
</div>
<div class="grid_2">
<p>
{% if timeperiod and rower %}
<a class="button gray small" href="/rowers/sessions/manage{{ timeperiod }}/rower/{{ rower.id }}">Manage Sessions</a>
{% elif timeperiod %}
<a class="button gray small" href="/rowers/sessions/manage/{{ timeperiod }}">Manage Sessions</a>
{% else %}
<a class="button gray small" href="/rowers/sessions/manage">Manage Sessions</a>
{% endif %}
</p>
</div>
<div class="grid_2 suffix_4 omega">
<div class="grid_2 suffix_6 omega">
<p>
<a class="button gray small" href="/rowers/sessions/create">Add Session</a>
</p>

17
rowers/views.py
View File

@@ -941,7 +941,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
workouttype = 'rower'
if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'water'
workouttype = 'other'
try:
comments = data['comments']
except:
@@ -1088,7 +1088,7 @@ def add_workout_from_runkeeperdata(user,importid,data):
# To Do - add utcoffset to time
workouttype = data['type']
if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'water'
workouttype = 'other'
try:
comments = data['notes']
except:
@@ -1261,7 +1261,7 @@ def add_workout_from_runkeeperdata(user,importid,data):
def add_workout_from_stdata(user,importid,data):
workouttype = data['type']
if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'water'
workouttype = 'other'
try:
comments = data['comments']
except:
@@ -1291,11 +1291,16 @@ def add_workout_from_stdata(user,importid,data):
try:
res = splitstdata(data['distance'])
except KeyError:
return (0,"No distance data in the workout")
distance = res[1]
times_distance = res[0]
except KeyError:
try:
res = splitstdata(data['heartrate'])
times_distance = res[0]
distance = 0*times_distance
except KeyError:
return (0,"No distance or heart rate data in the workout")
try:
l = data['location']