From 5a8005fb5709f97cbbd3a0bf88777d75f63be897 Mon Sep 17 00:00:00 2001 From: Fredrik Eriksson Date: Tue, 15 May 2018 16:51:38 +0200 Subject: [PATCH 1/2] Added support for setting original document type --- GetAccept-v2/Install/GetAccept.bas | 33 ++++++++++++++++++++++-------- GetAccept-v2/app.js | 5 +++-- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/GetAccept-v2/Install/GetAccept.bas b/GetAccept-v2/Install/GetAccept.bas index 2a6be91..9ba7dbd 100644 --- a/GetAccept-v2/Install/GetAccept.bas +++ b/GetAccept-v2/Install/GetAccept.bas @@ -13,6 +13,7 @@ Private Const GlobalDocumentCommentField As String = "comment" Private Const GlobalDocumentCompanyField As String = "company" Private Const GlobalDocumentTypeFieldOptionQuote As String = "tender" Private Const GlobalDocumentTypeFieldOptionAgreement As String = "agreement" +Private Const GlobalDocumentUseTypeFromOriginalDocument As Boolean = False ' Person Private Const GlobalPersonFirstNameField As String = "firstname" @@ -605,7 +606,7 @@ ErrorHandler: End Function -Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String) +Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String, lngOriginalRecordID As Long) On Error GoTo ErrorHandler ThisApplication.MousePointer = 11 @@ -646,15 +647,32 @@ Public Sub DownloadFile(sLink As String, sFileName As String, className As Strin Call pDocument.Load(sFileLocation) Call oRecord.Open(Database.Classes("document")) oRecord.Value(GlobalDocumentField) = pDocument + + ' Set the document type If oRecord.Fields.Exists(GlobalDocumentTypeField) Then - oRecord(GlobalDocumentTypeField) = Database.Classes("document").Fields(GlobalDocumentTypeField).Options.Lookup(GlobalDocumentTypeFieldOptionAgreement, lkLookupOptionByKey) + Dim lngTypeOption As Long + If GlobalDocumentUseTypeFromOriginalDocument Then + Dim oRecordOriginalDocument As New LDE.Record + Dim lngOriginalDocumentRecordID As Long + lngOriginalDocumentRecordID = lngOriginalRecordID '##TODO + + Dim oViewOriginalDocument As New LDE.View + Call oViewOriginalDocument.Add(GlobalDocumentTypeField) + Call oRecordOriginalDocument.Open(Database.Classes("document"), lngOriginalDocumentRecordID, oViewOriginalDocument) + lngTypeOption = oRecordOriginalDocument.Value(GlobalDocumentTypeField) + Else + lngTypeOption = Database.Classes("document").Fields(GlobalDocumentTypeField).Options.Lookup(GlobalDocumentTypeFieldOptionAgreement, lkLookupOptionByKey) + End If + oRecord(GlobalDocumentTypeField) = lngTypeOption End If + + ' Link to open inspector if relation exists with the same name If oRecord.Fields.Exists(className) Then oRecord(className) = oInspector.Record.ID End If - 'connect company if a company field exists on the parent card and the document card. - If className <> "company" Then 'only done if the parent isnt alreaady the company + ' Connect company if a company field exists on the parent card and the document card. + If className <> "company" Then 'only done if the parent isn't already the company If oRecord.Fields.Exists(GlobalDocumentCompanyField) Then If oInspector.Record.Fields.Exists(GlobalDocumentCompanyField) Then oRecord(GlobalDocumentCompanyField) = oInspector.Controls.GetValue(GlobalDocumentCompanyField) @@ -665,18 +683,17 @@ Public Sub DownloadFile(sLink As String, sFileName As String, className As Strin oRecord(commentField) = sFileName & " (" & (Localize.GetText("GetAccept", "SIGNED")) & ")" oRecord("sent_with_ga") = 1 oRecord.Update - Else Call Lime.MessageBox(Localize.GetText("GetAccept", "i_download_failed")) End If - VBA.Kill (sFileLocation) + Call VBA.Kill(sFileLocation) + ThisApplication.MousePointer = 0 - ThisApplication.MousePointer = 1 Exit Sub ErrorHandler: + ThisApplication.MousePointer = 0 Call UI.ShowError("GetAccept.DownloadFile") - ThisApplication.MousePointer = 1 End Sub Private Function AddOrCheckLocalize(sOwner As String, sCode As String, sDescription As String, sEN_US As String, sSV As String, sNO As String, sFI As String, sDA As String) As Boolean diff --git a/GetAccept-v2/app.js b/GetAccept-v2/app.js index 69e549a..6f6332e 100755 --- a/GetAccept-v2/app.js +++ b/GetAccept-v2/app.js @@ -425,7 +425,8 @@ lbs.apploader.register('GetAccept-v2', function () { name: doc.name, status: doc.status, sso_url: sso_url, - is_signing: doc.is_signing + is_signing: doc.is_signing, + lime_id: doc.external_id } document.analytics = function () { documentAnalytics(this); @@ -448,7 +449,7 @@ lbs.apploader.register('GetAccept-v2', function () { apiRequest('documents/' + document_id + '/download', 'GET', '', function (data) { if (typeof (data.document_url) != 'undefined') { alert(viewModel.localize.GetAccept.DOCUMENT_IS_DOWNLOADED); - lbs.common.executeVba("GetAccept.DownloadFile," + data.document_url + ',' + documentname + ',' + className + ',' + appConfig.title_field); + lbs.common.executeVba("GetAccept.DownloadFile," + data.document_url + ',' + documentname + ',' + className + ',' + appConfig.title_field + ',' + document.lime_id); } else { alert('Could not find signed document'); } From 5ff9241f25e76f7857e2ac7b3d6f43cd7304a7a2 Mon Sep 17 00:00:00 2001 From: Fredrik Eriksson Date: Tue, 15 Jan 2019 08:52:44 +0100 Subject: [PATCH 2/2] Cleaned up variables --- GetAccept-v2/Install/GetAccept.bas | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/GetAccept-v2/Install/GetAccept.bas b/GetAccept-v2/Install/GetAccept.bas index 67fe113..6a2e467 100644 --- a/GetAccept-v2/Install/GetAccept.bas +++ b/GetAccept-v2/Install/GetAccept.bas @@ -674,7 +674,7 @@ ErrorHandler: End Function -Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String, lngOriginalRecordID As Long) +Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String, lngOriginalDocumentRecordID As Long) On Error GoTo ErrorHandler ThisApplication.MousePointer = 11 @@ -721,9 +721,6 @@ Public Sub DownloadFile(sLink As String, sFileName As String, className As Strin Dim lngTypeOption As Long If GlobalDocumentUseTypeFromOriginalDocument Then Dim oRecordOriginalDocument As New LDE.Record - Dim lngOriginalDocumentRecordID As Long - lngOriginalDocumentRecordID = lngOriginalRecordID '##TODO - Dim oViewOriginalDocument As New LDE.View Call oViewOriginalDocument.Add(GlobalDocumentTypeField) Call oRecordOriginalDocument.Open(Database.Classes("document"), lngOriginalDocumentRecordID, oViewOriginalDocument)