From 678c0cafc97d073c692f5b15d29b76c6f393964d Mon Sep 17 00:00:00 2001
From: Trowbridge <ptrowbridge@HC-Companies.com>
Date: Tue, 5 Mar 2019 11:39:35 -0500
Subject: [PATCH] form updates

---
 fpvt.frm |  27 +++++++++++++++++----------
 fpvt.frx | Bin 25624 -> 25624 bytes
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/fpvt.frm b/fpvt.frm
index bee6bc9..10f3c6d 100644
--- a/fpvt.frm
+++ b/fpvt.frm
@@ -14,6 +14,7 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
 Public mod_adjust As Boolean
+Public month() As Variant
 Option Explicit
 
 
@@ -102,11 +103,11 @@ End Sub
 
 Private Sub UserForm_Activate()
     
-    Dim s_tot As Object
+    Dim sp As Object
     Dim i As Long
     Dim ok As Boolean
 
-    Set s_tot = handler.scenario_totals(handler.scenario, ok)
+    Set sp = handler.scenario_package(handler.scenario, ok)
     
     If Not ok Then
         fpvt.Hide
@@ -118,18 +119,18 @@ Private Sub UserForm_Activate()
     '---show existing adjustment if there is one----
     fpvt.mod_adjust = False
     
-    For i = 1 To s_tot("x").Count
-        Select Case s_tot("x")(i)("order_season")
+    For i = 1 To sp("package")("totals").Count
+        Select Case sp("package")("totals")(i)("order_season")
             Case 2020
-                Select Case s_tot("x")(i)("iter")
+                Select Case sp("package")("totals")(i)("iter")
                     Case "copy"
-                        fpvt.tbBaseVol.Text = Format(s_tot("x")(i)("units"), "#,###")
-                        fpvt.tbBaseVal.Text = Format(s_tot("x")(i)("value_usd"), "#,###")
-                        If s_tot("x")(i)("units") <> 0 Then fpvt.tbBasePrice.Text = Format(s_tot("x")(i)("value_usd") / s_tot("x")(i)("units"), "#.000")
+                        fpvt.tbBaseVol.Text = Format(sp("package")("totals")(i)("units"), "#,###")
+                        fpvt.tbBaseVal.Text = Format(sp("package")("totals")(i)("value_usd"), "#,###")
+                        If sp("package")("totals")(i)("units") <> 0 Then fpvt.tbBasePrice.Text = Format(sp("package")("totals")(i)("value_usd") / sp("package")("totals")(i)("units"), "#.000")
                         
                     Case "adjustment"
-                        fpvt.tbPadjVol.Text = Format(s_tot("x")(i)("units"), "#,###")
-                        fpvt.tbPadjVal.Text = Format(s_tot("x")(i)("value_usd"), "#,###")
+                        fpvt.tbPadjVol.Text = Format(sp("package")("totals")(i)("units"), "#,###")
+                        fpvt.tbPadjVal.Text = Format(sp("package")("totals")(i)("value_usd"), "#,###")
 
                 End Select
         End Select
@@ -139,6 +140,12 @@ Private Sub UserForm_Activate()
     fpvt.tbFcVal.value = Format(CDbl(fpvt.tbBaseVal.value) + CDbl(fpvt.tbPadjVal.value), "#,###")
     fpvt.tbFcPrice.value = Format(CDbl(fpvt.tbFcVal.value) / CDbl(fpvt.tbFcVol.value), "#.000")
     
+    '---------------------------------------populate monthly-------------------------------------------------------
+    
+    '--parse json into variant array for loading--
+    
+     
+     
     Application.StatusBar = False
     
 End Sub
diff --git a/fpvt.frx b/fpvt.frx
index 1ac50a2edecbe2aa3b8870916608e46bf237a96a..0bb483a1cc7240acff77f30fd7c4ed77f762f35f 100644
GIT binary patch
delta 1296
zcmZWnT})eb6u<v_fq4m^NlRglx&oz)W_U|WKcL^V8w?oTTDn?3+@&FIS!)@kf>|1;
zk!T;5k^E+|nPBuqGc;s+6SD_1HTtkDfW>Iyd@#Q3QGM`f@x^lsTeN%mpL5T-zw`0?
zotyXB&HL=m+qKo_U;EUtq!ep&tiJ4)eq#F}u`Vb4KZIgqt|B5fRYr=H5k+h+R54C@
zM;m91$8RlvuoY!ncc-Esifxsp#KRR4rFi(6nM8fXPbgMK6!C?>E4zt?XJC~PMeH!}
z%mQ;)591K)GV+-mu5^{yGRBR1UQQ!z?B*R-+#tho%2&o8tFY^;QEv2pQH>9*hXk90
zLqyW^0~{75JCiVJ?Zg9VjjbSJ(Gv!XmeZ>F#?r@R{6+5@ioV~(1o=W1Bi1P)o6h4y
z>m{PE&ZZ|8VRoA6BkEKb?wxd^cB}#0Cp{>fHKI?}@T>h;_m09}Rfo2rEZn|&yf>5)
zmb0&-+I_5SEp9WjqS>!eF1rnkm#iqc>{P4)zr+jtfCbmRo$7LuY{&b<COq`6m2tAq
zO#Ls1HTcNa!cw^F>lHrvZUq*%29JF@$~F7VSe!h9gnvVLi)C@%+l3>6KDF3*V364`
z78q(7;5fdO>)|-An&YlUmM*3iWSU{!+tIS>{BJ5Qr}O1h({usXg6-Hm(@Ay~TZ0XV
zcx%+MgkpBQC_8A<0?tLd;Rzk0Ny4EH>VF{=7bbUB@NKA9CD{<ufQ5CeA8lckf-t@6
zLi@DrQTFq2kYJKq3-JUkq!>;dXIlHyfoo{sI4P1@7(iq27)qY!h<xe5dU&f%<xZP^
z3Q#vJuR(z8-czb9%B>LxV^(Evlrgq|A6$+n)Wb95#5M1j(mLK=g`G3)bT4Z9RKQIh
zQOB>^@O{#Lu<)*n)V820*o{A@{n!c~<>wc$K0SxNnI;0zB=oA({Caki_FRjO(Jk*q
zuaG|xdsE=@9QI;U{BllRSn*6<Watj`U^o65U6ONO`g19~J5-O+gjOKIASZhHdHeni
zB(%6Ur^8M{N7wu)5oaM)dnNHwGb5D@I30K%^)nKFPTm!`?Ln*ulh_Q>prl?Y=|Ny5
zQ9jd$GhXOIB;4%BJZbf4c1zVtRpa)YmQCR6x#QG8Ju>$4Fs@F;(CYe<&!!Kq*87Bg
zYGfp8{z(pEV_3p1IZH5cenXg`s<-DKlkAsLCOk-)8kgiuG@r@HORpb|r1P)fcd7MX
D6Mwo>

delta 1288
zcmZWnT}+!*7(VCwidwR6CH4=tRSR@<G&F7L|JqXegCH=<`a?y^($+>`B`q`!xJ|RE
z)AUA39yQwq$#%14i&<t)V!Y6}X-pPm3X2!>#(1+!V-~M=rROWVm>)OiJ$cSK&w1bH
zc`o0lm+#X%AGWvEuK(n!v1WUns#@Ef-{>BsJWv<^521OeE<==RIntCPOxf|Sg08WT
zwOL9D{?PqJ3ES4+k^P5er<_XJB|})VYhO=FqwErza)c>g`A7bn(zNfH9AV0ClfXN+
z_FAY1>0Yxy2+sBH&=MxhM!`o=F&~q#&v@~B*th0~3c=-J8~tCmwJ%hYtBa*_b=`}k
z-N<3o>>jBk2fMLlzr=Zy4x_N{N6m3k;J5BNY#jSrTA9(=N5$eu38RA<u~01I>fjk#
zU<X`A1+~NK>!THx@-ZrS2_gZHuuzu@_2Gl@*9DgypN4xR?1{pG&J$Gxb1Hm(Vp$}-
z*S6qsku(S#K`Yb|En5kiD1Py41V4c~YQav(L%sMpGz@#}AifxXACJNxwO$m4tkjK_
zga+4!bhL_ZhWf?oYMC=>@N`H|>*$DBsUIs-hmnhHiq%R3>R2z1%q|H|f{EdP&Pj-1
zAQs+78zC2-3FN~@xLfCRKYx@hR2t=StEE{<v@fIYNu?4siCk6uY46hc_j9>jenjTn
zVs(9xbB-aRFyQxC82bD%gyJvKH6-HQ+`WZ(RwPw|d+~mO7gJgTn$UCgI}=v!bb_xw
zKIn1D+nux)UnQbKOEL|VBYNs#rjY?jG#_lEFCZT9an)YJL?DFBj1P^u9J?~=<ymLD
zV|4FcIB*b;LN<XnwjGMJr2Qe#hwsMSTrh{i%nTDp6=HGtEo?-Mc*vPg&dxv;v-4S8
z(oC3~_H$pjvA7lOfjfB=OVOUzi)1t`w4@$DGhh}R1n0x~*6f|BGkoStsc}BqZt5H#
zZ8CjPyz%22cGH=b0^B<m$}Cc$=-G2WdrR7$pSg?RkP2ftt@!WDizwv!IYlj@#Wjvd
zF}gRe!GoNhp2g!_RyvzH!g6nPP)wdO;gjTHJeW4YHuoA-Z(i6-!l`-Oo{qp4Q}a}L
zIc~w`+*#=3+?)J$$%n`J+xRuD!_9duox=C?1Dsb17d;)L6<o}uVDN7Vp31YFN{ZW`
zQ$Ekr`9$Hwl|q$2R2DZyQX;rne2S%#1zV-QL#MX`smAhhVfCF?la<EXJVu8907Rj)
AKmY&$