diff --git a/rowers/dataprep.py b/rowers/dataprep.py index fb7ef68c..48831f3f 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1670,6 +1670,8 @@ def rdata(file, rower=rrower()): res = rrdata() except EOFError: res = rrdata() + except: + res = rrdata() return res diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 86e8974f..173cfb71 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 3f4b31be..6a5c7e72 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -665,7 +665,10 @@ def boxplotdata(workouts,options): message="This functionality requires a Pro plan or higher", redirect_field_name=None) def analysis_view_data(request,userid=0): - + if not request.is_ajax(): + url = reverse('analysis_new') + return HttpResponseRedirect(url) + if 'options' in request.session: options = request.session['options'] else: