From 764044899a932a38ef0eb3f5ebd6e8cbf22d15f1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 10 Apr 2023 13:32:10 +0200 Subject: [PATCH] fix errors --- rowers/dataprep.py | 7 ++++++- rowers/interactiveplots.py | 15 +++++++-------- rowers/weather.py | 5 ++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 0652c159..8b32ff78 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -145,7 +145,12 @@ def workout_goldmedalstandard(workout, reset=False): goldmedalstandard, goldmedalseconds = calculate_goldmedalstandard( workout.user, workout) if workout.workouttype in otwtypes: - factor = 100./(100.-workout.user.otwslack) + try: + factor = 100./(100.-workout.user.otwslack) + except ZeroDivisionError: + factor = 1. + workout.user.otwslack = 0 + workout.user.save() goldmedalstandard = goldmedalstandard*factor workout.goldmedalstandard = goldmedalstandard workout.goldmedalseconds = goldmedalseconds diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 8235fc74..cc86876b 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -5773,14 +5773,13 @@ def interactive_flex_chart2(id, r, promember=0, except KeyError: pass - if len(rowdata) < 2: - rowdata = dataprep.getsmallrowdata_db(columns, ids=[id], doclean=True, - workstrokesonly=False) - workstrokesonly = False - if len(rowdata) < 2: - rowdata = dataprep.getsmallrowdata_db(columns, ids=[id], - doclean=False, - workstrokesonly=False) + try: + if len(rowdata) < 2: + rowdata = dataprep.getsmallrowdata_db(columns, ids=[id], + doclean=False, + workstrokesonly=False) + workstrokesonly = False + except TypeError: workstrokesonly = False try: _ = rowdata[yparam2] diff --git a/rowers/weather.py b/rowers/weather.py index ad5fc227..c6533127 100644 --- a/rowers/weather.py +++ b/rowers/weather.py @@ -38,7 +38,10 @@ def get_weather_data(long, lat, unixtime): return 0 if s.ok: - return s.json() + try: + return s.json() + except: + return 0 else: # pragma: no cover return 0