From d542c6a573ae9c891528f5469952b5294f0aaa9f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 2 Nov 2020 21:20:05 +0100 Subject: [PATCH] fixed bug in piece duration (CP chart) --- rowers/views/analysisviews.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 27a27a5c..35561159 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -555,7 +555,7 @@ def cpdata(workouts, options): if workouts[0].workouttype == 'bikeerg': # for Mike wtype = 'erg' - + res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r, cpfit=cpfit,title=title,type=wtype) script = res[0] @@ -585,10 +585,14 @@ def cpdata(workouts, options): minutes = options['piece'] if minutes != 0: + # minutes = 77 hourvalue,tvalue = divmod(minutes,60) + # hourvalue = 1, tvalue = 17 hourvalue = int(hourvalue) minutevalue = int(tvalue) + tvalue = int(60*(tvalue-minutevalue)) + if hourvalue >= 24: hourvalue = 23 pieceduration = datetime.time( @@ -596,7 +600,8 @@ def cpdata(workouts, options): hour = hourvalue, second = tvalue, ) - pieceseconds = 2600.*pieceduration.hour+60.*pieceduration.minute+pieceduration.second + + pieceseconds = 3600.*pieceduration.hour+60.*pieceduration.minute+pieceduration.second # CP model pwr = p1[0]/(1+pieceseconds/p1[2]) pwr += p1[1]/(1+pieceseconds/p1[3])