From 08cc5791575be61eda025c1d555667fd7f19d848 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 22 Jun 2021 17:14:24 +0200 Subject: [PATCH] sorting NK intervals --- rowers/nkimportutils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py index d6b3b073..6d3a0bc7 100644 --- a/rowers/nkimportutils.py +++ b/rowers/nkimportutils.py @@ -2,6 +2,7 @@ import pandas as pd import datetime from datetime import timedelta from uuid import uuid4 +import traceback from rowsandall_app.settings import UPLOAD_SERVICE_SECRET, UPLOAD_SERVICE_URL from rowsandall_app.settings import NK_API_LOCATION @@ -127,6 +128,7 @@ def add_workout_from_data(userid,nkid,data,strokedata,source='nk',splitdata=None def get_nk_intervalstats(workoutdata,strokedata): intervals = workoutdata['intervals'] + intervals = sorted(intervals, key = lambda k:k['id']) separator = "|" stri = "Workout Details\n" stri += "#-{sep}SDist{sep}-Split-{sep}-SPace-{sep}-Pwr-{sep}-SPM--{sep}-AvgHR-{sep}DPS-\n".format( @@ -300,5 +302,6 @@ def readlogs_summaries(logfile,dosave=0): # pragma: no cover json.dump(strokeData,f2) with open(filename2,'w') as f2: json.dump(summaryData,f2) - except: + except Exception as e: + print(traceback.format_exc()) print("error")