From 2d960b4f385660205462cb8be1d89e795b388f6b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 Mar 2019 20:25:00 +0100 Subject: [PATCH 1/2] changed --- rowers/c2stuff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 11810301..37154a38 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -329,7 +329,7 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'): # logbook but needs to be reviewed. def createc2workoutdata_as_splits(w): filename = w.csvfilename - row = rowingdata(filename) + row = rowingdata(csvfile=filename) # resize per minute df = row.df.groupby(lambda x:x/60).mean() @@ -758,10 +758,10 @@ def workout_c2_upload(user,w): w.uploadedtoc2 = c2id w.save() message = "Upload to Concept2 was successful" - # except: - # message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text - # c2id = 0 - + else: + message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text + c2id = 0 + return message,c2id From ade9c5c5bc1efc2a0f9399ad2ddbec7104eb758e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 Mar 2019 20:27:17 +0100 Subject: [PATCH 2/2] c2 changed back --- rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index f31f6ca1a7ac143672938df75f09cf1b0bb6c587..47a48e388b596a6a095ccfbd5684818e2120b6ed 100644 GIT binary patch delta 15 WcmaEz_&SkIzMF%CFLfi^Qv(1ojRlwh delta 15 WcmaEz_&SkIzMF%iE_fr`Qv(1q(*^bb