diff --git a/rowers/tasks.py b/rowers/tasks.py index c1e2c228..f3ae7b04 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -3045,7 +3045,7 @@ def df_from_summary(data): try: splits = data['workout']['splits'] - except KeyError: # pragma: no cover + except (KeyError, TypeError): # pragma: no cover splits = [0] time = starttimeunix elapsed_distance = 0 @@ -3053,11 +3053,11 @@ def df_from_summary(data): distances = [0] try: spms = [splits[0]['stroke_rate']] - except KeyError: # pragma: no cover + except (KeyError, TypeError): # pragma: no cover spms = [0] try: hrs = [splits[0]['heart_rate']['average']] - except KeyError: # pragma: no cover + except (KeyError, TypeError): # pragma: no cover hrs = [0] for split in splits: @@ -3068,7 +3068,7 @@ def df_from_summary(data): spms.append(split['stroke_rate']) try: hrs.append(split['heart_rate']['average']) - except KeyError: # pragma: no cover + except (KeyError, TypeError): # pragma: no cover hrs.append(0) df = pd.DataFrame({ @@ -3161,7 +3161,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone if not has_strokedata: # pragma: no cover df = df_from_summary(data) else: - dologging('debuglog.log',json.dumps(s.json())) + #dologging('debuglog.log',json.dumps(s.json())) strokedata = pd.DataFrame.from_dict(s.json()['data']) diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index d77796f8..d19304a9 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -108,6 +108,17 @@ See which of your workouts are markers of your fitness, and how your scores evolve over time.

+ +
  • +

    Training Zones

    + +
    + Zones +
    +
    +

    + See in what training zone you have been training in the past weeks and months. +

  • Alerts

    diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html index 0f12d35d..5ef13f6f 100644 --- a/rowers/templates/menu_analytics.html +++ b/rowers/templates/menu_analytics.html @@ -57,6 +57,11 @@  Ranking Pieces
  • +
  • + +  Training Zones + +
  • diff --git a/static/img/zones.png b/static/img/zones.png new file mode 100644 index 00000000..3bfae34a Binary files /dev/null and b/static/img/zones.png differ diff --git a/static/img/zones2.png b/static/img/zones2.png new file mode 100644 index 00000000..8abf3acd Binary files /dev/null and b/static/img/zones2.png differ