MS

app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb

@@ -266,6 +266,7 @@ Public Class ClassDOC_SEARCH
             Dim DT_FILE_RESULT As DataTable = GET_DOCSEARCH_DATATABLE(BG)
             CURRENT_DOC_RESULTS = DT_FILE_RESULT
             If IsNothing(DT_FILE_RESULT) Then
+                '  MsgBox("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING" & vbNewLine & "Please inform Your Sysadmin", MsgBoxStyle.Exclamation, "Attention")
                 LOGGER.Warn("ATTENTION: GET_DOCSEARCH_DATATABLE IS NOTHING!!")
                 Return Nothing
             End If

app/DD-Record-Organizer/Classes/ClassFunctionCommandsUI.vb

@@ -192,8 +192,8 @@ Public Class ClassFunctionCommandsUI
             Dim controlID = GetControlID_for_Name(ControlName, FormID)
 
             ' Load All appointments first
-            frmCalendar.TBPMO_RESOURCESTableAdapter.Connection.ConnectionString = MyConnectionString
-            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Connection.ConnectionString = MyConnectionString
+            frmCalendar.TBPMO_RESOURCESTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
+            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
             frmCalendar.TBPMO_RESOURCESTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_RESOURCES)
             frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_APPOINTMENTS)
 

app/DD-Record-Organizer/Classes/ClassInit.vb

@@ -14,10 +14,10 @@ Public Class ClassInit
         Try
             LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
                                         My.Application.Info.CompanyName,
-                                        "ADDI")
+                                        "OrgFlow")
             LOGGER = LOGCONFIG.GetLogger()
 
-            LOGGER.Info("## ADDI started - {0}", Now)
+            LOGGER.Info("## OrgFlow started - {0}", Now)
             Try
                 Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
 
@@ -210,6 +210,7 @@ Public Class ClassInit
             For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
                 If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
                     SQL_DOC_RESULT_RECORD = oRow.Item("SQL_COMMAND")
+                    LOGGER.Debug("SQL_DOC_RESULT_RECORD = " + SQL_DOC_RESULT_RECORD)
                 End If
             Next
             sql = "SELECT * FROM TBPMO_CONTROL"
@@ -290,7 +291,7 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
 
 
                 If Right_RO = False Then
-                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
+                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using OrgFlow!")
                     'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                     Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
 
@@ -370,7 +371,7 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
 
                             If clsWindream.Create_Session = False Then
                                 LOGGER.Warn("Could not create the login for windream - No session created!")
-                                ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
+                                ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "OrgFlow will start anyway but be aware that searching and importing won't be possible!")
                             End If
                         End If
 

app/DD-Record-Organizer/Classes/ClassNodeNavigation.vb

@@ -9,7 +9,7 @@ Public Class ClassNodeNavigation
     Public Shared Function CreateNodeProcedure(RECORD_ID As Integer, NODE_CONFIG_ID As Integer, NODE_CAPTION As String, NODE_ID1 As String, NODE_PARENT_ID As String, ADDED_WHO As String)
         Try
             Dim connection As New SqlConnection
-            connection.ConnectionString = MyConnectionString
+            connection.ConnectionString = MYDB_ECM.CurrentConnectionString
 
             Using cmd As New SqlCommand("PRPMO_CREATE_NODE", connection)
                 cmd.CommandType = CommandType.StoredProcedure

app/DD-Record-Organizer/Classes/ClassRecordCommands.vb

@@ -6,7 +6,7 @@ Public Class ClassRecordCommands
         Try
             Dim connection As New SqlConnection
 
-            connection.ConnectionString = MyConnectionString
+            connection.ConnectionString = MYDB_ECM.CurrentConnectionString
 
             Using cmd As New SqlCommand("PRPMO_CREATE_RECORD", connection)
 

app/DD-Record-Organizer/Classes/ClassSAP.vb

@@ -134,8 +134,8 @@ Public Class ClassSAP
             Return Nothing
         End Try
     End Function
-    Private Shared WithEvents read As New ReadTable(SAPConnectionString)
-    Private Shared Sub OnIncomingPackage(ByVal Sender As ReadTable, ByVal PackageResult As DataTable) Handles read.IncomingPackage
+    Private Shared WithEvents oReadTbl As New ReadTable(SAPConnectionString)
+    Private Shared Sub OnIncomingPackage(ByVal Sender As ReadTable, ByVal PackageResult As DataTable) Handles oReadTbl.IncomingPackage
         Try
             LOGGER.Debug("Processing data package with " +
                   PackageResult.Rows.Count.ToString() + " rows")
@@ -166,11 +166,11 @@ Public Class ClassSAP
                 oReadTable.RowCount = RowLimit
             End If
             LOGGER.Debug("Table.Run executing.....")
-            read = oReadTable
-            read.Run()
+            oReadTbl = oReadTable
+            oReadTbl.Run()
 
             LOGGER.Debug("Table.Run executed")
-            RESULT_TABLE = read.Result
+            RESULT_TABLE = oReadTbl.Result
             If Not IsNothing(NewDatatable) Then
                 LOGGER.Debug($"Got [{NewDatatable.Rows.Count}] rows")
             End If

app/DD-Record-Organizer/Classes/ClassUpdate.vb

@@ -88,7 +88,7 @@ Public Class ClassUpdate
             For Each d In Directory.GetDirectories(sDir)
                 If d.Contains("$Recycle") = False Or d.Contains("System Volume") = False Then
                     If RecExe_found = False Then
-                        For Each f In Directory.GetFiles(d, "DD-Record-Organizer.exe")
+                        For Each f In Directory.GetFiles(d, "DD-OrgFlow.exe")
                             RecExe_found = True
                             MY_INSTALL_PATH = Path.GetDirectoryName(f)
                             Exit Sub
@@ -182,9 +182,9 @@ Public Class ClassUpdate
             Exit Sub
         End If
 
-        Dim msg = "Auf dem Server liegt ein Update für ein ADDI-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
+        Dim msg = "Auf dem Server liegt ein Update für ein OrgFlow-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
         If USER_LANGUAGE <> "de-DE" Then
-            msg = "There is a new release available for an ADDI-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
+            msg = "There is a new release available for an OrgFlow-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
         End If
         Dim result As MsgBoxResult
         result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)

app/DD-Record-Organizer/Classes/ClassWDRights.vb

@@ -190,7 +190,7 @@ Public Class ClassWDRights
                 Err.Clear()
                 ' Wenn ALLE Rechteträger entfernt werden (FOR EACH), 
                 ' dann muss mindestens EIN Rechteträger mit dem Recht zur Rechteänderung 
-                ' wieder zugefügt werden!!!!! Dies ist der ADDI-Right User!
+                ' wieder zugefügt werden!!!!! Dies ist der OrgFlow-Right User!
                 'Für jeden User das Recht einzeln hinzufügen
                 For Each User_Row As DataRow In DT_USER_RIGHT.Rows
                     Dim fileright 'Recht als Integer

app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb

@@ -417,22 +417,22 @@ Public Class ClassWindreamDocGrid
 
                     AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                     e.RepositoryItem = dateedit
-                    'ElseIf typeId = 4 And editable = F Then
-                    '    Dim dropdown As New RepositoryItemComboBox()
-                    '    Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")
+                ElseIf typeId = 10 And editable = True Then
+                    Dim dropdown As New RepositoryItemComboBox()
+                    Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")
 
-                    '    For Each matchingRow As DataRow In matchingRows
-                    '        Dim item As New WindreamDocGridComboboxItem()
-                    '        item.ConfigID = matchingRow.Item("CONFIG_ID")
-                    '        item.Value = matchingRow.Item("VALUE")
-                    '        dropdown.Items.Add(item)
-                    '    Next
+                    For Each matchingRow As DataRow In matchingRows
+                        Dim item As New WindreamDocGridComboboxItem()
+                        item.ConfigID = matchingRow.Item("CONFIG_ID")
+                        item.Value = matchingRow.Item("VALUE")
+                        dropdown.Items.Add(item)
+                    Next
 
-                    '    AddHandler dropdown.SelectedValueChanged, _dropdownValueChangedHandler
+                    AddHandler dropdown.SelectedValueChanged, _dropdownValueChangedHandler
+
+                    e.RepositoryItem = dropdown
 
-                    '    e.RepositoryItem = dropdown
 
-                    'End If
                 ElseIf typeId = 4 And editable Then
                     Dim textedit As New RepositoryItemTextEdit()
 

app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb

@@ -891,7 +891,7 @@ Public Class ClassControlCommandsUI
             Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value)
             If Not IsNothing(converted_value) Then
                 Dim connection As New SqlConnection
-                connection.ConnectionString = MyConnectionString
+                connection.ConnectionString = MYDB_ECM.CurrentConnectionString
                 Using cmd As New SqlCommand("PRPMO_CREATE_CONTROL_VALUE", connection)
                     cmd.CommandType = CommandType.StoredProcedure
                     cmd.Parameters.AddWithValue("@pRECORD_ID", RecordID)