AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://JenneJ@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
JenneJ
2017-01-25 10:29:42 +01:00
parent c9f2c6c872 9670c2ec1b
commit 9d485d82f0
12 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -16,6 +16,7 @@ Imports System.IO
Imports WINDREAMLib
Imports System.Runtime.InteropServices
Imports DD_Rights
Imports DD_LIB_Standards
Public Class frmConstructor_Main
@@ -274,7 +275,7 @@ Public Class frmConstructor_Main
'Try
Dim SQL
Dim DT_PROXY_ENTITY As DataTable
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY"
DT_PROXY_ENTITY = ClassDatabase.Return_Datatable(SQL, True)
End If
@@ -288,7 +289,7 @@ Public Class frmConstructor_Main
DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL, True)
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 0 Then
ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine & _
"Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine & _
@@ -1342,7 +1343,7 @@ Public Class frmConstructor_Main
Try
PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString())
Catch ex As Exception
clsLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False)
ClassLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False)
PWplainText = ""
End Try
FAU_AD_USER_PW = PWplainText
@@ -1856,7 +1857,7 @@ Public Class frmConstructor_Main
CONTROL_HANDLING()
Dim DT_DOC_RESULT As DataTable = ClassDOC_SEARCH.Get_DOCRESULTS(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, "RECORD")
If IsNothing(DT_DOC_RESULT) Then
clsLogger.Add(">> DT_DOC_RESULT is nothing!", True)
ClassLogger.Add(">> DT_DOC_RESULT is nothing!", True)
End If
If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then
RECORD_CHANGED = False
@@ -3434,7 +3435,7 @@ Public Class frmConstructor_Main
End If
End If
Else
clsLogger.Add(">> No files 2 delete - after deleting record!", False)
ClassLogger.Add(">> No files 2 delete - after deleting record!", False)
End If
Cursor = Cursors.Default
Catch ex As Exception
@@ -5700,7 +5701,7 @@ Public Class frmConstructor_Main
End If
End If
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID"))
ClassDatabase.Execute_non_Query(proc, True)
End If
@@ -5983,7 +5984,7 @@ Public Class frmConstructor_Main
Private Sub Load_Variants()
Try
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = ClassProxy.MyPROXYConnectionString
Else
Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MyConnectionString
@@ -6147,7 +6148,7 @@ Public Class frmConstructor_Main
' Rename file.
My.Computer.FileSystem.RenameFile(OldName, NewName)
Cursor = Cursors.WaitCursor
If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> String.Empty Then
If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
ClassDatabase.Execute_non_Query(upd, True)