From 501fa5f4e6b8e65c8c48dd13425413cf4111db56 Mon Sep 17 00:00:00 2001
From: pt <fleetside72@hotmail.com>
Date: Tue, 18 Feb 2020 02:07:38 -0500
Subject: [PATCH] monthly comments and tags

---
 changes.frm |   2 -
 changes.frx | Bin 3096 -> 3096 bytes
 fpvt.frm    | 111 ++++++++++++++++++++++++++++++++++++++++++++++++----
 fpvt.frx    | Bin 20504 -> 21016 bytes
 months.cls  |  50 ++++++++++++++++++++++-
 5 files changed, 152 insertions(+), 11 deletions(-)

diff --git a/changes.frm b/changes.frm
index 7ff6d61..130229f 100644
--- a/changes.frm
+++ b/changes.frm
@@ -39,8 +39,6 @@ Private Sub cbUndo_Click()
     
     Sheets("Orders").PivotTables("PivotTable1").PivotCache.Refresh
     
-    Me.Hide
-    
 
 End Sub
 
diff --git a/changes.frx b/changes.frx
index 47976450b69cc50f66b75a482df6ed5404a46f67..4b8b8ae7ee0060d0386d02e2e67bd98817d583ad 100644
GIT binary patch
delta 26
icmbOsF+*ZQ3kzGovJLE7&o+0lykKVR-dxPFlo<eryb0<6

delta 26
icmbOsF+*ZQ3k%zUtSrIS$D6xYUNAE<Y%b<l$_xOBX9=$W

diff --git a/fpvt.frm b/fpvt.frm
index 448c0b0..93b533e 100644
--- a/fpvt.frm
+++ b/fpvt.frm
@@ -115,12 +115,26 @@ End Sub
 
 Private Sub cbGoSheet_Click()
 
+    Worksheets("month").tbMCOM.text = ""
+    Worksheets("month").sbMPV.value = 0
+    Worksheets("month").sbMPP.value = 0
+    
     Me.Hide
     Worksheets("month").Visible = xlSheetVisible
     Sheets("month").Select
 
 End Sub
 
+Private Sub cbTAG_Change()
+    
+        
+    If tbAPI.text = "" Then tbAPI.text = "{}"
+    Set adjust = JsonConverter.ParseJson(tbAPI.text)
+    adjust("tag") = cbTAG.value
+    tbAPI.text = JsonConverter.ConvertToJson(adjust)
+    
+End Sub
+
 Private Sub Label64_Click()
 
 End Sub
@@ -180,6 +194,13 @@ Private Sub opEditPrice_Click()
     tbFcVol.Enabled = True
     tbFcVol.BackColor = &H80000018
     
+    sbpv.Enabled = True
+    sbpp.Enabled = True
+    sbpd.Enabled = False
+    tbpv.Enabled = True
+    tbpp.Enabled = True
+    tbpd.Enabled = False
+    
 End Sub
 
 Private Sub opEditSales_Click()
@@ -196,6 +217,13 @@ Private Sub opEditSales_Click()
     tbFcVol.Enabled = False
     tbFcVol.BackColor = &H80000005
     
+    sbpv.Enabled = False
+    sbpp.Enabled = False
+    sbpd.Enabled = True
+    tbpv.Enabled = False
+    tbpp.Enabled = False
+    tbpd.Enabled = True
+    
 End Sub
 
 
@@ -260,6 +288,24 @@ Private Sub opPlugVol_Click()
     calc_val
 End Sub
 
+Private Sub sbpd_Change()
+
+    tbpd.value = sbpd.value
+
+End Sub
+
+Private Sub sbpp_Change()
+    
+    tbpp.value = sbpp.value
+    
+End Sub
+
+Private Sub sbpv_Change()
+
+    tbpv.value = sbpv.value
+
+End Sub
+
 Private Sub tbCOM_Change()
     
     If tbAPI.text = "" Then tbAPI.text = "{}"
@@ -277,8 +323,10 @@ Private Sub tbFcPrice_Change()
 End Sub
 
 Private Sub tbFcVal_Change()
+
     If load_tb Then Exit Sub
     If opEditSales Then calc_val
+    
 End Sub
 
 Private Sub tbFcVol_Change()
@@ -297,25 +345,63 @@ Private Sub opmVol_Click()
 End Sub
 
 Private Sub tbmfPrice_Change()
+
     If mline = 0 Then Exit Sub
     If clear_lb Or load_tb Then Exit Sub
     set_Price = True
     If opEditPriceM Then calc_mprice
     set_Price = False
+    
 End Sub
 
 
 
 Private Sub tbMFVal_Change()
+
     If mline = 0 Then Exit Sub
     If clear_lb Or load_tb Then Exit Sub
     If opEditSalesM Then calc_mval
+    
 End Sub
 
 Private Sub tbmfVol_Change()
+
     If mline = 0 Then Exit Sub
     If clear_lb Or load_tb Then Exit Sub
     If opEditPriceM Then calc_mprice
+    
+End Sub
+
+Private Sub tbpd_Change()
+    
+    If load_tb Then Exit Sub
+    If Not VBA.IsNumeric(tbpd.value) Then
+        tbpd = "0"
+    End If
+    tbFcVal = (bVal + pVal) * (1 + tbpd.value / 100)
+    
+End Sub
+
+Private Sub tbpp_Change()
+    
+    If load_tb Then Exit Sub
+    If Not VBA.IsNumeric(tbpd.value) Then
+        tbpd = "0"
+    End If
+    tbFcPrice = (bPrc + pPrc) * (1 + tbpp.value / 100)
+    Me.load_mbox_ann
+
+End Sub
+
+Private Sub tbpv_Change()
+
+    If load_tb Then Exit Sub
+    If Not VBA.IsNumeric(tbpv.value) Then
+        tbpd = "0"
+    End If
+    tbFcVol = (bVol + pVol) * (1 + tbpv.value / 100)
+    
+
 End Sub
 
 Private Sub UserForm_Activate()
@@ -324,6 +410,7 @@ Private Sub UserForm_Activate()
     Dim j As Long
     Dim k As Long
     Dim ok As Boolean
+    Dim tags() As Variant
     
     Me.Caption = "Forecast Adjust " & Worksheets("config").Cells(8, 2)
     Me.mp.Visible = False
@@ -472,6 +559,14 @@ Private Sub UserForm_Activate()
         basket(i, 3) = sp("package")("basket")(i)("mix")
     Next i
     
+    If Not IsNull(sp("package")("tags")) Then
+        ReDim tags(sp("package")("tags").Count - 1, 0)
+        For i = 1 To sp("package")("tags").Count
+            tags(i - 1, 0) = sp("package")("tags")(i)
+        Next i
+        cbTAG.list = tags
+    End If
+    
     Call handler.month_tosheet(month, basket)
     Application.StatusBar = False
     
@@ -561,19 +656,19 @@ Sub load_mbox()
 
     tbMBaseVol = Format(bVolm, "#,###")
     tbMBaseVal = Format(bValm, "#,###")
-    tbMBasePrice = Format(bPrcm, "0.000")
+    tbMBasePrice = Format(bPrcm, "0.00000")
     
     tbMPAVol = Format(pVolm, "#,###")
     tbmPAVal = Format(pValm, "#,###")
-    tbMPAPrice = Format(pPrcm, "0.000")
+    tbMPAPrice = Format(pPrcm, "0.00000")
     
     tbMFVol = Format(fVolm, "#,###")
     tbMFVal = Format(fValm, "#,###")
-    If Not set_Price Then tbMFPrice = Format(fPrcm, "0.###")
+    If Not set_Price Then tbMFPrice = Format(fPrcm, "0.#####")
     
     tbMAVol = Format(aVolm, "#,###")
     tbMAVal = Format(aValm, "#,###")
-    tbMAPrice = Format(aPrcm, "0.000")
+    tbMAPrice = Format(aPrcm, "0.00000")
     
     load_tb = False
 
@@ -585,19 +680,19 @@ Sub load_mbox_ann()
 
     tbBaseVol = Format(bVol, "#,##0")
     tbBaseVal = Format(bVal, "#,##0")
-    tbBasePrice = Format(bPrc, "0.000")
+    tbBasePrice = Format(bPrc, "0.00000")
     
     tbPadjVol = Format(pVol, "#,##0")
     tbPadjVal = Format(pVal, "#,##0")
-    tbPadjPrice = Format(pPrc, "0.000")
+    tbPadjPrice = Format(pPrc, "0.00000")
     
     tbFcVol = Format(fVol, "#,##0")
     tbFcVal = Format(fVal, "#,##0")
-    If Not set_Price Then tbFcPrice = Format(fPrc, "0.000")
+    If Not set_Price Then tbFcPrice = Format(fPrc, "0.00000")
     
     tbAdjVol = Format(aVol, "#,##0")
     tbAdjVal = Format(aVal, "#,##0")
-    tbAdjPrice = Format(aPrc, "0.000")
+    tbAdjPrice = Format(aPrc, "0.00000")
     
     load_tb = False
 
diff --git a/fpvt.frx b/fpvt.frx
index 603b40f2047a56b7838d78347e66754eeac09e89..299b0761ef56d34a5017418a70ae9d022b269295 100644
GIT binary patch
delta 2388
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
M$m2bdij=4LKSCR7?*IS*

delta 1593
zcmZWq{clrM7(VB=E9+fXw>i23gWYy)wA<L)u56`jUDv_f$aD-0Ofl+Rdu5Zm7Dgvu
z(KRZFMWf9V4O4!Y!AN5G*tmorOho<w5fU|-i6$c?enLVd1n~#!drOB&ZStOT`@Zja
z-gBP&ocEsil%JU4rh!N?V_W7-6@uV5A#SK{kyR!%F&AU3nz2-OEGEfPG%-G|#FJ7Y
zE+t15DLN|0cPaa(mNIr4j^0`n8-s$ZVxv*QaZ_m~wWfrYr#KC7^QUpjxQ{ESDr(>i
zk)kONW4FwV)%Yk(b?#Bx63X5rFs8c($cougHXx5EYFmI^5wXb>!o5f>!lDUwM+(EG
z{_=ma*{lwr|HhbywIU;KFcdS6oub29_Tqwg<mUJM;f!>}>s-^`6_4{}%-F>GER~i%
zDrXEcR!XIHq+-om{0oQOHif+<yOAn+?vdFn@ulJ3n>j!Ol?$)ci!$~SmF&X2CBUmt
zUV6Cb6#0zEl<r=;Sbp~B8@W}v^!%W+qHkU|k)E?~TYI>Gachru(Hi5Klu@&nDZDg)
zgohYNmrqz1;qorAqR^$KD=u(;M(eD6R^VpL*p}mhZNVC<)(L(x5l@b)2dlN2svm_y
ztn~6iEQl)#U0Qm@-ADVH`AR<<(klzIAg(HOY3WrTa&wOID~w%*TXOOQ2Baf`za8I7
z_jU1n?dT$(#ksObX6!qLY+xB?HkV`Ac}WkK)wb~fo~Rw;e`2n7J#WV!wQDG#Rj&Ta
zU^+=ee!x-Ta*@V1xEcv*7mfP?*In~yV!NzPDhk7U?i$!y>+Od~^yMS~4{2=6#8_03
z>ZR=owHfcbSK+eH3VXu=ehitq!<waWt>H0BqwwUoqOw=^sFS$kc41GmLtI?0?8jh-
z6JIt*%{{uV=#bmtZW*J^pyhKRs-Vl$M1NFI;}Z3xmob#!S}2Hl&nFn_kTC6Chi`%s
z&b4(JbbOD`%Y8_P+XX`Y*tb=b^JkD3&(LCsjU}<*Zs6<S73(qGn&3&z>~9iqJ6MO0
zy#7T%oDDjNxobWBbO~>CxzO2X$8`Hq9)%Rx!4ukn!1J7vU-<vRwlL1N)!|UskE6cF
z@l1OiE^qKy7s+4+WQ-<qT(+(!GLG?PTyJ;aK}QLXpr~`Nfh8CYc77(%<OuEHOgk9r
z7le@jPWtNcd-zuaH5LpFR^qqr2%kh#<PAMI7ipx;{}j0@v<7g->$J57m|)Mfry|mH
zuAoezcW96HjjB<<RXDb>!=XQ%B~_dwJ5M%CHb-`WOpjfJW7GXis>7)0%d2}sT*l7c
zDIvyiCm704JcjeZ*NB*I-Qn>$w9dW>PU4#FKTT{7Z*DM?tp2WI?65#Dw4XYZ5%Zfb
zAwD2tzN=YCs0fFH5W@jtQO&t$2b$@fWyD~m(M6r8!qS~rjDcmdmAL&>z(Ti`dGtQ<
z79WRqu!fW~G}xfuf>#H(atYT5-&~@8;mlVJ;fJ9zLx7^UhMdke#)Q>5e#(iTZHlTy
zlS)k57FFW%#8_hJ!7x0+h;5Y89@1!{wC>o;llzi{upl^X`Ul{@P>&psDrzp|H=64i
F`xm*^3o!ry

diff --git a/months.cls b/months.cls
index b5f6858..2688624 100644
--- a/months.cls
+++ b/months.cls
@@ -29,6 +29,53 @@ Private showbasket As Boolean
 Private np As Object 'json dedicated to new part scenario
 Private b() As Variant 'holds basket
 
+Private Sub SpinButton1_Change()
+    
+End Sub
+
+Private Sub ComboBox1_Change()
+
+End Sub
+
+Private Sub sbMPP_Change()
+    Dim m As Worksheet
+    Dim i As Long
+    
+    Application.ScreenUpdating = False
+    
+    Set m = Sheets("month")
+    m.Cells(19, 11) = sbMPP.value / 100
+    For i = 6 To 17
+        m.Cells(i, 11) = (m.Cells(i, 9)) * m.Cells(19, 11)
+    Next i
+    
+    Application.ScreenUpdating = True
+End Sub
+
+
+Private Sub sbMPV_Change()
+    Dim m As Worksheet
+    Dim i As Long
+    
+    Application.ScreenUpdating = False
+    
+    Set m = Sheets("month")
+    m.Cells(19, 5) = sbMPV.value / 100
+    For i = 6 To 17
+        If m.Cells(i, 5) <> "" Then
+            m.Cells(i, 5) = (m.Cells(i, 3)) * m.Cells(19, 5)
+        End If
+    Next i
+    
+    Application.ScreenUpdating = True
+End Sub
+
+
+
+Private Sub tbMCOM_Change()
+
+End Sub
+
 Private Sub Worksheet_Change(ByVal target As Range)
 
     If Not dumping Then
@@ -513,7 +560,8 @@ Sub build_json()
                         adjust(pos)("type") = "addmonth_vp"
                     Else
                         'if the target price is the same as average and a month is being added
-                        adjust(pos)("type") = "addmonth_v"
+                        '--ignore above comment and always use add month_vp
+                        adjust(pos)("type") = "addmonth_vp"
                     End If
                     adjust(pos)("month") = Worksheets("month").Cells(5 + pos, 1)
                     adjust(pos)("qty") = units(pos, 4)