Skip to content

Document type on downloaded signed documents #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justFredster wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Document type on downloaded signed documents #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b82ba9a
Merge remote-tracking branch 'refs/remotes/getaccept/master'
justFredster May 15, 2018
bdce369
Merge remote-tracking branch 'refs/remotes/getaccept/master'
justFredster May 15, 2018
5a8005f
Added support for setting original document type
justFredster May 15, 2018
7c9e350
Merge remote-tracking branch 'refs/remotes/getaccept/master'
justFredster May 21, 2018
5ff9241
Cleaned up variables
justFredster Jan 15, 2019
2ddc6c7
Merge remote-tracking branch 'refs/remotes/getaccept/master'
justFredster Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions GetAccept-v2/Install/GetAccept.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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"
Expand Down Expand Up @@ -673,7 +674,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, lngOriginalDocumentRecordID As Long)
On Error GoTo ErrorHandler

ThisApplication.MousePointer = 11
Expand Down Expand Up @@ -714,15 +715,29 @@ 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 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)
Expand All @@ -733,18 +748,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
Expand Down
5 changes: 3 additions & 2 deletions GetAccept-v2/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,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);
Expand All @@ -449,7 +450,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');
}
Expand Down