From 3932e224f0e0355610a1143182c486e38db6494a Mon Sep 17 00:00:00 2001 From: pt Date: Fri, 14 Feb 2020 02:27:01 -0500 Subject: [PATCH] lot of changes --- build.frx | Bin 3096 -> 3096 bytes changes.frm | 5 +++-- changes.frx | Bin 3096 -> 3096 bytes fpvt.frm | 55 +++++++++++++++++++++++++++++++++++----------------- fpvt.frx | Bin 19992 -> 20504 bytes handler.bas | 12 +++++++----- months.cls | 8 ++++---- openf.frx | Bin 3096 -> 3096 bytes part.frx | Bin 2584 -> 2584 bytes pivot.cls | 17 ++++++++++++---- 10 files changed, 64 insertions(+), 33 deletions(-) diff --git a/build.frx b/build.frx index 4559166ee581e4d6746265d77725c95e40d3bee8..2207528d743f87970b50c0ee4415cd9613c7cbb2 100644 GIT binary patch delta 75 zcmbOsF+*ZQ3ky5L)k-Fg$5%IZvpi>3V_;xVVR*{Oz`(}9&;XvP+EWGw6^5sb3=C`x3=Kev!2*aG7$g~zlL8Wp cO7a=50D1nCc{r^$U*bq-WX#`e#dVJn0FQqav;Y7A diff --git a/changes.frm b/changes.frm index dc539c9..685584c 100644 --- a/changes.frm +++ b/changes.frm @@ -27,7 +27,7 @@ Private Sub lbHist_Change() For i = 0 To Me.lbHist.ListCount - 1 If Me.lbHist.Selected(i) Then - Me.tbPrint.value = x(i, 4) + Me.tbPrint.value = x(i, 6) Exit Sub End If Next i @@ -42,7 +42,8 @@ Private Sub UserForm_Activate() Dim fail As Boolean - x = handler.list_changes("{""user"":""" & Application.UserName & """}", fail) + 'x = handler.list_changes("{""user"":""" & Application.UserName & """}", fail) + x = handler.list_changes("{""quota_rep_descr"":""" & Sheets("data").Cells(2, 5) & """}", fail) If fail Then Me.Hide Exit Sub diff --git a/changes.frx b/changes.frx index 82e49b9c453595c6fbe16ee31c01075df4302f35..beb8312bfa16b58aef2057d95a9976f4d89c0957 100644 GIT binary patch delta 173 zcmbOsF+*ZQ3k$CS-&Yon$5$Dd85kH2OrFS6&&kaQWCB6{<&;Vje zdo-+J0@AG-lh<)9;9z550NNq!HaU#bd9niw%jB7yGK?;hw{b@CGVw4-0u_F)XJq)# OIC&w9`DO{O1B?LXJ|~v| delta 180 zcmbOsF+*ZQ3k&at9idE*9$aB$W?*1wm^_iCp7T491p@h#4|3U0j$qxw$T69hO`Y@K z|Ns9vf#Ux*8#3Kyx5PoB#u!^kjs R7iZMw0Im~^lP_>N002|$D=Yv2 diff --git a/fpvt.frm b/fpvt.frm index 0b08c7c..3e5ac49 100644 --- a/fpvt.frm +++ b/fpvt.frm @@ -1,10 +1,10 @@ VERSION 5.00 Begin {C62A69F0-16DC-11CE-9E98-00AA00574A4F} fpvt Caption = "Forecast Adjustment" - ClientHeight = 7350 + ClientHeight = 8445.001 ClientLeft = 120 ClientTop = 465 - ClientWidth = 7110 + ClientWidth = 8820.001 OleObjectBlob = "fpvt.frx":0000 StartUpPosition = 1 'CenterOwner End @@ -67,6 +67,10 @@ Private Sub butAdjust_Click() Dim fail As Boolean + Dim com As String + + com = InputBox("Enter any comments to describe the change") + Call handler.request_adjust(JsonConverter.ConvertToJson(adjust), fail) If fail Then MsgBox ("adjustment was not made due to error") @@ -114,6 +118,10 @@ Private Sub cbGoSheet_Click() End Sub +Private Sub Label64_Click() + +End Sub + Private Sub lbMonth_Change() If clear_lb Or load_tb Then Exit Sub @@ -249,6 +257,15 @@ Private Sub opPlugVol_Click() calc_val End Sub +Private Sub tbCOM_Change() + + If tbAPI.text = "" Then tbAPI.text = "{}" + Set adjust = JsonConverter.ParseJson(tbAPI.text) + adjust("message") = tbCOM.text + tbAPI.text = JsonConverter.ConvertToJson(adjust) + +End Sub + Private Sub tbFcPrice_Change() If load_tb Then Exit Sub set_Price = True @@ -391,14 +408,14 @@ Private Sub UserForm_Activate() For i = 1 To sp("package")("mpvt").Count month(i, 0) = sp("package")("mpvt")(i)("order_month") - month(i, 1) = sp("package")("mpvt")(i)("2019 qty") - month(i, 2) = sp("package")("mpvt")(i)("2020 base qty") - month(i, 3) = sp("package")("mpvt")(i)("2020 adj qty") - month(i, 4) = sp("package")("mpvt")(i)("2020 tot qty") - month(i, 5) = sp("package")("mpvt")(i)("2019 value_usd") - month(i, 6) = sp("package")("mpvt")(i)("2020 base value_usd") - month(i, 7) = sp("package")("mpvt")(i)("2020 adj value_usd") - month(i, 8) = sp("package")("mpvt")(i)("2020 tot value_usd") + month(i, 1) = sp("package")("mpvt")(i)("2020 qty") + month(i, 2) = sp("package")("mpvt")(i)("2021 base qty") + month(i, 3) = sp("package")("mpvt")(i)("2021 adj qty") + month(i, 4) = sp("package")("mpvt")(i)("2021 tot qty") + month(i, 5) = sp("package")("mpvt")(i)("2020 value_usd") + month(i, 6) = sp("package")("mpvt")(i)("2021 base value_usd") + month(i, 7) = sp("package")("mpvt")(i)("2021 adj value_usd") + month(i, 8) = sp("package")("mpvt")(i)("2021 tot value_usd") If co_num(month(i, 2), 0) = 0 Then month(i, 9) = "addmonth" Else @@ -408,14 +425,14 @@ Private Sub UserForm_Activate() month(0, 0) = "month" month(13, 0) = "total" - month(0, 1) = "2019 qty" - month(0, 2) = "2020 base qty" - month(0, 3) = "2020 adj qty" - month(0, 4) = "2020 qty" - month(0, 5) = "2019 val" - month(0, 6) = "2020 base val" - month(0, 7) = "2020 adj val" - month(0, 8) = "2020 val" + month(0, 1) = "2020 qty" + month(0, 2) = "2021 base qty" + month(0, 3) = "2021 adj qty" + month(0, 4) = "2021 qty" + month(0, 5) = "2020 val" + month(0, 6) = "2021 base val" + month(0, 7) = "2021 adj val" + month(0, 8) = "2021 val" Me.crunch_array @@ -662,6 +679,7 @@ Sub calc_val() adjust("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss") adjust("user") = Application.UserName adjust("source") = "adj" + adjust("message") = tbCOM.text If opEditSales Then If opPlugVol Then adjust("type") = "scale_v" @@ -714,6 +732,7 @@ Sub calc_price() adjust("stamp") = Format(Date + time, "yyyy-mm-dd hh:mm:ss") adjust("user") = Application.UserName adjust("source") = "adj" + adjust("message") = tbCOM.text adjust("version") = handler.plan If opEditSales Then diff --git a/fpvt.frx b/fpvt.frx index 9428be6d23807d2ada33d94f40ce634784d8f5f8..e157912a7e9a013b5062b0922f1035841f3238da 100644 GIT binary patch delta 3574 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 KSXFwd5dQ}^BT&@< delta 2776 zcmZWrdrX_x6+id;Z1ae5aKMHT9>(Tj-qmW(A?Qv)s~7)%_<8nM=H z%Bqcwru4MSa~*VTx<|4m^)^kKsz#bLMO&3tTB6V{>Z++zH?8WJCgrcC>~}vKcaJOm zzH{z5=bn4-d0hMKvN(HDSbIBDiTWrxevwbKUU?@)0gl%xzKN1Mhr)m6|y@a1tyn^`GO3x-vkDSEg_ z&BK0jxVCVIS_+dfwJXmHfsV{HGW<|z@bN%k2J@_9qLvIks;kpojl2tMEC27 zUUSEqQ$J8S*BG=!eaHLS{&ZWYP)95A!FY_94DGyXY)YGuVvLX`8PYeHzmHiajv>c5 z)sqLB7GBLLDOd}IHBXs!vl@-t#J>t}H93ThTTOLB@T95Sg8R|u>+9=wPzO)~l*X=@ zCU6T~EH`shnCML0;c~$Y9P)xWY>KnD#o9-jD1A%V6lXU?v4t&f3h^qpW`8{*-B-Y^ zyj2xY4MX8&@SKs;6dOa zBKBB{^QFyR%)bN-0$&F90s8@-wq$ongRf!o2yhs96z~JXzz8r31ORC_mZ0OHM}P?+ z2=EO{zEK*?Vj?N8S+dRFzyt}Wr+^3$WpnyTq33059=~b*DT>dZQ>5Ie=aV@uL9w6Z z+)$G7-3WQ!7a>oG(zhMU(DLy`#J4FzFMGkuOZkzE%i!b~M_jjS#W7S+lFa46fn!=O z3&N&2ds{sEv?fX~44dNYhA6gBs0eY07mFgk0eD7p)xyCiY`ZrXquEqSp#lF`!0o5l?`;Jl{}HVHus~a;ePo5p zdLc0!V57Z2@e^0s-xfjsW50tcvUjl02UPmLZ=&XFsk(2cDv4Q9llmiI;OL}=0 z-T#iG5HbIoqg>ZOciPx$IIfpZ&onP(&53T#D2<3tUM!91eMxB(FP23_9cPqB^fen& z{TXoYv)NgJ`?J?sDZ)JFtb%WLI#uX+y=g1oaX!Nz*wcBrzY@nZ@oIl%5p;OAR6+CL zD62bq86k>FK7e}f;VZ?}d{vjiXEVF_P-VUTIcRijE}zqX2b^|L{Yh|N<)x}Q{c&)s znpQqoaqSeiC)r#xr+*yW056r!`5u#6KpTnFc@n9!%Qz!-{~P}Q2waeR>!Nm~IO@cr zCfKWZD~D%iI!2Go9-E;M&7=5U7yJ*^+AN<@sCN0MMgp=kr0TbNxpN8q8GFHR)CD)P zmGzWEGs6!L_VNbosL0$!-<}LmFqeyRN8FfgPn)ju=5QSN5Umrku%(*IQ3~P)m}JTS8n9nm@ELN z62ipgd@h;Z(#lAM1SpX(fzCKqVrIf9T0;7fDel z*pKb+AqRxNDzf_1u~a?+K0w*9i=P7_*KGM}_ts4+S*X`P90+Y^oLkaM;=Bk`6n~Ov2$D3~Mxp6};OyA`knHT|9RI&%S;96wX&b+sw7sX}!`pww z2X?>8ZNA;{;#JTb7g{FAq4;VibC1$ONQ1|oli>;+S-#P%v`ev z3G$R_HI0nWA#6?G!os6_Yzk7rdz>=oZ-JnwKiN~RpA6KZth4%t%Va8KglZ5mc{PJ} z+y_R-X9oSjz%lJ=w}?NhvszPJWSCsc(a-3znVD0R834z%3W5Lt delta 33 pcmbOsF+*ZQ3k&;#3~l$$dsjAhvpi>J%$r=y(a*@RnVD0R835aT3uOQR diff --git a/part.frx b/part.frx index 0b44b973534cb8ca40e37cded0492b860d200670..4b333eb3d04f925e316d6cd181c0b19d6f4a4230 100644 GIT binary patch delta 33 pcmbOsGDBoT3k&-Mzvn_6kFRd-W_ixc=rp;QBbw1=^LY+WMgZD43?Kji delta 33 pcmbOsGDBoT3k!QeNcyk%`&Tx1vpi>JWSv~h5zWZ3`8 diff --git a/pivot.cls b/pivot.cls index 5a4589b..2161ae5 100644 --- a/pivot.cls +++ b/pivot.cls @@ -55,8 +55,8 @@ Private Sub Worksheet_BeforeDoubleClick(ByVal target As Range, cancel As Boolean For i = 1 To ri.Count If i <> 1 Then handler.sql = handler.sql & vbCrLf & "AND " If i <> 1 Then handler.jsql = handler.jsql & vbCrLf & "," - handler.sql = handler.sql & rd(piv_pos(rd, i)).Name & " = '" & escape(ri(i).Name) & "'" - jsql = jsql & """" & rd(piv_pos(rd, i)).Name & """:""" & escape(ri(i).Name) & """" + handler.sql = handler.sql & rd(piv_pos(rd, i)).Name & " = '" & escape_sql(ri(i).Name) & "'" + jsql = jsql & """" & rd(piv_pos(rd, i)).Name & """:""" & escape_json(ri(i).Name) & """" handler.sc(i - 1, 0) = rd(piv_pos(rd, i)).Name handler.sc(i - 1, 1) = ri(i).Name Next i @@ -97,12 +97,21 @@ Function piv_fld_index(field_name As String, ByRef pt As PivotTable) As Integer End Function -Function escape(ByVal text As String) As String +Function escape_json(ByVal text As String) As String + + text = Replace(text, "'", "''") + text = Replace(text, """", "\""") + If text = "(blank)" Then text = "" + escape_json = text + +End Function + +Function escape_sql(ByVal text As String) As String text = Replace(text, "'", "''") text = Replace(text, """", """""") If text = "(blank)" Then text = "" - escape = text + escape_sql = text End Function