From 32cf941d12aaeb35a2b0350d3a71978912f12180 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 15 Aug 2023 15:19:38 +0200
Subject: [PATCH] private plan seems to be working

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4002 -> 3999 bytes
 rowers/utils.py                       |  13 +++++++++++--
 rowers/views/planviews.py             |   2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 7e8926dc0c1a712966a42b67d32bdfd83d3aeb22..8081d0e695a6522e399347595a05ff38aa17db16 100644
GIT binary patch
literal 3999
zcmV;Q4`A>giwFqtdD~<H|8!+@bYx+4VJ>uIcmVC4NpBoC7J%>m6@m}RVG#CP__!#t
zf^35^U}u8Z$mBMtNFBLnq?XWKUh?mU?6zguRv~`U6u~Oc2SZ(5Th~{Qd^?Z6d2?}o
z@M^i)t}fS)9-@JV2j3h&IC{S6R_oRJ?EB@qUv7Tr`tJ8`yF5rcueXmLzUcd_!^PtD
z>(}P2+gz;H=H&8Xk-prXyjWgz+r{mNFJ95Z{V5K+H=l8qZ%_Kwt5yH!k8k?rI^W=p
z6TI23J~+c`HkX^T1p(mVx2I2@?N0I4YQ62d^~o|FwOt+V&->)^r0aLT_D(l&pg-yr
znK#?hzdrEqUH^S|ez{pKw~JT!*Zcp`^(XuNm)DoV&%4whpt~Nr|BVli9~>MUy?p@b
zXXKCXH~e|<?CNsUKYIAj{>5_haQ|ic`tj*80lKe1z9M*zd}#5IoQaM&!ruT60ge`F
zr+525>8=i*_1&g_zPeaGdiYnzUSB93`uwu*&huf<mM53%)9taaKU#dU_5A@qtoCov
z(`EXx+jO7#UOw9Re(!hqjuFGr;`-D39llMX)}1Z?u}pXWOV=;IySmuDn*E<w>6ct@
ze!Tu}+4b9>mz$@n^~-+w@BYS*NT>O=JAb)6Mw>3O|MUG77PnmD#@A1~H>-=67yqXl
z5O>QB+;WK<Uq4>&Ue*53<K0`aOk}UO+<cIy%k+Sc3G-vz|9ykvW_5O!Zf)7WxI8_6
z+O1!9=ZWG6TW{{&o&5KMyWefOx?HXMo160&=^gltcX7Adhev+&N{F$;ugUI!dlI-w
zf&3>F_9Sjc@WBIyTb}Q3hwIU6`^jaW|NPr$&jh!Q;UAwdo%3H^-zTw&M~nSmA768k
zF8cA$yZsjPi*OrWEp-Nyq+P6nI<moOV9yV_BJSiW;+`NPxS-%pNpC91J=~o;)g|v%
zD&p=8F{(!SG(>Pg?r}EUovny_O!98UYq-af^3E_D?!F@KmUiR3Q*gJzP(ki^5AIkM
z_W%`fm&82@l}4NQ#!ZBKUGg5dBJSP<4^E@cJ6F<-W10_lUk`Ty;{#fayn8V+5$=_Z
z^A*`~!X|=^8ty?#+V69c_fQdcXB-e{^tvcT_4)b8J3>W@okYW|bJHS}CC~RDPj!)}
zYNmKPgk;Kz&XhxxlD-?Z^O1R$ipX0NlTxpec@h%}l9w5gj}?(m=A0l0Rd~h~wd37<
z$Xizrc?9Dul1k>2@n6z&=jSue3sgj&jb#+pkT2}Ji!&lm6_Ixaoz97a&X=6$Ews^o
z6!O7D5~~T%p${efclRRSM*BhXgvJqg)o35elAlk64y7Wij;s+tRB3oImbB;RMBavq
z$R|CW3028g5KBhsEX`=N$BM{D6A-*rrQJ31Ga%1oT*Rm%pObS7lAn>^zNXQh#jpdf
zndixtC2wa$zM_Z?2Lk|JG~@+JM(6E){Px_ex*_sOeyu}Q8Wu?`>BE~9`HFmamJK6X
zO_Y{=(G2@WekAhFfK`$YFd3PzZJw_vN^67h=~YzO^AU`18s60Bc|nszUS-cSK+%ZJ
zj7IyKWL~UE&lX5S9&s|deT&i#lXu1o22GTf35(kEb0S}nJ)bQ!wyJra8BLrBd2I9i
z?c_P<-ZCI*JUQt_DVcR`UGv+ILS76o1eMGS6^+<5^5c;ACM1bR4SB~+=I=<J>miR|
zBtTF#$?#lM=6%!cM<LIKEsAQM4_s8k^G)VQA@2-E6qU?JThx2oWPTj-yWCq<3p87{
zqVitkvH9?Z$miT!u`1o(maV9?p~?Ix<gH0VebngomRwPp56!9@g}gTu(P_N5mR-?&
z`_M-FF~~FQT4HH*duv@$-9EJV{3ztfIEJWdf+uCk&#9u)RYYEl6=u~u?~2ya&WgNL
zL_V0rU6p}p%T`nhG?^cRyhW2VPDiSir$u|+%8aV0#a2X~jd!{zt&Oo{PR^Xj*HdG|
zIrr9iM9pX~2$PZdX3r0kkA?!opdufeZa@8qjZp5EqKeWAL(}c2FY{teNV>gB=55)m
z>)2{(M<MTxur6XFQkH!4;f+AvCfEkORb^d^Yvk`r-d04OOz^tuD)Bg(_<WQ3Ve(=u
zp{lw{LfN{y)&p}K^1%?Is&j(GvNblo>GorgM=%kIHQrkX*m7^DFZ0Mo0+A+4>u@^c
zxp{I1$-A6&t?Gp62#f0Wb0S~UXdewA22Fh4F%_+%_ANd?2Kk(O8!%}4-a1P~b8qKF
zz9M^`tRaW2n&*WklY7gpetwX=H)xSmqrIb|_WX><JF19$?wmlZ>2L2m7oF$lM7|>3
zK51(lQMGEB3*4f#GaxSpKvZ4MUE~&}o&IRg-iYWrA$n-!?@GQR-QI#>FDg%tM_W?E
zyH_4w)9{ALbMAhs^4|Jn3C5OzIeGG8ymhFF)%m0w6pYmg&d8pxC_Zn4vB;>&$?@rJ
zu@fO*n-4G4LtZe~(yG?9@KUsXeoiu9lZGd3ybx-9c;2~^e*0O?^A*|iNq#w!s>a59
z*D5OSNWP*dtwaM%pc?Iin~ZMXytf17<q*(#r4P@?qN|Y4O6H{^^43@omCOeyx)$}U
zWZqRo-Wvo0ja3&gOh)D#`C;<WxHQ;nM*Bdas69WY(LU5e9?4jXQImBYI5wHTBl%bn
zc`*=_qrEM<QsJyTITele=#3XqbxR4Z=<1|%^4@x?hde><jl~*IPAI!ZrBEY33VAk2
zx*nJz6kWA!PULHv=SfTujG7G05V2@x2F+-m_Z5*3Mv}~HDlH;VlliH~>g15oSSD3w
zMnrDpryj9M<gKCfPeq=Ju49wyPg`cj2;_av!&CLci(GUa8?iI$ep(axXoAD2lKH~f
zShn@O9fQ0j<3v|o6$@u$&1qfQilVeheub5~y>msax;c@r$dhA(p-7;~w~yWz9qnCP
zi+T+5``laIJRd?)t8Px@EAr$>ve1}7MLve2IXSM)^P`Y=CRk!klokQXhH2-7z9LtS
z#GG&sL4}^6p}%AQ(`v?hmpk9Os2lGQ7>lOd-v>QZhF&T{FS%g~=mvaClR=NI-}NB+
zU<3(Cg+8f<JQ1V5N&O)D+|HDcb?BWfYTHSh>qkLvjTKb+a1p#TslOw7stCQ$EwVhS
z&<8gesjmz@yL!+kJIw|Ht3n@rQ8jN)13p%Sp3_`UpqlFu!er3bHsIGJ_0BLLspfjb
zvgI~&LeCYUk6FWyI;k(aYGFe^4*J{))v+ow3)76%H2fK$mptIBLbixPMWgj|Qu8V@
z?l>6o7*rZQy5`Nht8o|VL7&EMaJfI82E8xZ2lrkXnb3^8LG;!D5bLBq*vX*BX50;;
z_X)kOiAK)mDvF*P`ccqF6RpyvL*R-UchtOjW1vsUdPH5>4N`XeH>saIdNIyx(No!0
zX>*c#s0e*9BBW}7jg%}x-_TFnrQ>sFOzT8c#vLUEK_=2Z2ivmrgXpbcuWO%^7si-O
z=cH!W52N>nf&|@w@1ba6JvKFO4D^@;SXpp~6mT*faj~Uk4x(p+PS-UHDHdJ0bXEgC
zRfOIdu%ye#W#GxIant7dVf4X7QC8nD+M+I<HrJ1Wp3p=hP$g(FO=nHB=EEOGZ%trj
z^$oL|Ow+WMr8A7)8*hbG8a~^y>)cSQxf=t0&af2J)z`C>ZKpy_%^L+h8v%?usdr&A
z13tC{twHq8Sk$d$i0ot0#%a{-`ccqFLlLb`!w+S{H{85=W1zQ``)BFAc^qR?^QJ%G
zTQMNY!Yhj~nRtC|$=DSIZEe!nkYZG!Cu(#3^wA5Ls9d-hEmP6RUGw3OgPu)vNILYE
zC$qd+bL0-A-?dEiDmBlFZ7!YZJ92j|6VdDDdMA@f&}wO!1L(u9Wg_U7yg}=w8Fy2+
z>qBmtXhl%v$hDzW-`o{_s0e+?9kg^^HEb*!zTr0DkAWW1FpE=3y+GOJ>Ul<L9#n+h
z?piCT)I2HNMrls<^|m7P-jG!WZH1wzH_x^Ke+={l28oeX=q*fUZNuix8%Dn?vL;o$
zK3N2<$a)4+?{Zg-s6+3lsBzc2YK((EWU2SM0pIgvq`nRKgXkGe5Z1-(CD@`Gehb=;
zgWej4h^np{5^eM5P2Z8r-gqXf3fekwlS$QRYTh9FWT#n&x-1=st_}E8&&^Bd*$8DP
zjRrkUrv#(5Q5r_?jD?(NsX@=74fxY{<l30f6R8TXoQ;#Iv~5{BgXo0}Ykm06L7VGm
zfL;udR?YL!GIFP0colNXL`>Us=mSosp-NNp2GGacG7%7?&aRKt(lTd&o=pIyH_t=a
z<&2^A(isK4%jl!ZuJ_1AYwn;KccY+>#-lP1-&5HV3}`{yG0-FBhAK*_=dvXj(1Nz3
zpqJcGg>+JHrD)_1nwmEX`e0Zv=%ij;(NvA5=8b}$l5t1M)(YOa=E$A8ODE=*iJ)E6
z)_Xshxt?0kb`X6ovSv_)Z+!60uAc$=Xe3#8I;oF-GIl*RHE#$#lM!om;hO-V+4VC(
zFS+mvbm*}t`n*(78}LU!9}F<+`r(J1ygw22)Vz5^=<`a}fI)|z<7Cjc_3MYxvk5}F
z$X$9-N^1DI6GcNm0(xgW+o*Es1cxPEI<rDA6`_xLO<T}Oy~m;hzHcQMW1tr@&SFqy
z>4Z?U()M2HTg}}tddbx{L6wmkV$n+5dky%lm(DQykk_=;MeZULUF>XD8h$NVIs&_u
ztO32sksDDa<I;iFH*XOAZY68oI(L!E25q6u^`oHox%x(lp8aH2w`_C$Ao{$LH6y9K
zdC~f!)i>1o=8b}$cZ-;-jJqhYt!_DSZ(c_4a^aN{y^BSqzBNi62Yt+iS30{s258OG
zChpBk=yxkwD<gL?V(W}O1N7FUnO?O33IVhpxpzhH$3p*h>$?p{iznUH^@pD>`{nld
zi}U{LAJ3N;%XNS7<!;lL2VH*vZ~Pzb1l*}O$MD5j|Mk&gf53zNncn@z{Q3IRYXAMw
z_nXA=a`SfIpStw+Y%X7KyY*>ze!hEJ>EmjBcG~q_I&ZgsyAqZ6#~pq9vVU>8x$&BO
zdv$fbI_diK)30BQ>vMl{vh>||FIVTM*FX2y^ggCTZ#<m0Tb_3RNtevdf}5W|-EFl_
zo4vf>Z@1z4(SCIPqvz?SkAGR7FT3qBamb(EKDrzCb@ZfLpFRHJ_{X0zo86!L?LVit
z_@|c_zc16B0el6p|Nm%l<BR>1-#w<|2RqcOb$SlpCzQ+059w+Ao-Td-;D5uw#wf&q
F0RUTrLE8WT

literal 4002
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
ISj2z<03azh%K!iX

diff --git a/rowers/utils.py b/rowers/utils.py
index 9ec563ad..a77e3fd8 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -721,6 +721,8 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
             else:
                 velomid = avgspeed
 
+            distance = velomid*seconds
+
             veloratio = (velomid/ftv)**(3.0)
             rscoreperhour = 100.*veloratio
             rscore = rscoreperhour*seconds/3600.
@@ -744,7 +746,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
                 avgpower = targetpower
             if valuelow != 0 and valuehigh != 0:  # pragma: no cover
                 avgpower = (valuelow+valuehigh)/2.
-                avgspeed = ftv*(avgspeed/ftv)**(1./3.)
+                avgspeed = ftv*(avgpower/ftp)**(1./3.)
                 distance = avgspeed*seconds
 
             rscore = 100.*(avgpower/ftp)*seconds/3600.
@@ -760,6 +762,9 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
                 avgspm = (valuelow+valuehigh)/2.
                 avgpower = ftp*avgspm/ftspm
 
+            avgspeed = ftv*(avgpower/ftp)**(1./3.)
+            distance = avgspeed*seconds
+
             rscore = 100*(avgpower/ftp)*seconds/3600.
 
         return seconds, distance, rscore
@@ -784,6 +789,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
             veloratio = (velomid/ftv)**(3.0)
             rscoreperhour = 100.*veloratio
             rscore = rscoreperhour*seconds/3600.
+            seconds = distance/velomid
 
         if targettype == 'Power':  # pragma: no cover
             value = step.get('targetValue', 0)
@@ -802,7 +808,7 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
                 avgpower = targetpower
             if valuelow != 0 and valuehigh != 0:
                 avgpower = (valuelow+valuehigh)/2.
-                avgspeed = ftv*(avgspeed/ftv)**(1./3.)
+                avgspeed = ftv*(avgpower/ftp)**(1./3.)
                 seconds = distance/avgspeed
 
             rscore = 100.*(avgpower/ftp)*seconds/3600.
@@ -819,6 +825,8 @@ def step_to_time_dist(step, avgspeed=3.2, ftp=200, ftspm=25, ftv=3.7, powerzones
                 avgpower = ftp*avgspm/ftspm
 
             rscore = 100*(avgpower/ftp)*seconds/3600.
+            avgspeed = ftv*(avgpower/ftp)**(1./3.)
+            seconds = distance/avgspeed
 
         return seconds, distance, rscore
     elif durationtype in ['PowerLessThan', 'PowerGreaterThan', 'HrLessThan', 'HrGreaterThan']:  # pragma: no cover
@@ -917,6 +925,7 @@ def ps_dict_order(d, short=False, rower=None, html=True):
 
     sdict2 = collections.OrderedDict(reversed(list(sdict.items())))
 
+
     for step in steps:
         sstring, type, stepID, repeatID, repeatValue = step_to_string(
             step, short=short)
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index e92669e1..bb0248a7 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -2623,6 +2623,8 @@ def rower_view_instantplan(request, id='', userid=0):
             nextday['week'] = (divmod(i, 7)[0])+1
 
             trainingdays2.append(nextday)
+            
+            workouts = nextday['workouts']
             try:
                 nextday = trainingdays.pop(0)
             except IndexError: