From 7d0ff997c19c478a17fcffd5e4087ce60ae65cd4 Mon Sep 17 00:00:00 2001
From: Paul Trowbridge <fleetside72@hotmail.com>
Date: Thu, 21 Mar 2019 17:43:15 -0400
Subject: [PATCH] hide when loading, reset adjust boxes, allow backspace to
 clear value

---
 fpvt.frm |  48 +++++++++++++++++++++++++++++++++++-------------
 fpvt.frx | Bin 19992 -> 19992 bytes
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/fpvt.frm b/fpvt.frm
index 6fb4aa8..cbb5da4 100644
--- a/fpvt.frm
+++ b/fpvt.frm
@@ -4,7 +4,7 @@ Begin {C62A69F0-16DC-11CE-9E98-00AA00574A4F} fpvt
    ClientHeight    =   7260
    ClientLeft      =   120
    ClientTop       =   465
-   ClientWidth     =   17475
+   ClientWidth     =   7215
    OleObjectBlob   =   "fpvt.frx":0000
    StartUpPosition =   1  'CenterOwner
 End
@@ -65,7 +65,13 @@ End Sub
 
 Private Sub butAdjust_Click()
     
-    Call handler.request_adjust(JsonConverter.ConvertToJson(adjust))
+    Dim fail As Boolean
+    
+    Call handler.request_adjust(JsonConverter.ConvertToJson(adjust), fail)
+    If fail Then
+        MsgBox ("adjustment was not made due to error")
+        Exit Sub
+    End If
     
     Me.Hide
     
@@ -291,6 +297,8 @@ Private Sub UserForm_Activate()
     Dim j As Long
     Dim k As Long
     Dim ok As Boolean
+    
+    Me.mp.Visible = False
 
     Set sp = handler.scenario_package("{""scenario"":" & scenario & "}", ok)
     
@@ -307,6 +315,9 @@ Private Sub UserForm_Activate()
     pVal = 0
     bVol = 0
     bVal = 0
+    aVol = 0
+    aVal = 0
+    aPrc = 0
     
     For i = 1 To sp("package")("totals").Count
         Select Case sp("package")("totals")(i)("order_season")
@@ -413,6 +424,9 @@ Private Sub UserForm_Activate()
     Call handler.month_tosheet(month, basket)
     Application.StatusBar = False
     
+    Me.mp.Visible = True
+    
+    
 End Sub
 
 Sub crunch_array()
@@ -518,20 +532,20 @@ Sub load_mbox_ann()
 
     load_tb = True
 
-    tbBaseVol = Format(bVol, "#,###")
-    tbBaseVal = Format(bVal, "#,###")
+    tbBaseVol = Format(bVol, "#,##0")
+    tbBaseVal = Format(bVal, "#,##0")
     tbBasePrice = Format(bPrc, "0.000")
     
-    tbPadjVol = Format(pVol, "#,###")
-    tbPadjVal = Format(pVal, "#,###")
+    tbPadjVol = Format(pVol, "#,##0")
+    tbPadjVal = Format(pVal, "#,##0")
     tbPadjPrice = Format(pPrc, "0.000")
     
-    tbFcVol = Format(fVol, "#,###")
-    tbFcVal = Format(fVal, "#,###")
-    If Not set_Price Then tbFcPrice = Format(fPrc, "0.###")
+    tbFcVol = Format(fVol, "#,##0")
+    tbFcVal = Format(fVal, "#,##0")
+    If Not set_Price Then tbFcPrice = Format(fPrc, "0.000")
     
-    tbAdjVol = Format(aVol, "#,###")
-    tbAdjVal = Format(aVal, "#,###")
+    tbAdjVol = Format(aVol, "#,##0")
+    tbAdjVal = Format(aVal, "#,##0")
     tbAdjPrice = Format(aPrc, "0.000")
     
     load_tb = False
@@ -579,7 +593,11 @@ Sub calc_val()
         
         '---------if volume adjustment method is selected, scale the volume up----------------------------------
         If opPlugVol Then
-            pchange = fVal / (pVal + bVal)
+            If (pVal + bVal) = 0 Then
+                pchange = 0
+            Else
+                pchange = fVal / (pVal + bVal)
+            End If
             fVol = (pVol + bVol) * pchange
         Else
             fVol = pVol + bVol
@@ -596,7 +614,7 @@ Sub calc_val()
         aPrc = 0
         
     End If
-    tbFcVal = Format(tbFcVal, "#,###")
+    tbFcVal = Format(co_num(tbFcVal, 0), "#,##0")
     
     Me.load_mbox_ann
     
@@ -859,4 +877,8 @@ Function iter_def(ByVal iter As String) As String
 
 End Function
 
+Sub new_part()
+
+End Sub
+
 
diff --git a/fpvt.frx b/fpvt.frx
index bdf022a29cf6eb5f1053cd722f586ac731a739b5..a6bc2d7959871431a5db5ebd58afefe9185da95d 100644
GIT binary patch
delta 980
zcmZ8gUr19?7{BLiOkJ_*ptQ_+=lrwv&wE9;>(b4cOuK3c<sw4yI+qHUO_oN9rHK!9
z39`P2B+TbXlH!7x6h%;o;X~@ndZ@h=lrP~^P(k1BX2tHq_kH(w&Ue1w?{_#evt(wL
zSlSx18RjJO_bV=XYH6W_f%9~Z_J`poog|EUO}DJ4i@fT|7WIZ#U)ProCsbv3jF{Na
zd#pD}8Z(+=x(p1IyqGDqyt56AmP|-hEQ|W;6^>ziEW;QWX2Ktdj7ajQwJfaLqmkhO
z`O2CZ>yB`wZ!pr&9v_e*{o#wVFq}U|S2%S$U!j?El>M1=z*v|GsY>DYKOs+EC&htM
z6f>pDO_GL;)=WrMtO-J824uFJ2r95aLThB$vb`iS%$K;eXvdgkpCW5;%Wg$q=j|1U
zY}hNPB&)yd<9Z!>4?g!kxaW8Wk4hY%I0fPYUcVRO&V1U9(wqrBc5WQ~qU-hd!34F!
zec=pT!g|?jCK9ZA-55V`r*i^V9|R?NBuwC=7=ST82Q6bdVuPVDTh0cf@(d(I8+5gn
zLY$8xrxR6kBm_Nmd(_`mmx&JB;d^}*al=-n9iy2m#xXt(AL4kpE;?bAGh=q(Aq5bx
z3E?62t`elz<2p;Cu;iLTc`q8`gim*~giBYYNIMt*l4tX9s;L`B{5B%&?1Q(pCWFRx
zN71*+QgrFA=ZNMJ=jk*e!PE``ZhLOv)LfTMtvyywG!^4`3yHc5g!T$B;q`#%6_O79
zN4qS!bVtvt=X@?g3^3jBS;q{n1IKx3GSzyiG=zVwTF}@@;c=567Mgs>vn*}3D2~Db
zPoCxo=jlQQroc_~VA^McXMtU00Nw;*hziX?iuXF*d@z}wH!omP<rW-TjruEK5~-!>
tr7n<4HQEB@52e)dZ3UzFHuJENlX}CMm#B8NiUgnL!?t#!HT-C2{{SMmXoCO%

delta 960
zcmZ9KUr19?9LLW&oBx*HEul0ey>2mGRJ&^4P18-wIhh(lX=w>gy*cB$YgbJJQIUum
zQPS@r5%Hmih>R!>go+jjz0^yj59vetQZE^VPeB%)yUi)yhx7aKy_etj^F6;iF@-0l
zaBA(@M1;<x*i-0vomx$>2v^872`KP~jA4Zi>*n<&Fi1-hefs#;g62hWoraQC%zgTN
zne{7JSZvZX1E=a@8miVb2pv?pNV|efN?0<as$8Vqk!UFOjsCQ003kPzP&`7T6~SP?
zU!Gn{V11nu><h@ZmW-^gmx3K#!A|~Mz#r_CdJ*)c4H44--AW6Qn9q)N#;$c#GGy+T
zXee`QH^?tO0)15FBJB!}N`|amDKd<PvNkXY$RP7pEK=YbF)4JwkDPbVX3K*$yCI>X
z<9dH@pA%-xHb}ONU={9LvT#1kSaLCfWlJtWh;Ca(^g0<Ka668`<Ghc=FT)G76+$*A
zye&$DRa+W)dXsM1HuPA5<x}5v(%cCcB^la>CYOkdz$j#sHVJwv+hE>h!~{OL9PC^Z
zF6jJhi(h=TFqEIfss8SIwX0p?t$d>*!@AE5Ej7nrHD7_m+7xIgc!c|*we%4ETQG>j
zE`pGSWiYxNzzNw=r7T=~g#4J#WYH5?a3_IB%+Lmim)JQg-ewWY9JBD#S*~NQVY)T@
zMGaICB12eZuX7F;Aw<$q9{UaBv>j`Veim-iZiWZNTzsQn?w1HOdm?dOd0L1c!NZcf
zcnM5m4lO=o#q4TYOGhxG8>QDU47*BU%;nuf=!SBAI&E@`m|=~Ve}j{P1d|n+y0{yN
z@$fYLYy;6)p}VqzJnw_O0e75*l7=J(83rW4Ro!C%<L(@ot2)4@zOPalh11(eBn8I3
z$F;KHeM#CSDp!kGTi2%D%D9{{wyW?@uqUw{MI(Oo)u#lMeM_P(H9nS)KC7+6y6ro;
I@Vk!x57VhlMgRZ+