From 2df666a44f6d3104cf5b5e8af320d7c9eed47bb4 Mon Sep 17 00:00:00 2001 From: PhilRunninger Date: Mon, 1 Apr 2024 17:48:45 -0400 Subject: [PATCH] Allow getting the list of changes for director or segment pools. --- Master Template.xlsm_EXPORTS/changes.frm | 4 ++-- Master Template.xlsm_EXPORTS/changes.frx | Bin 3096 -> 3096 bytes Master Template.xlsm_EXPORTS/handler.bas | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Master Template.xlsm_EXPORTS/changes.frm b/Master Template.xlsm_EXPORTS/changes.frm index 9236eb1..86cf379 100644 --- a/Master Template.xlsm_EXPORTS/changes.frm +++ b/Master Template.xlsm_EXPORTS/changes.frm @@ -19,10 +19,10 @@ Private Sub UserForm_Activate() tbPrint.value = "" Dim errorMsg As String - X = handler.list_changes("{""scenario"":{""quota_rep_descr"":""" & shData.Cells(2, 5) & """}}", errorMsg) + X = handler.list_changes(errorMsg) If errorMsg <> "" Then Unload Me - MsgBox "No adjustments have been made.", vbOKOnly + vbExclamation, errorMsg + MsgBox errorMsg, vbOKOnly + vbExclamation, "No data found." End End If Me.lbHist.list = X diff --git a/Master Template.xlsm_EXPORTS/changes.frx b/Master Template.xlsm_EXPORTS/changes.frx index 46cabfd5c6fcaa71ab2437e7ef0e686211b3e639..82cec8beefe140e400c828482b911ef244349d6c 100644 GIT binary patch delta 25 hcmbOsF+*ZQ3kz$5X6yOd&7CaoSQr^LS8y(10swr42_XOg delta 25 hcmbOsF+*ZQ3k$12(CQ4I&7CaoSQxD~S8y(10swOy2%-Q0 diff --git a/Master Template.xlsm_EXPORTS/handler.bas b/Master Template.xlsm_EXPORTS/handler.bas index 3f6a685..f990650 100644 --- a/Master Template.xlsm_EXPORTS/handler.bas +++ b/Master Template.xlsm_EXPORTS/handler.bas @@ -14,7 +14,6 @@ Public basis() As Variant Public baseline() As Variant Public adjust() As Variant - Sub load_fpvt() Application.StatusBar = "retrieving selection data....." @@ -48,8 +47,10 @@ Sub pg_main_workset(catg As String, rep As String) Dim errorMsg As String Application.StatusBar = "Querying for " & rep & "'s pool of data..." + shConfig.Range("current_pool").value = "{""scenario"":{""" & catg & """:""" & rep & """}}" + Dim json As Object - Set json = makeHttpRequest("GET", "get_pool", "{""scenario"":{""" & catg & """:""" & rep & """}}", errorMsg) + Set json = makeHttpRequest("GET", "get_pool", shConfig.Range("current_pool").value, errorMsg) If errorMsg <> "" Then MsgBox errorMsg, vbOKOnly + vbExclamation, "Couldn't " & rep & "'s pool of data." @@ -378,9 +379,14 @@ Function co_num(ByRef one As Variant, ByRef two As Variant) As Variant End Function -Function list_changes(doc As String, ByRef errorMsg As String) As Variant() +Function list_changes(ByRef errorMsg As String) As Variant() + If shConfig.Range("current_pool").value = "" Then + errorMsg = "Nothing to undo. Load some data with the folder icon first." + Exit Function + End If + Dim json As Object - Set json = makeHttpRequest("GET", "list_changes", doc, errorMsg) + Set json = makeHttpRequest("GET", "list_changes", shConfig.Range("current_pool").value, errorMsg) If errorMsg <> "" Then Exit Function