diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 556f84d6..5a357952 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 543cc95b..c46f5327 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from __future__ import unicode_literals, absolute_import from rowers.views.statements import * +import collections from jinja2 import Template,Environment,FileSystemLoader def floatformat(x,prec=2): @@ -2796,12 +2797,12 @@ def oterankings_view(request,theuser=0, except: pwr2 = pwr - a = { - 'distance':int(d), - 'duration':timedeltaconv(t), - 'power':int(pwr), - 'upper':int(pwr2), - 'pace':timedeltaconv(p)} + a = collections.OrderedDict() + a['duration'] = timedeltaconv(t) + a['distance'] = int(d) + a['pace'] = timedeltaconv(p) + a['power'] = int(pwr) + a['upper'] = int(pwr2) cpredictions.append(a)