From 6ad0c69c33f5d516742c225dd5b9d7139a39bc1d Mon Sep 17 00:00:00 2001 From: Trowbridge Date: Tue, 5 Mar 2019 17:44:02 -0500 Subject: [PATCH] update monthly button controls --- fpvt.frm | 86 ++++++++++++++++++++++++++++++++++++------------------- fpvt.frx | Bin 25112 -> 25112 bytes 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/fpvt.frm b/fpvt.frm index 1320359..1592a34 100644 --- a/fpvt.frm +++ b/fpvt.frm @@ -202,6 +202,29 @@ Private Sub tbFcVol_Change() If opEditVol Then calc_vol End Sub +'--------------------------------monthly buttons-------------------------------------- + +Private Sub opmPrice_Click() + calc_mval +End Sub + +Private Sub opmVol_Click() + calc_mval +End Sub + +Private Sub tbmfPrice_Change() + If opEditPriceM Then calc_mprice +End Sub + +Private Sub tbmfVal_Change() + If opEditSalesM Then calc_mval + tbMFVal.value = Format(CDbl(tbMFVal.value), "#,###") +End Sub + +Private Sub tbmfVol_Change() + If opEditVolM Then calc_mvol +End Sub + Private Sub UserForm_Activate() Dim sp As Object @@ -224,6 +247,8 @@ Private Sub UserForm_Activate() '---show existing adjustment if there is one---- fpvt.mod_adjust = False + fpvt.tbPadjVol.Text = 0 + fpvt.tbPadjVal.Text = 0 For i = 1 To sp("package")("totals").Count Select Case sp("package")("totals")(i)("order_season") @@ -330,6 +355,7 @@ Sub calc_val() tbAdjPrice = 0 'tbAdjPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value) - ((tbBaseVal + tbPadjVal) / (tbBaseVol + tbPadjVol)), "#.000") End If + tbFcVal = Format(CDbl(tbFcVal), "#,##0") 'build json Set adjust = JsonConverter.ParseJson("{""scneario"":" & scenario & "}") @@ -391,40 +417,40 @@ Sub calc_mval() Dim pchange As Double - If IsNumeric(tbFcVal.value) Then + If IsNumeric(tbMFVal.value) Then 'calculate percent change - pchange = CDbl(tbFcVal.value) / (CDbl(tbPadjVal.value) + CDbl(tbBaseVal.value)) + pchange = CDbl(tbMFVal.value) / (CDbl(tbmPAVal.value) + CDbl(tbMBaseVal.value)) 'plug the adjustment required - tbAdjVal = Format(CDbl(tbFcVal.value) - CDbl(tbBaseVal.value) - CDbl(tbPadjVal.value), "#,###") + tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###") '---------if volume adjustment method is selected, scale the volume up---------------------------------- - If opPlugVol Then - tbFcVol = Format((CDbl(tbPadjVol.value) + CDbl(tbBaseVol.value)) * pchange, "#,###") + If opmvol Then + tbMFVol = Format((CDbl(tbMPAVol.value) + CDbl(tbMBaseVol.value)) * pchange, "#,###") Else - tbFcVol = Format((CDbl(tbPadjVol.value) + CDbl(tbBaseVol.value)), "#,###") + tbMFVol = Format((CDbl(tbMPAVol.value) + CDbl(tbMBaseVol.value)), "#,###") End If - tbFcPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value), "#.000") - tbAdjVol = Format(tbFcVol - (CDbl(tbBaseVol) + CDbl(tbPadjVol)), "#,###") - tbAdjPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value) - ((CDbl(tbBaseVal.value) + CDbl(tbPadjVal.value)) / (CDbl(tbBaseVol.value) + CDbl(tbPadjVol.value))), "#.000") + tbMFPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value), "#.000") + tbMAVol = Format(tbMFVol - (CDbl(tbMBaseVol) + CDbl(tbMPAVol)), "#,###") + tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((CDbl(tbMBaseVal.value) + CDbl(tbmPAVal.value)) / (CDbl(tbMBaseVol.value) + CDbl(tbMPAVol.value))), "#.000") Else - 'tbFcVal = Format(CDbl(tbPadjVal.value) + CDbl(tbBaseVal.value), "#,###") - tbAdjVol = Format((CDbl(tbFcVol.value) - CDbl(tbBaseVol.value) - CDbl(tbPadjVol.value)), "#,###") - tbAdjPrice = 0 - 'tbAdjPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value) - ((tbBaseVal + tbPadjVal) / (tbBaseVol + tbPadjVol)), "#.000") + 'tbMFVal = Format(CDbl(tbMPAVal.value) + CDbl(tbMBaseVal.value), "#,###") + tbMAVol = Format((CDbl(tbMFVol.value) - CDbl(tbMBaseVol.value) - CDbl(tbMPAVol.value)), "#,###") + tbMAPrice = 0 + 'tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((tbMBaseVal + tbMPAVal) / (tbMBaseVol + tbMPAVol)), "#.000") End If End Sub Sub calc_mprice() - If IsNumeric(tbFcPrice.value) And tbFcPrice.value <> 0 Then - tbFcVal = Format(CDbl(tbFcPrice.value) * CDbl(tbFcVol.value), "#,###") - tbAdjVal = Format(CDbl(tbFcVal.value) - CDbl(tbBaseVal.value) - CDbl(tbPadjVal.value), "#,###") - tbAdjPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value) - ((CDbl(tbBaseVal.value) + CDbl(tbPadjVal.value)) / (CDbl(tbBaseVol.value) + CDbl(tbPadjVol.value))), "#.000") + If IsNumeric(tbMFPrice.value) And tbMFPrice.value <> 0 Then + tbMFVal = Format(CDbl(tbMFPrice.value) * CDbl(tbMFVol.value), "#,###") + tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###") + tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((CDbl(tbMBaseVal.value) + CDbl(tbmPAVal.value)) / (CDbl(tbMBaseVol.value) + CDbl(tbMPAVol.value))), "#.000") Else - tbFcVal = 0 - tbAdjVal = Format(CDbl(tbFcVal.value) - CDbl(tbBaseVal.value) - CDbl(tbPadjVal.value), "#,###") + tbMFVal = 0 + tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###") End If End Sub @@ -433,23 +459,23 @@ Sub calc_mvol() Dim pchange As Double - If IsNumeric(tbFcVol.value) And tbFcVol <> 0 Then + If IsNumeric(tbMFVol.value) And tbMFVol <> 0 Then 'price should already have been re-calculated to base + prior at this point - tbFcVal = Format(CDbl(tbFcPrice.value) * CDbl(tbFcVol.value)) + tbMFVal = Format(CDbl(tbMFPrice.value) * CDbl(tbMFVol.value)) 'calculate percent change - 'pchange = CDbl(tbFcVal.value) / (CDbl(tbPadjVal.value) + CDbl(tbBaseVal.value)) + 'pchange = CDbl(tbMFVal.value) / (CDbl(tbMPAVal.value) + CDbl(tbMBaseVal.value)) 'plug the adjustment required - tbAdjVal = Format(CDbl(tbFcVal.value) - CDbl(tbBaseVal.value) - CDbl(tbPadjVal.value), "#,###") - tbAdjVol = Format(tbFcVol - (CDbl(tbBaseVol) + CDbl(tbPadjVol)), "#,###") - tbAdjPrice = Format(CDbl(tbFcVal.value) / CDbl(tbFcVol.value) - ((CDbl(tbBaseVal.value) + CDbl(tbPadjVal.value)) / (CDbl(tbBaseVol.value) + CDbl(tbPadjVol.value))), "#.000") + tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###") + tbMAVol = Format(tbMFVol - (CDbl(tbMBaseVol) + CDbl(tbMPAVol)), "#,###") + tbMAPrice = Format(CDbl(tbMFVal.value) / CDbl(tbMFVol.value) - ((CDbl(tbMBaseVal.value) + CDbl(tbmPAVal.value)) / (CDbl(tbMBaseVol.value) + CDbl(tbMPAVol.value))), "#.000") Else - tbFcVal = 0 - tbAdjVal = Format(CDbl(tbFcVal.value) - CDbl(tbBaseVal.value) - CDbl(tbPadjVal.value), "#,###") - tbAdjPrice = Format((tbBaseVal + tbPadjVal) / (tbBaseVol + tbPadjVol), "#.000") - tbAdjVol = Format(-CDbl(tbBaseVol.value) - CDbl(tbPadjVol.value), "#,###") + tbMFVal = 0 + tbMAVal = Format(CDbl(tbMFVal.value) - CDbl(tbMBaseVal.value) - CDbl(tbmPAVal.value), "#,###") + tbMAPrice = Format((tbMBaseVal + tbmPAVal) / (tbMBaseVol + tbMPAVol), "#.000") + tbMAVol = Format(-CDbl(tbMBaseVol.value) - CDbl(tbMPAVol.value), "#,###") End If - tbFcVal = Format(tbFcVal, "#,###") + tbMFVal = Format(tbMFVal, "#,###") End Sub diff --git a/fpvt.frx b/fpvt.frx index a9853bbc15bddec507df92132d42ec131cc2bc26..5b931f6cc1d588d9a999c762ae31554cd3e90d15 100644 GIT binary patch delta 1224 zcmZWnU1*zC7(VCwQYCFu*EZdnwrjJbS(Aq5r>#laG;Nw}qY;~=e{)TZ%hxWlYW_?X zrqZDoHWFB!?73M{q!$B)sSLj>y%tqgE6K7O@V&Hy_!B*+tHI^L*!d zpXYhcxpI?Vxyi4;(O9?D{`|eGa=Ed>Z$DfbTx*nm`BC`50(H>?| zcBp#_HAuM@k=1%h;0!MsjtWB~fZ=bR#YJN`LD!6Z+=Dx`GWmh=7Zv*LX4G3+dWUq3 zF`@ zvMF2|H4yh)g6==ngDNmJ)pIv>} z8C|cktYmq^YZ22nCqDJ|!|pkVeQ%JczOio+_VtLlR1w!ly7B$f^?26TEas&&{nw)_ z&_ps7H-p&rO;EkBq)<#Qf@ta&pb3sfxFzXmst&OcSi5QJ$1i#Uy^3HB*#c zSvTS1imREJ7HNN5rIy$Izj6$OO(fqbE}vL|BfJV-a9%B)%`RkC&lQrm6+D59aY^}l zKW>pj$GSPCa(LQs;dq8;<=>BoI6ewkk(mAjuezR~X_)ZYcq{cW(KtG>Ikmz|_;<>{ zi_nLjq5FF|;1iHl>r6V)KuoJh(k76^}i66o(!g3P1 zQwwUET9oo9Il_@LxjEoHg8fJXKZCmHOJX`{1NUpO5xva!pr3h-B)4XEdF7tSRb?I^ zM;GP|^oX|RPl}Pf687h<^i)g>2RPCJKm8_Q3-?1G*r?V+P{%!@wCut+Yf)P?+^oI!h| zrb0z5dsvBOHKekybO(Q5c$DKVgtIfJ)0wjiO0wz$w*O#F&Y&G2C~Zf6e?<{Zzy0Uf z;fH+xYT92>#9BJ`K)CIwDqK90GiYzbR;c9nR}|4K^DK=Q>Kb^N1M2=_DZFWUf;sV# zrIB&ipf#=RS+;b1HiPR;4JfvjSuPqmj^ht=bF>{G&mYpx@jNGG=Vqr;v*t+Z4BB-j z3|aeBBx{tpls#*Uj-5f{@fKR+$G^o7O-(Qbii;$9W-^tr70@rXxiAy0!e-kEykRvc z)wV^Qz-2jHvs(q?!(ID*W17gSxhCR#gvbZ8nYrl{mfXjf9X^MXwbS|x?j`C~$*XY( z&i6hJzpffJ&bKuz*<-{P&KZ_fY_180wGJc8;7(TqM7IwmZU+T&C*iEfW**S!RT?=n zm$KWi?6&ZeDY93OP4~Qz%7r0&S_oj#Q&9Mcrx|UoO6+T=2MPYt>qDT+qW)wK?Q1Pi&Udt{Jm~2yCm&7Nb{tb`d|t+LS;U4bFzv5U zjVSZ}pBSbS-Eah(als)n7uLEO@rt_?HBx`kM9<{F%+%=|Zc9OYCW#^?rrDr2DOx0_ zv$5GJ@)91iD?=v_GOUc3;q0kd#wkCa3NhRW)?>+AispbMOoV%|8XjX$kiB69QeaOVJFozP9>&qdpfE!_%roSANG?3?m*Km2TN0o_t0T=nQ;<9AI zcabtaoyD(_2FlPU9fd1u5YHJSnluiPXdVe)9d@G!C{2CrC1GV}0nBg2V(cBZ19RW2 ztX;XtUf!)PdM;a za8!8xa|>*V37mHqBj(oszsdppGFpV&&wWg4=7(nSx33b0;ch;qPNtb(*}=Kto5Ey@ zL+gl2IyBPCSOi0q@r_hpG@@x5%~iDXZ% F{Rg!IzqJ4W