From 3c646b3a8d7d54f12356c59f55ae8ba9af2d87f7 Mon Sep 17 00:00:00 2001
From: Paul Trowbridge <fleetside72@hotmail.com>
Date: Thu, 13 Feb 2020 02:23:13 -0500
Subject: [PATCH] add rounding, increment year, dont hardcode plan

---
 fpvt.frm    |  12 ++++++------
 fpvt.frx    | Bin 19992 -> 19992 bytes
 handler.bas |   5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fpvt.frm b/fpvt.frm
index 0ff699d..0b08c7c 100644
--- a/fpvt.frm
+++ b/fpvt.frm
@@ -345,7 +345,7 @@ Private Sub UserForm_Activate()
     
     For i = 1 To sp("package")("totals").Count
         Select Case sp("package")("totals")(i)("order_season")
-            Case 2020
+            Case 2021
                 Select Case Me.iter_def(sp("package")("totals")(i)("iter"))
                     Case "baseline"
                         bVol = bVol + sp("package")("totals")(i)("units")
@@ -657,7 +657,7 @@ Sub calc_val()
     
     'build json
     Set adjust = JsonConverter.ParseJson("{""scenario"":" & scenario & "}")
-    adjust("scenario")("version") = "b20"
+    adjust("scenario")("version") = handler.plan
     adjust("scenario")("iter") = handler.basis
     adjust("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss")
     adjust("user") = Application.UserName
@@ -709,12 +709,12 @@ Sub calc_price()
     
     'build json
     Set adjust = JsonConverter.ParseJson("{""scenario"":" & scenario & "}")
-    adjust("scenario")("version") = "b20"
+    adjust("scenario")("version") = handler.plan
     adjust("scenario")("iter") = handler.basis
     adjust("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss")
     adjust("user") = Application.UserName
     adjust("source") = "adj"
-    adjust("version") = "b20"
+    adjust("version") = handler.plan
     
     If opEditSales Then
         If opPlugVol Then
@@ -779,7 +779,7 @@ Sub calc_mval()
     'build json
     
     Set j = JsonConverter.ParseJson("{""scenario"":" & scenario & "}")
-    j("scenario")("version") = "b20"
+    j("scenario")("version") = handler.plan
     j("scenario")("iter") = handler.basis
     j("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss")
     j("user") = Application.UserName
@@ -848,7 +848,7 @@ Sub calc_mprice()
     
     'build json
     Set j = JsonConverter.ParseJson("{""scenario"":" & scenario & "}")
-    j("scenario")("version") = "b20"
+    j("scenario")("version") = handler.plan
     j("scenario")("iter") = handler.basis
     j("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss")
     j("user") = Application.UserName
diff --git a/fpvt.frx b/fpvt.frx
index d7f46560ab44b626fa05dae571282692b5f26aa3..9428be6d23807d2ada33d94f40ce634784d8f5f8 100644
GIT binary patch
delta 1491
zcmbVMT})eL82-NV9h^``<*z^o?DU7y@>6<BX=y3+IOM0cEa=j*7%x_uCR=FNpUDzj
zuv;=*CUHyl&Nw0$;JwM>@nRQC=AB$PGmT`K7iJnSj1mKPVq*0DPFo<x#Ke=Fe&2b{
z`@PTeyzkp{Z=K#-r}z5>CZ;ZeOE9;~gb3}#P6(+X<mz0uupphuC6cKu*{Oz$4lCRd
zZrBL<76Zr%4HF`fZHi|wm?2~#BB8`jGC4xvB<rOFA}of#n`};P6=R~|6>>!)7)6L4
zZ+`uS7ZhJ~Hz;I5BE+PDW%$wmgq5R7iq)0e<455~)o$Z7x#H2(ld1A6J8dc{I#yFT
z^-o3WQcaOUYi;`2Rps*Ou^+c#wRVLrK>hJw^}E>uN9aofi+ojeb$O;IAC|z4j<-tT
z^?7}HPj{b}FkM4lU*1<Rb+zGrrbAu-t;t2JV8dWkKQ&NFiTYW~mT<suz-l~Xtzfzn
zhgg|iT|Kc!4<ygNaj7J^Bd;&->A7nqOxKy$m-iJ+UG4mw(hNkU6`D}Lk%p--pMqNR
z_cRR)4jI}lJ#fqM0z@r7$cqM8v$$y(zO;1W0KtyMMm=hywOiy*L3@u-NWpnr@ae9-
zo6i>%eQog64q&!eF;NrzVz%ORec>2^-vS1;wP#R7rl@mLJL9zR<)PETNS46Q&K?YH
z9OxFa>6}~3G&k@uo1aX=eNzWK^9(_qUjpZl1a(6SoStZ;Zm0?Q*r10%pUW&{)1b)x
zy7!(I<B9ZQDuKDBNT-k{phT?jP_Aa#^dfA@J=6tzq7B;ISu}Uk9YNY{_v>^KHiFGC
zI@kiUzGk>E*n*w9Ht3<y@9%=|Je~?YCz^G2u-t_txF%${`Dzz9LyatvNOK)%FfSUR
z&6~vR%U(0j>+M61$6jvmckgwKSoS?&1%BQ?%1|uiT%)Du2|GOZ)Ce+`d-#-Q_Ll1;
zWc&&%Br-@B=Ty)pkHedRdVS)2Hjbt;DMBviFwJg@5tD~x6FdkUXIKf?3fxB0S+5C}
zMwVF?JGMW<|Mp$Mw}tCr*bMe+Zhr`JxBI~ug|EWcHjfqF9UIneUTCTn8b2gxunQiW
zYVTB8VJ*ZR{uwf{*!o#8DKX|*3d52T=Ux3;`AOq<`Om4Xr#b{y{Skh_G<VKQA^A!#
z!GJ#re~jr5>o`9Q?Xsd7<jp*4kWa!|;0A0=`jGoc$OQY7I^0!F6*%kCR2<9wWa=zJ
zo53a+oh~<X`ei<z>L=4f^xw^)MWcM?V0gGyK0LT6k$ye4XcpU*l57&n32U!#3iiZN
pcow-0lF|&zQG<ZOKZw4=>x~2Cm>I`iW~LXltj)Z}=Wu7H?{93P*!%zh

delta 1573
zcmb7ET}Yc(7(PFrwi;J!n#IJ-^ovO~iP3(>82yr%#A?+oim^i-`+=n)qhg||;J_7E
zWs}l|ZI!o!3ccvcZU@qDj9&D@U9Ic~+-NBq-A`c``{_k@H!lWz&rxe3yV(aH=X~!u
z=Y5{%eV_APy+*HIqZ@6ElS{9F#+n-3oUrGJmk?4-$nw<O{EYfyF_X>x$RN*}n4808
zcCk_?g`$H)g11r*Gkk(F_?%CzEvtr2nNZA0at;$H_}1bp9(d<q@KB7*;M64p7#gek
zf1%{wL3nboe=l^uDrg-b=PZOU3=Qpuz0^X$UHxA$#(MR63fC1CY&H1<Y2T^L_V0J0
zRI^G`Q1{HAwdq@9B0|X<<6<;ShtBfa*MHs#7Aw;`+w0EO?#}66%w#T$871?3975Hu
z@(O6K3gmiM@Li=@LR4~(N)5{#LvE}glC(A$H?5RXZhTsQhm|3g8p;sC<S2_7CC6X1
zTtZ{nMld<cVn)fiNog8J)KyB1@6;a3G6kq<`U!6MJgkSqVRu*z!|o_mp+k8V*4;te
z|Fzr6vN?F<ZpLFrJS~dY6!ZGo0)aC)G;+A&ZQ&>u&Uf44z89zlGrn%+DF3noW|>Mu
z@P#kRj&e+DF>L-$g=S%-eUO>z;Yxcm>*8>`-N(PeM8CEBaqY<Q7A2D}24%jf<2QH!
zjrzF0!TKOUm`ysn5}iFcmtQF4FiAk`lUp>sSB^!^X%&}XXDfDRIXyp}&Gn%3YZ6^x
zkMzT<9d%WhbuyD*$PsX+RB<hmDG%K4sN$J3b8x4_&oX&rd<^WtIob~wgDJcy_kyR;
zo$yi20==E}Gy>z@7MR8vH&!}B6xvR<f~vK{`&tsKFs3I&-Yq?B&Z8yv`3PM2MQ>&g
z5(r@jdpL^_OW`I;;CeWKK;MM@bOHVjzl-yw?pqwS0_qa!()w#q&|OyTiNyVC1UXjY
z1bi0qzz=<KID9fLs*D7l+ARtqg=b{#<R2j!X{$wuos#PO%_72WxEjGecmdRCHyR=x
zcEMtFi6=ZNY)8dU<5=u1mKC)SAEFKqW1<e*G5nVZn(<lYRbey!JUrBUI9ZuMY7%Ts
z>45cwQ2bBAB`yiLk`r=VOil{E-zI;RjocWB!>p#Vl?lUkqLE3}`;FaKjc9uwcsy_#
zUhZ-19M@&GgORY{BP5EJOV_xcmKZRhJ)}i)g7@GB)U%av!S<jD`%y78FFd|DG>IQu
zLodO{$vV)79lN5Zhx>$ejZcQVsNf#Zn&DDBB<#K!m%x|1!sdO}d)3GG`{9olT1}bL
zIoS;)25QR5W+G@rNmWu(n^j!latUwBn$ip3r#?V%SJDDYBUWL@4@ce>W)(f~jrQYO
RVYC&=u8)ojMvq1V{{j`xu5<tZ

diff --git a/handler.bas b/handler.bas
index 0379b97..a3837fd 100644
--- a/handler.bas
+++ b/handler.bas
@@ -11,6 +11,7 @@ Public data() As String
 Public agg() As String
 Public showprice As Boolean
 Public server As String
+Public plan As String
 Public basis() As Variant
 Public baseline() As Variant
 Public adjust() As Variant
@@ -346,6 +347,8 @@ Sub load_config()
         i = i + 1
     Loop
     ReDim Preserve handler.adjust(j - 1)
+    '---plan version--------------------------------------------------------------
+    handler.plan = Sheets("config").Cells(9, 2)
     
 End Sub
 
@@ -406,7 +409,7 @@ Sub month_tosheet(ByRef pkg() As Variant, ByRef basket() As Variant)
             If (pkg(i, 3) + pkg(i, 2)) = 0 Or pkg(i, 2) = 0 Then
                 sh.Cells(i + 1, 8) = 0
             Else
-                sh.Cells(i + 1, 8) = (pkg(i, 7) + pkg(i, 6)) / (pkg(i, 3) + pkg(i, 2)) - (pkg(i, 6) / pkg(i, 2))
+                sh.Cells(i + 1, 8) = (Round(pkg(i, 7), 10) + Round(pkg(i, 6), 10)) / (Round(pkg(i, 3), 10) + Round(pkg(i, 2), 10)) - (Round(pkg(i, 6), 10) / Round(pkg(i, 2), 10))
             End If
             
             '--current adjust--