MS_10.11.2015

2015-11-10 09:41:29 +01:00
parent 317a223c68
commit 2aa4e4ba58
15 changed files with 141 additions and 125 deletions
--- a/app/DD-Record-Organiser/ClassDatabase.vb
+++ b/app/DD-Record-Organiser/ClassDatabase.vb
@@ -25,7 +25,7 @@ Public Class ClassDatabase
            If DTConnection.Rows.Count = 1 Then
                Select Case DTConnection.Rows(0).Item("SQL_PROVIDER")
                    Case "MS-SQLServer"
-                        connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
+                        connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
                    Case "Oracle"
                        If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then
                            connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
@@ -37,6 +37,8 @@ Public Class ClassDatabase
                        ClassLogger.Add(" - ConnectionType nicht integriert", False)
                        MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
                End Select
+            Else
+                ClassLogger.Add(" No entry for Connection-ID: " & id.ToString, True)
            End If

        Catch ex As Exception
--- a/app/DD-Record-Organiser/ClassHelper.vb
+++ b/app/DD-Record-Organiser/ClassHelper.vb
@@ -27,52 +27,4 @@ Public Class ClassHelper
        End If
        Return tempName
    End Function
-
-    Public Shared Function GetConnectionString(id As Integer)
-        Dim connectionString As String = ""
-        Try
-            'Me.TBCONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBCONNECTION, id)
-            Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id)
-            If DTConnection.Rows.Count = 1 Then
-                Select Case DTConnection.Rows(0).Item("SQL_PROVIDER")
-                    Case "MS-SQLServer"
-                        connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Initial Catalog= " & DTConnection.Rows(0).Item("DATENBANK") & ";User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                    Case "Oracle"
-                        If DTConnection.Rows(0).Item("BEMERKUNG").ToString.Contains("without tnsnames") Then
-                            connectionString = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & DTConnection.Rows(0).Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
-                               DTConnection.Rows(0).Item("DATENBANK") & ")));User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";"
-                        Else
-                            connectionString = "Data Source=" & DTConnection.Rows(0).Item("SERVER") & ";Persist Security Info=True;User Id=" & DTConnection.Rows(0).Item("USERNAME") & ";Password=" & DTConnection.Rows(0).Item("PASSWORD") & ";Unicode=True"
-                        End If
-                        'Dim conn As New OracleConnectionStringBuilder
-
-                        'If chkOR_ohne_TNS.Checked Then
-                        '    connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & SERVERTextBox.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _
-                        '        DATABASETextBox.Text & ")));User Id=" & USERNAMETextBox.Text & ";Password=" & PASSWORDTextBox.Text & ";"
-                        'Else
-                        '    conn.DataSource = DATABASETextBox.Text
-                        '    conn.UserID = USERNAMETextBox.Text
-                        '    conn.Password = PASSWORDTextBox.Text
-                        '    conn.PersistSecurityInfo = True
-                        '    conn.ConnectionTimeout = 120
-                        '    connstr = conn.ConnectionString
-                        'End If
-
-
-
-                        'Data Source=MyOracleDB;User Id=myUsername;Password=myPassword;Integrated Security=no;
-
-                    Case Else
-                        ClassLogger.Add(" - ConnectionType nicht integriert", False)
-                        MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
-                End Select
-            End If
-
-        Catch ex As Exception
-            ClassLogger.Add(" - Unvorhergesehener Fehler bei GetConnectionString - Fehler: " & vbNewLine & ex.Message)
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetConnectionString:")
-
-        End Try
-        Return connectionString
-    End Function
 End Class
--- a/app/DD-Record-Organiser/ClassSQLEditor.vb
+++ b/app/DD-Record-Organiser/ClassSQLEditor.vb
@@ -19,7 +19,6 @@ Public Class ClassSQLEditor
        If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then
            Using Form As New frmSQLEditor()
                Form.Value = SQLSTring
-
                If svc.ShowDialog(Form) = DialogResult.OK Then
                    Dim sql As New SQLValue(Form.Value)
                    value = sql
--- a/app/DD-Record-Organiser/XtraForm2.Designer.vb
+++ b/app/DD-Record-Organiser/XtraForm2.Designer.vb
@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class XtraForm2
+Partial Class frmConstructor_Main
    Inherits DevExpress.XtraEditors.XtraForm

    'Form overrides dispose to clean up the component list.
@@ -25,7 +25,7 @@ Partial Class XtraForm2
        Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XtraForm2))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
        Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
@@ -58,7 +58,6 @@ Partial Class XtraForm2
        Me.tssStatus = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tssRecord = New System.Windows.Forms.ToolStripStatusLabel()
        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
        Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView()
        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
@@ -72,6 +71,7 @@ Partial Class XtraForm2
        Me.SplitContainer_Bottom = New DevExpress.XtraEditors.SplitContainerControl()
        Me.VWTEMPQUICKVIEWTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.VWTEMPQUICKVIEWTableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
+        Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenu_GridControlSelection.SuspendLayout()
@@ -82,7 +82,6 @@ Partial Class XtraForm2
        Me.StatusStrip_Main.SuspendLayout()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl1.SuspendLayout()
-        Me.XtraTabPage1.SuspendLayout()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabPage2.SuspendLayout()
@@ -96,6 +95,7 @@ Partial Class XtraForm2
        Me.SplitContainer_Top.SuspendLayout()
        CType(Me.SplitContainer_Bottom, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer_Bottom.SuspendLayout()
+        Me.XtraTabPage3.SuspendLayout()
        Me.SuspendLayout()
        '
        'grvwCarousel
@@ -121,7 +121,7 @@ Partial Class XtraForm2
        Me.GridControlSelection.Location = New System.Drawing.Point(0, 0)
        Me.GridControlSelection.MainView = Me.grvwGrid
        Me.GridControlSelection.Name = "GridControlSelection"
-        Me.GridControlSelection.Size = New System.Drawing.Size(1157, 272)
+        Me.GridControlSelection.Size = New System.Drawing.Size(1150, 272)
        Me.GridControlSelection.TabIndex = 2
        Me.GridControlSelection.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwTiles, Me.grvwGrid, Me.grvwCarousel})
        '
@@ -173,13 +173,10 @@ Partial Class XtraForm2
        Me.grvwTiles.GridControl = Me.GridControlSelection
        Me.grvwTiles.Name = "grvwTiles"
        TileViewItemElement1.Column = Me.TileViewColumn1
-        TileViewItemElement1.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement1.Text = "element1"
        TileViewItemElement2.Column = Me.TileViewColumn2
-        TileViewItemElement2.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement2.Text = "element2"
        TileViewItemElement3.Column = Me.TileViewColumn3
-        TileViewItemElement3.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement3.Text = "element3"
        Me.grvwTiles.TileTemplate.Add(TileViewItemElement1)
        Me.grvwTiles.TileTemplate.Add(TileViewItemElement2)
@@ -323,20 +320,15 @@ Partial Class XtraForm2
        '
        'XtraTabControl1
        '
+        Me.XtraTabControl1.Appearance.BackColor = System.Drawing.SystemColors.ControlDark
+        Me.XtraTabControl1.Appearance.Options.UseBackColor = True
        Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl1.Name = "XtraTabControl1"
-        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl1.Size = New System.Drawing.Size(1050, 320)
+        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage3
+        Me.XtraTabControl1.Size = New System.Drawing.Size(1050, 313)
        Me.XtraTabControl1.TabIndex = 0
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
-        '
-        'XtraTabPage1
-        '
-        Me.XtraTabPage1.Controls.Add(Me.GridControl1)
-        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(1044, 292)
-        Me.XtraTabPage1.Text = "XtraTabPage1"
+        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage2})
        '
        'GridControl1
        '
@@ -344,17 +336,21 @@ Partial Class XtraForm2
        Me.GridControl1.Location = New System.Drawing.Point(0, 0)
        Me.GridControl1.MainView = Me.TileView1
        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(1044, 292)
+        Me.GridControl1.Size = New System.Drawing.Size(1048, 288)
        Me.GridControl1.TabIndex = 0
        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1})
        '
        'TileView1
        '
+        Me.TileView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat
+        Me.TileView1.FocusBorderColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
        Me.TileView1.GridControl = Me.GridControl1
        Me.TileView1.Name = "TileView1"
        Me.TileView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
        Me.TileView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.TileView1.OptionsTiles.RowCount = 3
+        Me.TileView1.OptionsFind.AlwaysVisible = True
+        Me.TileView1.OptionsTiles.RowCount = 2
+        Me.TileView1.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons
        '
        'XtraTabPage2
        '
@@ -398,28 +394,24 @@ Partial Class XtraForm2
        Me.TileView2.OptionsTiles.ItemSize = New System.Drawing.Size(280, 160)
        Me.TileView2.OptionsTiles.RowCount = 2
        Me.TileView2.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colAktenzustand, DevExpress.Data.ColumnSortOrder.Ascending)})
-        TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI Semibold", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        TileViewItemElement4.Appearance.Normal.ForeColor = System.Drawing.Color.LightSeaGreen
+        TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        TileViewItemElement4.Appearance.Normal.ForeColor = System.Drawing.Color.DodgerBlue
        TileViewItemElement4.Appearance.Normal.Options.UseFont = True
        TileViewItemElement4.Appearance.Normal.Options.UseForeColor = True
        TileViewItemElement4.Column = Me.colAktenzeichen
-        TileViewItemElement4.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement4.Text = "colAktenzeichen"
        TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual
        TileViewItemElement4.TextLocation = New System.Drawing.Point(120, 0)
        TileViewItemElement5.Column = Me.TileViewColumn5
        TileViewItemElement5.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft
        TileViewItemElement5.ImageBorder = DevExpress.XtraEditors.TileItemElementImageBorderMode.None
-        TileViewItemElement5.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement5.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside
        TileViewItemElement5.Text = "TileViewColumn5"
        TileViewItemElement6.Column = Me.colTagderEintragungimRegister
-        TileViewItemElement6.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement6.Text = "colTagderEintragungimRegister"
        TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual
        TileViewItemElement6.TextLocation = New System.Drawing.Point(120, 20)
        TileViewItemElement7.Column = Me.colAktenzustand
-        TileViewItemElement7.ImageBorderColor = System.Drawing.Color.Empty
        TileViewItemElement7.Text = "colAktenzustand"
        Me.TileView2.TileTemplate.Add(TileViewItemElement4)
        Me.TileView2.TileTemplate.Add(TileViewItemElement5)
@@ -472,7 +464,7 @@ Partial Class XtraForm2
        Me.SplitContainer_Bottom.Panel1.Controls.Add(Me.XtraTabControl1)
        Me.SplitContainer_Bottom.Panel1.Text = "Panel1"
        Me.SplitContainer_Bottom.Panel2.Text = "Panel2"
-        Me.SplitContainer_Bottom.Size = New System.Drawing.Size(1460, 320)
+        Me.SplitContainer_Bottom.Size = New System.Drawing.Size(1460, 313)
        Me.SplitContainer_Bottom.SplitterPosition = 1050
        Me.SplitContainer_Bottom.TabIndex = 0
        Me.SplitContainer_Bottom.Text = "SplitContainerControl1"
@@ -490,7 +482,16 @@ Partial Class XtraForm2
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
-        'XtraForm2
+        'XtraTabPage3
+        '
+        Me.XtraTabPage3.Appearance.PageClient.BackColor = System.Drawing.SystemColors.Control
+        Me.XtraTabPage3.Appearance.PageClient.Options.UseBackColor = True
+        Me.XtraTabPage3.Controls.Add(Me.GridControl1)
+        Me.XtraTabPage3.Name = "XtraTabPage3"
+        Me.XtraTabPage3.Size = New System.Drawing.Size(1048, 288)
+        Me.XtraTabPage3.Text = "XtraTabPage3"
+        '
+        'frmConstructor_Main
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -498,7 +499,7 @@ Partial Class XtraForm2
        Me.Controls.Add(Me.SplitContainer_Main)
        Me.Controls.Add(Me.StatusStrip_Main)
        Me.Controls.Add(Me.navPane)
-        Me.Name = "XtraForm2"
+        Me.Name = "frmConstructor_Main"
        Me.Text = "XtraForm2"
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).EndInit()
@@ -511,7 +512,6 @@ Partial Class XtraForm2
        Me.StatusStrip_Main.PerformLayout()
        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabControl1.ResumeLayout(False)
-        Me.XtraTabPage1.ResumeLayout(False)
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabPage2.ResumeLayout(False)
@@ -525,6 +525,7 @@ Partial Class XtraForm2
        Me.SplitContainer_Top.ResumeLayout(False)
        CType(Me.SplitContainer_Bottom, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer_Bottom.ResumeLayout(False)
+        Me.XtraTabPage3.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -547,7 +548,6 @@ Partial Class XtraForm2
    Friend WithEvents AnsichtUmschaltenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents AnsichtZurücksetzenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
-    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents SplitContainer_Main As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents SplitContainer_Top As DevExpress.XtraEditors.SplitContainerControl
@@ -571,4 +571,5 @@ Partial Class XtraForm2
    Friend WithEvents TileViewColumn5 As DevExpress.XtraGrid.Columns.TileViewColumn
    Friend WithEvents colTagderEintragungimRegister As DevExpress.XtraGrid.Columns.TileViewColumn
    Friend WithEvents colAktenzustand As DevExpress.XtraGrid.Columns.TileViewColumn
+    Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
 End Class
--- a/app/DD-Record-Organiser/XtraForm2.vb
+++ b/app/DD-Record-Organiser/XtraForm2.vb
@@ -5,7 +5,7 @@ Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Tile

-Public Class XtraForm2
+Public Class frmConstructor_Main

    Public CONSTRUCTORID As Integer
    Public DT_CONSTRUCT_VIEW As DataTable
@@ -592,8 +592,8 @@ Public Class XtraForm2
        Dim DT As DataTable = DirectCast(DT_SELECTION, DataTable)
        Dim Elements As New List(Of TileViewItemElement)

-        Dim PrimaryFont As New Font("Segoe UI", 11)
-        Dim SecondaryFont As New Font("Segoe UI", 9)
+        Dim PrimaryFont As New Font("Segoe UI", 14, FontStyle.Bold)
+        Dim SecondaryFont As New Font("Segoe UI", 12)

        'Anpassung der Eigenschaften
        TileView1.OptionsTiles.Orientation = Orientation.Horizontal
@@ -628,7 +628,8 @@ Public Class XtraForm2
                        .Column = TileView1.Columns(2)
                        .TextAlignment = TileItemContentAlignment.TopRight
                        .Appearance.Normal.Font = PrimaryFont
-                        .Appearance.Normal.ForeColor = SystemColors.MenuHighlight
+                        .Appearance.Normal.ForeColor = Color.DodgerBlue
+
                        .Column.OptionsFilter.AllowFilter = True
                    End With
                    Elements.Add(HeadlineColumn)
@@ -973,7 +974,7 @@ Public Class XtraForm2
        End Try
    End Function

-    
+

    Sub Load_Record_Data()
        Select Case EDIT_STATE
--- a/app/DD-Record-Organiser/frmConfig_Basic.vb
+++ b/app/DD-Record-Organiser/frmConfig_Basic.vb
@@ -4,7 +4,7 @@
        Try
            Dim con As String
            If chkbxUserAut.Checked Then
-                con = "Data Source=" & Me.txtServer.Text & ";Initial Catalog=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;"
+                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;"
            Else
                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";"
            End If
--- a/app/DD-Record-Organiser/frmConnections.vb
+++ b/app/DD-Record-Organiser/frmConnections.vb
@@ -128,7 +128,7 @@ Public Class frmConnections
                    Case "MS-SQLServer"
                        Dim con As String
                        If CheckBoxwin_aut.Checked Then
-                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
+                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
                        Else
                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";User Id=" & Me.USERNAMETextBox.Text & ";Password=" & Me.PASSWORDTextBox.Text & ";"
                        End If
@@ -193,9 +193,10 @@ Public Class frmConnections
                    Case "MS-SQLServer"
                        Dim con As String
                        If CheckBoxwin_aut.Checked Then
-                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
+                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
                        Else
                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";User Id=" & Me.USERNAMETextBox.Text & ";Password=" & Me.PASSWORDTextBox.Text & ";"
+
                        End If
                        'csb.DataSource = Me.txtDataSource.Text
                        'csb.IntegratedSecurity = False
--- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
@@ -236,7 +236,7 @@ Partial Class frmForm_Constructor
        Me.GridControlParentEntity.Location = New System.Drawing.Point(3, 3)
        Me.GridControlParentEntity.MainView = Me.GridViewParentEntity
        Me.GridControlParentEntity.Name = "GridControlParentEntity"
-        Me.GridControlParentEntity.Size = New System.Drawing.Size(298, 294)
+        Me.GridControlParentEntity.Size = New System.Drawing.Size(295, 297)
        Me.GridControlParentEntity.TabIndex = 14
        Me.GridControlParentEntity.TabStop = False
        Me.GridControlParentEntity.UseEmbeddedNavigator = True
@@ -716,7 +716,7 @@ Partial Class frmForm_Constructor
        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(396, 270)
+        Me.Button1.Location = New System.Drawing.Point(393, 273)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(98, 27)
        Me.Button1.TabIndex = 18
@@ -732,9 +732,9 @@ Partial Class frmForm_Constructor
        Me.btnRefreshPEntity.FlatAppearance.BorderColor = System.Drawing.Color.DarkOrange
        Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 302)
+        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 305)
        Me.btnRefreshPEntity.Name = "btnRefreshPEntity"
-        Me.btnRefreshPEntity.Size = New System.Drawing.Size(491, 31)
+        Me.btnRefreshPEntity.Size = New System.Drawing.Size(488, 31)
        Me.btnRefreshPEntity.TabIndex = 17
        Me.btnRefreshPEntity.Text = "Parent-Datensatz aktualisieren"
        Me.btnRefreshPEntity.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -746,7 +746,7 @@ Partial Class frmForm_Constructor
        Me.lblParentID.AutoSize = True
        Me.lblParentID.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblParentID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lblParentID.Location = New System.Drawing.Point(307, 38)
+        Me.lblParentID.Location = New System.Drawing.Point(304, 38)
        Me.lblParentID.Name = "lblParentID"
        Me.lblParentID.Size = New System.Drawing.Size(168, 16)
        Me.lblParentID.TabIndex = 16
@@ -757,7 +757,7 @@ Partial Class frmForm_Constructor
        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(307, 12)
+        Me.Label4.Location = New System.Drawing.Point(304, 12)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(160, 16)
        Me.Label4.TabIndex = 15
--- a/app/DD-Record-Organiser/frmForm_Constructor.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor.resx
@@ -157,7 +157,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAYABCQGAAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAYgBCQGIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@@ -22,15 +22,16 @@ Partial Class frmMain
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
-        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon()
-        Me.Timer1 = New System.Windows.Forms.Timer()
+        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_USER_ACTIVETableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
        Me.ribbonMain = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu()
+        Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
        Me.itemInfo = New DevExpress.XtraBars.BarButtonItem()
        Me.itemSettings = New DevExpress.XtraBars.BarButtonItem()
        Me.itemExit = New DevExpress.XtraBars.BarButtonItem()
@@ -65,7 +66,7 @@ Partial Class frmMain
        Me.RibbonPageGroupWindream = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
-        Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel()
+        Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
        Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
        Me.Button1 = New System.Windows.Forms.Button()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -441,7 +442,7 @@ Partial Class frmMain
        '
        'Button1
        '
-        Me.Button1.Location = New System.Drawing.Point(348, 33)
+        Me.Button1.Location = New System.Drawing.Point(381, 32)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(75, 23)
        Me.Button1.TabIndex = 3
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@@ -222,6 +222,11 @@ Public Class frmMain

    Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
+            If Environment.UserDomainName.ToLower.Contains("digitald") Then
+                Button1.Visible = True
+            Else
+                Button1.Visible = False
+            End If
            ' Form Titel setzen
            ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain")
            Me.Text = Application.ProductName
@@ -436,7 +441,7 @@ Public Class frmMain
    End Sub

    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim form As New XtraForm2()
+        Dim form As New frmConstructor_Main()
        form.Show()
    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmSQLEditor.Designer.vb
+++ b/app/DD-Record-Organiser/frmSQLEditor.Designer.vb
@@ -75,13 +75,14 @@ Partial Class frmSQLEditor
        '
        'Button1
        '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Button1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button1.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(960, 700)
+        Me.Button1.Location = New System.Drawing.Point(954, 517)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(266, 25)
+        Me.Button1.Size = New System.Drawing.Size(266, 33)
        Me.Button1.TabIndex = 1
        Me.Button1.Text = "Speichern"
        Me.Button1.UseVisualStyleBackColor = True
@@ -89,12 +90,14 @@ Partial Class frmSQLEditor
        'txtValue
        '
        Me.txtValue.AcceptsTab = True
+        Me.txtValue.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.txtValue.Font = New System.Drawing.Font("Consolas", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtValue.Location = New System.Drawing.Point(12, 181)
        Me.txtValue.Multiline = True
        Me.txtValue.Name = "txtValue"
        Me.txtValue.ScrollBars = System.Windows.Forms.ScrollBars.Both
-        Me.txtValue.Size = New System.Drawing.Size(1208, 226)
+        Me.txtValue.Size = New System.Drawing.Size(1208, 137)
        Me.txtValue.TabIndex = 2
        '
        'DD_DMSDataSet
@@ -167,10 +170,11 @@ Partial Class frmSQLEditor
        '
        'btnTestSQL
        '
+        Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnTestSQL.Image = Global.DD_Record_Organiser.My.Resources.Resources.Go
        Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnTestSQL.Location = New System.Drawing.Point(954, 413)
+        Me.btnTestSQL.Location = New System.Drawing.Point(954, 324)
        Me.btnTestSQL.Name = "btnTestSQL"
        Me.btnTestSQL.Size = New System.Drawing.Size(266, 29)
        Me.btnTestSQL.TabIndex = 7
@@ -213,6 +217,7 @@ Partial Class frmSQLEditor
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvPlaceholders.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
        DataGridViewCellStyle2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -232,9 +237,9 @@ Partial Class frmSQLEditor
        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
        Me.dgvPlaceholders.DefaultCellStyle = DataGridViewCellStyle3
        Me.dgvPlaceholders.Enabled = False
-        Me.dgvPlaceholders.Location = New System.Drawing.Point(9, 458)
+        Me.dgvPlaceholders.Location = New System.Drawing.Point(9, 361)
        Me.dgvPlaceholders.Name = "dgvPlaceholders"
-        Me.dgvPlaceholders.Size = New System.Drawing.Size(350, 236)
+        Me.dgvPlaceholders.Size = New System.Drawing.Size(349, 150)
        Me.dgvPlaceholders.TabIndex = 16
        '
        'colPlaceholder
@@ -254,6 +259,7 @@ Partial Class frmSQLEditor
        Me.dgvResult.AllowUserToDeleteRows = False
        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvResult.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
        DataGridViewCellStyle5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -271,17 +277,18 @@ Partial Class frmSQLEditor
        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
        Me.dgvResult.DefaultCellStyle = DataGridViewCellStyle6
-        Me.dgvResult.Location = New System.Drawing.Point(365, 458)
+        Me.dgvResult.Location = New System.Drawing.Point(365, 361)
        Me.dgvResult.Name = "dgvResult"
        Me.dgvResult.ReadOnly = True
-        Me.dgvResult.Size = New System.Drawing.Size(855, 236)
+        Me.dgvResult.Size = New System.Drawing.Size(854, 150)
        Me.dgvResult.TabIndex = 17
        '
        'Label5
        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
-        Me.Label5.Location = New System.Drawing.Point(362, 440)
+        Me.Label5.Location = New System.Drawing.Point(362, 343)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(55, 15)
        Me.Label5.TabIndex = 18
@@ -443,9 +450,10 @@ Partial Class frmSQLEditor
        '
        'Label1
        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
-        Me.Label1.Location = New System.Drawing.Point(6, 440)
+        Me.Label1.Location = New System.Drawing.Point(9, 343)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(132, 15)
        Me.Label1.TabIndex = 32
@@ -465,7 +473,7 @@ Partial Class frmSQLEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1238, 737)
+        Me.ClientSize = New System.Drawing.Size(1241, 549)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.GroupBox4)
--- a/app/DD-Record-Organiser/frmSQLEditor.vb
+++ b/app/DD-Record-Organiser/frmSQLEditor.vb
@@ -32,9 +32,15 @@ Public Class frmSQLEditor
    End Sub

    Private Sub Load_Connections()
-        'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
-        Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
-        Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_CONNECTION)
+        Try
+            'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
+            Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
+            Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_CONNECTION)
+        Catch ex As Exception
+            ClassLogger.Add(" - Unexpected Error in Load Connections - errpor: " & vbNewLine & ex.Message)
+            MsgBox("Unexpected Error in Load Connections: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+       
    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
@@ -108,12 +114,11 @@ Public Class frmSQLEditor

            Dim connectionString As String

-            connectionString = ClassHelper.GetConnectionString(connectionId)
+            connectionString = ClassDatabase.GetConnectionString(connectionId)

            If connectionString <> "" Then

-                If connectionString.Contains("Initial Catalog=") Then
-
+                If connectionString.StartsWith("Server=") And connectionString.Contains("Database=") Then
                    Dim sqlConnection As SqlClient.SqlConnection
                    Dim sqlCommand As SqlClient.SqlCommand
                    Dim sqlAdapter As New SqlClient.SqlDataAdapter
@@ -125,10 +130,11 @@ Public Class frmSQLEditor
                    sqlCommand = New SqlClient.SqlCommand(sql, sqlConnection)

                    sqlAdapter.SelectCommand = sqlCommand
-                    sqlAdapter.Fill(Dataset)
+                    sqlAdapter.Fill(dataset)

                    Return dataset
                Else
+                    If LogErrorsOnly = True Then ClassLogger.Add(" >> It's an Oracle-Connection (ExecuteWithConnection)", False)
                    Dim sqlConnection As OracleConnection
                    Dim sqlCommand As OracleCommand
                    Dim sqlAdapter As New OracleDataAdapter
@@ -140,7 +146,7 @@ Public Class frmSQLEditor
                    sqlCommand = New OracleCommand(sql, sqlConnection)

                    sqlAdapter.SelectCommand = sqlCommand
-                    sqlAdapter.Fill(Dataset)
+                    sqlAdapter.Fill(dataset)

                    Return dataset
                End If
@@ -284,4 +290,43 @@ Public Class frmSQLEditor
        txtValue.Text = sql

    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Try
+            Dim upd As String = "UPDATE TBPMO_CONTROL SET SQL_COMMAND_1 = '" & txtValue.Text & "', CONNECTION_ID_1 = " & cmbConnection.SelectedValue & ", CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_CONTROL_ID
+            If ClassDatabase.Execute_non_Query(upd, True) Then
+                MsgBox("SQL-Befehl erfolgreich gespeichert!", MsgBoxStyle.Exclamation)
+            End If
+        Catch ex As Exception
+            ClassLogger.Add(" - Unexpected Error in Save SQL-Command for control - error: " & vbNewLine & ex.Message)
+            MsgBox("Unexpected Error in Save SQL-Command for control - error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub frmSQLEditor_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        Try
+
+     
+            Dim connsql = "SELECT BEZEICHNUNG FROM TBDD_CONNECTION WHERE GUID = (SELECT CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE GUID = " & CURRENT_CONTROL_ID & ")"
+        Dim con_name = ClassDatabase.Execute_Scalar(connsql, True)
+
+        If IsDBNull(con_name) Then
+            If Me.DD_DMSDataSet.TBDD_CONNECTION.Rows.Count > 0 Then
+                cmbConnection.SelectedIndex = 0
+            End If
+            Else
+                If IsNothing(con_name) Then
+                    If Me.DD_DMSDataSet.TBDD_CONNECTION.Rows.Count > 0 Then
+                        cmbConnection.SelectedIndex = 0
+                    End If
+                Else
+                    cmbConnection.SelectedIndex = cmbConnection.FindStringExact(con_name)
+                End If
+
+            End If
+        Catch ex As Exception
+            ClassLogger.Add(" - Unexpected Error in Get Connection for Control - error: " & vbNewLine & ex.Message)
+            MsgBox("Unexpected Error in Get Connection for Control - error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmSplash.vb
+++ b/app/DD-Record-Organiser/frmSplash.vb
@@ -31,7 +31,7 @@ Public NotInheritable Class frmSplash
        '
        '    Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build, My.Application.Info.Version.Revision)

-        Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor)
+        Version.Text = String.Format("Version {0}", My.Application.Info.Version.ToString)

        'Copyrightinformationen
        Copyright.Text = My.Application.Info.Copyright & " " & My.Application.Info.CompanyName
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -83,7 +83,7 @@
            <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
              <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="D:\Programme\DB\Oracle\ora12.1\Client\ODP.NET\managed\common\Oracle.ManagedDataAccess.dll" KeyPath="yes" />
            </Component>
-            
+                      
            <!-- SNAPPANEL Bibliothek -->
            <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
              <File Id="SnapPanelLib" Name="SnapPanelControl.dll" Source="SnapPanelControl.dll" KeyPath="yes" />
@@ -155,6 +155,7 @@
      <ComponentRef Id="DevExpressLibs" />
      <ComponentRef Id="ProgramMenuDir"/>
      <ComponentRef Id="RegistryEntries"/>
+      <ComponentRef Id="Oracle" />
    </Feature>

    <!-- Legt das Standard-Installationsverzeichnis fest-->