MS

2018-07-13 10:30:32 +02:00 · 2018-07-13 10:30:32 +02:00 · 2d11c3a677
commit 2d11c3a677
parent 8103f5d055
14 changed files with 1303 additions and 1621 deletions
--- a/app/DD-Record-Organizer/ClassDatabase.vb
+++ b/app/DD-Record-Organizer/ClassDatabase.vb
@ -28,7 +28,7 @@ Public Class ClassDatabase
            Dim DTConnection As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION WHERE GUID = " & id, True)
            If DTConnection.Rows.Count = 1 Then
                Select Case DTConnection.Rows(0).Item("SQL_PROVIDER")
-                    Case "MS-SQLServer"
+                    Case "MS-SQL"
                        If DTConnection.Rows(0).Item("USERNAME") = "WINAUTH" Then
                            connectionString = "Server=" & DTConnection.Rows(0).Item("SERVER") & ";Database=" & DTConnection.Rows(0).Item("DATENBANK") & ";Trusted_Connection=True;"
                        Else
--- a/app/DD-Record-Organizer/ClassInit.vb
+++ b/app/DD-Record-Organizer/ClassInit.vb
@ -105,7 +105,7 @@ Public Class ClassInit
            If KONFIG_DT.Rows.Count = 1 Then
                Try
                    MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING")
-                  
+
                Catch ex As Exception
                    MY_WIKISTRING = ""
                End Try
@ -115,12 +115,27 @@ Public Class ClassInit

            sql = "SELECT * FROM TBPMO_CONTROL"
            CURRENT_TBPMO_CONTROL = ClassDatabase.Return_Datatable(sql, True)
+
+            sql = String.Format("SELECT T")
+
+
        Catch ex As Exception
            MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try

    End Sub

+    Public Shared Sub Init_CONN_SWITCH()
+        Try
+            Dim sql = String.Format("SELECT T1.GUID, T.DESCRIPTION, T.SQL_CONNECTION, T.SQL_CONNECTION_PROXY, T.WM_ALIAS,T1.ACTIVE FROM " &
+                                    "TBPMO_CLIENT_CONNECTION_SWITCH T, TBPMO_CLIENT_CONN_SWITCH_USER T1 WHERE T.GUID = T1.CONN_SWITCH_ID " &
+                                    "And T.ACTIVE = 1 And T1.USER_ID = {0}", USER_GUID)
+            CURRENT_TBPMO_CONN_SWITCH = ClassDatabase.Return_Datatable(sql)
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in Init_CONN_SWITCH: " & ex.Message)
+        End Try
+    End Sub
+
    Public Shared Function InitUserLogin(Optional _User As String = "")
        Try
            If _User = "" Then
@ -158,7 +173,7 @@ Public Class ClassInit
                Else
                    Right_RO = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
                End If
-           
+

                If Right_RO = False Then
                    ClassLogger.Add("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
@ -172,6 +187,7 @@ Public Class ClassInit
                    Return False
                    'Me.Close()
                Else
+                    Init_CONN_SWITCH()
                    'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
                    DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID, False)
                    If DT_CLIENT_USER.Rows.Count > 1 Then
--- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
+++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj
@ -930,6 +930,7 @@
    </EmbeddedResource>
    <EmbeddedResource Include="frmConnections.resx">
      <DependentUpon>frmConnections.vb</DependentUpon>
+      <SubType>Designer</SubType>
    </EmbeddedResource>
    <EmbeddedResource Include="frmConstructorDesigner.en-US.resx">
      <DependentUpon>frmConstructorDesigner.vb</DependentUpon>
--- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
@ -96,6 +96,7 @@
    Public DTEXCLUDE_FILES As DataTable
    Public LANGUAGE_CHANGED As Boolean = False
    'DATATABLES
+    Public CURRENT_TBPMO_CONN_SWITCH As DataTable
    Public CURRENT_TBPMO_CONTROL As DataTable
    Public CURRENT_SCAN_TABLE As DataTable
    Public CURRENT_TASKS_GENERAL As DataTable
--- a/app/DD-Record-Organizer/frmConnections.Designer.vb
+++ b/app/DD-Record-Organizer/frmConnections.Designer.vb
@ -384,9 +384,11 @@ Partial Class frmConnections
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter
+        Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_LOG_ESSENTIALSTableAdapter = Nothing
        Me.TableAdapterManager.TBPMO_SAP_FUBATableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
--- a/app/DD-Record-Organizer/frmConnections.resx
+++ b/app/DD-Record-Organizer/frmConnections.resx
@ -1024,7 +1024,7 @@
    <value>Segoe UI, 8.25pt</value>
  </data>
  <data name="SQL_PROVIDERComboBox.Items" xml:space="preserve">
-    <value>MS-SQLServer</value>
+    <value>MS-SQL</value>
  </data>
  <data name="SQL_PROVIDERComboBox.Items1" xml:space="preserve">
    <value>Oracle</value>
@ -1206,6 +1206,9 @@
  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>895, 17</value>
  </metadata>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>en-US</value>
+  </metadata>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@ -1363,7 +1366,7 @@
    <value>DD_ECMAdmin</value>
  </data>
  <data name="&gt;&gt;DD_ECMAdmin.Type" xml:space="preserve">
-    <value>DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;BindingNavigatorCountItem.Name" xml:space="preserve">
    <value>BindingNavigatorCountItem</value>
@ -1441,13 +1444,13 @@
    <value>TBDD_CONNECTIONTableAdapter</value>
  </data>
  <data name="&gt;&gt;TBDD_CONNECTIONTableAdapter.Type" xml:space="preserve">
-    <value>DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_CONNECTIONTableAdapter, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_CONNECTIONTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
    <value>TableAdapterManager</value>
  </data>
  <data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
-    <value>DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmConnections</value>
--- a/app/DD-Record-Organizer/frmConnections.vb
+++ b/app/DD-Record-Organizer/frmConnections.vb
@ -47,7 +47,7 @@ Public Class frmConnections
            CheckBoxwin_aut.Visible = False
            chkOR_ohne_TNS.Visible = False
            Select Case Me.SQL_PROVIDERComboBox.SelectedItem
-                Case "MS-SQLServer"
+                Case "MS-SQL"
                    cmbDatabase.Items.Clear()
                    ' DATABASETextBox.Visible = False
                    Me.lblServer.Text = "Datenbank-Server (IP-Adresse oder Name)*:"
@ -148,7 +148,7 @@ Public Class frmConnections
                Cursor = Cursors.WaitCursor

                Select Case Me.SQL_PROVIDERComboBox.SelectedItem
-                    Case "MS-SQLServer"
+                    Case "MS-SQL"
                        Dim con As String
                        If CheckBoxwin_aut.Checked Then
                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
@ -235,7 +235,7 @@ Public Class frmConnections
            If Me.SQL_PROVIDERComboBox.SelectedIndex <> -1 Then

                Select Case Me.SQL_PROVIDERComboBox.SelectedItem
-                    Case "MS-SQLServer"
+                    Case "MS-SQL"
                        Dim con As String
                        If CheckBoxwin_aut.Checked Then
                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
@ -292,7 +292,7 @@ Public Class frmConnections
    Private Sub TBDD_CONNECTIONBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONBindingSource.CurrentChanged
        Me.lblSave.Visible = False
        Select Case Me.SQL_PROVIDERComboBox.SelectedItem
-            Case "MS-SQLServer"
+            Case "MS-SQL"
                cmbDatabase.Items.Clear()
                cmbDatabase.Items.Add(DATABASETextBox.Text)
                cmbDatabase.SelectedIndex = 0
@ -302,7 +302,7 @@ Public Class frmConnections

    Private Sub frmConnections_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        Select Case Me.SQL_PROVIDERComboBox.SelectedItem
-            Case "MS-SQLServer"
+            Case "MS-SQL"
                cmbDatabase.Items.Clear()
                cmbDatabase.Items.Add(DATABASETextBox.Text)
                cmbDatabase.SelectedIndex = 0
--- a/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructorDesigner.Designer.vb
@ -47,8 +47,8 @@ Partial Class frmConstructorDesigner
        Dim Label19 As System.Windows.Forms.Label
        Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label
        Dim SQL_RIGHT_WINDREAM_VIEWLabel As System.Windows.Forms.Label
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin()
        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
@ -1250,8 +1250,8 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvResult.AllowUserToAddRows = False
        Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
+        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        resources.ApplyResources(Me.dgvResult, "dgvResult")
        Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvResult.Name = "dgvResult"
@ -1261,8 +1261,8 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvPlaceholders.AllowUserToAddRows = False
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
        Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
--- a/app/DD-Record-Organizer/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organizer/frmConstructorDesigner.resx
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@ -534,7 +534,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>988, 212</value>
+    <value>981, 212</value>
  </data>
  <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@ -677,7 +677,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>988, 25</value>
+    <value>981, 25</value>
  </data>
  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -761,7 +761,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>699, 383</value>
+    <value>699, 376</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@ -791,7 +791,7 @@
    <value>0, 26</value>
  </data>
  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>562, 333</value>
+    <value>555, 326</value>
  </data>
  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
@ -838,10 +838,10 @@
    <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
  </data>
  <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 359</value>
+    <value>0, 352</value>
  </data>
  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>562, 24</value>
+    <value>555, 24</value>
  </data>
  <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -868,7 +868,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>562, 26</value>
+    <value>555, 26</value>
  </data>
  <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -889,7 +889,7 @@
    <value>Panel2</value>
  </data>
  <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 387</value>
+    <value>1270, 380</value>
  </data>
  <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@ -1065,7 +1065,7 @@
    <value>1</value>
  </data>
  <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 412</value>
+    <value>1270, 405</value>
  </data>
  <data name="TabDetails.Text" xml:space="preserve">
    <value>Detailansicht</value>
@ -1083,7 +1083,7 @@
    <value>0</value>
  </data>
  <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1276, 443</value>
+    <value>1276, 436</value>
  </data>
  <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@ -1101,7 +1101,7 @@
    <value>255, 128, 0</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 387</value>
+    <value>1270, 380</value>
  </data>
  <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -1355,7 +1355,7 @@
 </value>
  </data>
  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 412</value>
+    <value>1270, 405</value>
  </data>
  <data name="TabPos.Text" xml:space="preserve">
    <value>Positionen</value>
@ -1417,7 +1417,7 @@
    <value>Aqua</value>
  </data>
  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 387</value>
+    <value>1270, 380</value>
  </data>
  <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@ -1519,7 +1519,7 @@
    <value>1</value>
  </data>
  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 412</value>
+    <value>1270, 405</value>
  </data>
  <data name="TabWindream.Text" xml:space="preserve">
    <value>Dateien</value>
@ -1950,7 +1950,7 @@
    <value>2</value>
  </data>
  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 412</value>
+    <value>1270, 405</value>
  </data>
  <data name="TabFollowUp.Text" xml:space="preserve">
    <value>Wiedervorlage</value>
@ -2061,7 +2061,7 @@
    <value>5</value>
  </data>
  <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 387</value>
+    <value>1270, 380</value>
  </data>
  <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
    <value>90</value>
@ -2133,7 +2133,7 @@
    <value>1</value>
  </data>
  <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1270, 412</value>
+    <value>1270, 405</value>
  </data>
  <data name="TabPageVariant.Text" xml:space="preserve">
    <value>Vorgängervarianten</value>
--- a/app/DD-Record-Organizer/frmMain.Designer.vb
+++ b/app/DD-Record-Organizer/frmMain.Designer.vb
@ -77,10 +77,12 @@ Partial Class frmMain
        Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem()
        Me.StatusPersonifiedLogin = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItemSwitchCon = New DevExpress.XtraBars.BarButtonItem()
        Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.groupSearchAllOver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupConnManager = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.pageForms = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.groupQuickAccessForm2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.pageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage()
@ -192,9 +194,9 @@ Partial Class frmMain
        Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
        Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
        Me.ribbonMain.ExpandCollapseItem.Id = 0
-        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13})
+        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.BarButtonItem23, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon})
        resources.ApplyResources(Me.ribbonMain, "ribbonMain")
-        Me.ribbonMain.MaxItemId = 8
+        Me.ribbonMain.MaxItemId = 9
        Me.ribbonMain.Name = "ribbonMain"
        Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin})
        Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010
@ -540,9 +542,17 @@ Partial Class frmMain
        Me.BarButtonItem13.Id = 7
        Me.BarButtonItem13.Name = "BarButtonItem13"
        '
+        'BarButtonItemSwitchCon
+        '
+        resources.ApplyResources(Me.BarButtonItemSwitchCon, "BarButtonItemSwitchCon")
+        Me.BarButtonItemSwitchCon.Glyph = CType(resources.GetObject("BarButtonItemSwitchCon.Glyph"), System.Drawing.Image)
+        Me.BarButtonItemSwitchCon.Id = 8
+        Me.BarButtonItemSwitchCon.LargeGlyph = CType(resources.GetObject("BarButtonItemSwitchCon.LargeGlyph"), System.Drawing.Image)
+        Me.BarButtonItemSwitchCon.Name = "BarButtonItemSwitchCon"
+        '
        'pageHome
        '
-        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm, Me.groupSearchAllOver})
+        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm, Me.groupSearchAllOver, Me.RibbonPageGroupConnManager})
        Me.pageHome.Image = Global.DD_Record_Organizer.My.Resources.Resources.HomeHS
        Me.pageHome.Name = "pageHome"
        resources.ApplyResources(Me.pageHome, "pageHome")
@ -570,6 +580,13 @@ Partial Class frmMain
        Me.groupSearchAllOver.Name = "groupSearchAllOver"
        resources.ApplyResources(Me.groupSearchAllOver, "groupSearchAllOver")
        '
+        'RibbonPageGroupConnManager
+        '
+        Me.RibbonPageGroupConnManager.AllowTextClipping = False
+        Me.RibbonPageGroupConnManager.ItemLinks.Add(Me.BarButtonItemSwitchCon)
+        Me.RibbonPageGroupConnManager.Name = "RibbonPageGroupConnManager"
+        resources.ApplyResources(Me.RibbonPageGroupConnManager, "RibbonPageGroupConnManager")
+        '
        'pageForms
        '
        Me.pageForms.Appearance.BackColor = CType(resources.GetObject("pageForms.Appearance.BackColor"), System.Drawing.Color)
@ -779,5 +796,7 @@ Partial Class frmMain
    Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents itemScanInbox As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroupConnManager As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItemSwitchCon As DevExpress.XtraBars.BarButtonItem
 End Class

--- a/app/DD-Record-Organizer/frmMain.resx
+++ b/app/DD-Record-Organizer/frmMain.resx
@ -124,6 +124,18 @@
    <value>17, 56</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ADDIBeendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
+  </data>
+  <data name="ADDIBeendenToolStripMenuItem.Text" xml:space="preserve">
+    <value>ADDI beenden</value>
+  </data>
+  <data name="CockpitAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
+  </data>
+  <data name="CockpitAnzeigenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Cockpit anzeigen</value>
+  </data>
  <data name="cmsSystray.Size" type="System.Drawing.Size, System.Drawing">
    <value>166, 48</value>
  </data>
@ -1032,18 +1044,6 @@
  <data name="NotifyIcon.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="ADDIBeendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
-  <data name="ADDIBeendenToolStripMenuItem.Text" xml:space="preserve">
-    <value>ADDI beenden</value>
-  </data>
-  <data name="CockpitAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
-  <data name="CockpitAnzeigenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Cockpit anzeigen</value>
-  </data>
  <metadata name="TimerTasks.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1208, 17</value>
  </metadata>
@ -2284,6 +2284,105 @@
        rGVfvYI98TWlNa9PnJGLMGDjunfB71xCckbODKy2/jgAln/eXvihrcNlZ8s+M+l3XnAsLt75Z+/2Vnxq
        3VuxbKCBYrmRgXjPPNVdUWINbcGQISPf6BVwYl7NvE359uCFxlG70jtXN/HfF33ijFw4KcMCLMTblOF6
        z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="BarButtonItem23.Caption" xml:space="preserve">
+    <value>Synchronisation windream-Dateien</value>
+  </data>
+  <data name="BarButtonItem23.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
+  <data name="BarButtonItem23.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
 </value>
  </data>
  <data name="btnGlobalSearch.Caption" xml:space="preserve">
@ -2395,105 +2494,6 @@
        wqLj0c+lRxMLoJwoFOnR7OgBY/UIxOZ10lFccwVkCmP1cZXV/VhpcT2UpW7JQ9/Kh4WPXCQiLCQqkd6C
        X6NvUWGs8aCPmpBz0CRczCdxLA8m1bTXdNFQ2X1vOZ4oAMhPlaEK0Xj6clp5J6AxxFwA8No/K4uTvqJI
        kmkAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BarButtonItem23.Caption" xml:space="preserve">
-    <value>Synchronisation windream-Dateien</value>
-  </data>
-  <data name="BarButtonItem23.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="BarButtonItem23.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
 </value>
  </data>
  <data name="LabelProxyServer.Caption" xml:space="preserve">
@ -2568,31 +2568,131 @@
        hI8Iv/iOjwlU8AMC/eFBj1lqnr7LCkuzXtWAERHmEWFDImxgl8Po24kZPRsxw7XJprelRqRm6PS8SaCm
        qAiF1mkbvUefoUO9Irya+D8ZkGatT8Vts1+IW2czugQdqyxG50gWwyGQkE7Pv0Wdn0lERT8oLIWN1f6t
        vEpWbXyVrNr46gDzDwm9y+evWey0AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BarButtonItemSwitchCon.Caption" xml:space="preserve">
+    <value>BarButtonItem24</value>
+  </data>
+  <data name="BarButtonItemSwitchCon.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAENoYW5nZUhpc3Rvcnk7uXKDVQAA
+        AttJREFUOE91knsslWEcx1klyaUwotq6mKVphYTINXJYoiSXihWW5LjNZcKYzK3iVO53zW3haIqIE8ct
+        lw2tZEtyOcMoWWpu2bfnOTu11x/9ts/2Ps+ez/f3e9/nFQMgJipxwhaCBGE7QVLEDhFSIujzNoK40BUF
+        UFmCFdGSYBfXh/ME29geITYx3WBFd8E6qhPnItthGcGHMbsmhZ5nBmylcmmrgCz/XxOCGbT3DMA0pIVK
+        0mTrX4CkdUQ7rMLbhFiGteJs6BtYhPBgHtwMs6AmmAQ24vq9ZrR09OFM4GsqyTEDpKiY3voDHN4iEuvn
+        EVUlQHjFJKKqZxHNnUVE1SwM77xAA68Tp/3rqbSLGbCTduXwviOgbBbeuWPgPB/D/OIKAvJG4JX7Bd75
+        49D3qQW3gQc93zoqyTMDZOi4Dxq/wbdYADfOMMZnlrCxsYH+ka9wTX0P98xP0PWqRim3AdreXCopMANk
+        zci7JtbPCTs5JQ9heXUd6+u/sfRrBfbx/XBO/QDtG5XIL+PixM1nVFJkBsiZBDQipnYaHlmjcCQB/KFp
+        rK6tY27hp/AqHZKGcNy9DI8LynHMo4JKSsyA3UbslwivnIBL2kdcShqEa0I3llfW0NI/BavITrDIv6F5
+        tQTJmUXQuFZKJWVmgLzB7Tqwi0dJp0GwYt/CIZYPv0dd8OH0wPxuB8wiu6DhXID4tByouz6l0h5mgILe
+        rRp4Zg/DJq4XpuRGPgsW0PlOAMOgZhiHtcEwtA3ql3MRcz8Dak6FVNo0geJJzyq4pg3BIqoLRsE88Aem
+        kFI+AD3/JuiTtW5AMw5fzIJDYA5ULWMKiCOzaQIt8mHsE3thFMaHARFOsV9Bx68BOuwmaBO0/Bpx8EI6
+        VMyji8h5JcIWZoC0plvhpKZbCY66FOHIlXwybh7UHLOFXQ/ZZ+CA3RPst30o+CtTiRlAN6QJygRVEXtF
+        7BOhQpAlCGVaAMT+AAuAIOYsKVydAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BarButtonItemSwitchCon.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        z4m/8MJ/AHwVbV8goXKSAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="ribbonMain.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
+  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+    <value>Kalender</value>
+  </data>
+  <data name="groupQuickAccessForm.Text" xml:space="preserve">
+    <value>Views/Sichten</value>
+  </data>
+  <data name="groupSearchAllOver.Text" xml:space="preserve">
+    <value>Weitere Views</value>
+  </data>
+  <data name="RibbonPageGroupConnManager.Text" xml:space="preserve">
+    <value>Connection Manager</value>
+  </data>
  <data name="pageHome.Text" xml:space="preserve">
    <value>Home</value>
  </data>
  <data name="pageForms.Appearance.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Yellow</value>
  </data>
+  <data name="groupQuickAccessForm2.Text" xml:space="preserve">
+    <value>Views/Sichten</value>
+  </data>
  <data name="pageForms.Text" xml:space="preserve">
    <value>Weitere Sichten</value>
  </data>
+  <data name="RibbonPageGroupProgram.Text" xml:space="preserve">
+    <value>Programm Konfiguration</value>
+  </data>
+  <data name="RibbonPageGroupTask.Text" xml:space="preserve">
+    <value>Tasks und windream-Konfigurationen</value>
+  </data>
+  <data name="RibbonPageGroupMenue.Text" xml:space="preserve">
+    <value>Menü Konfiguration</value>
+  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Connections</value>
+  </data>
  <data name="pageAdmin.Text" xml:space="preserve">
    <value>Administration</value>
  </data>
  <data name="ribbonMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1492, 150</value>
+    <value>1500, 150</value>
  </data>
  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 791</value>
+    <value>0, 795</value>
  </data>
  <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1492, 23</value>
+    <value>1500, 23</value>
  </data>
  <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
    <value>RibbonStatusBar1</value>
@ -2618,30 +2718,6 @@
  <data name="&gt;&gt;ribbonMain.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
-  <data name="RibbonPageGroup2.Text" xml:space="preserve">
-    <value>Kalender</value>
-  </data>
-  <data name="groupQuickAccessForm.Text" xml:space="preserve">
-    <value>Views/Sichten</value>
-  </data>
-  <data name="groupSearchAllOver.Text" xml:space="preserve">
-    <value>Weitere Views</value>
-  </data>
-  <data name="groupQuickAccessForm2.Text" xml:space="preserve">
-    <value>Views/Sichten</value>
-  </data>
-  <data name="RibbonPageGroupProgram.Text" xml:space="preserve">
-    <value>Programm Konfiguration</value>
-  </data>
-  <data name="RibbonPageGroupTask.Text" xml:space="preserve">
-    <value>Tasks und windream-Konfigurationen</value>
-  </data>
-  <data name="RibbonPageGroupMenue.Text" xml:space="preserve">
-    <value>Menü Konfiguration</value>
-  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Connections</value>
-  </data>
  <metadata name="DefaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>242, 17</value>
  </metadata>
@ -2685,7 +2761,7 @@
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1492, 814</value>
+    <value>1500, 818</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@ -3891,6 +3967,12 @@
  <data name="&gt;&gt;BarButtonItem13.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarButtonItemSwitchCon.Name" xml:space="preserve">
+    <value>BarButtonItemSwitchCon</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItemSwitchCon.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;pageHome.Name" xml:space="preserve">
    <value>pageHome</value>
  </data>
@ -3915,6 +3997,12 @@
  <data name="&gt;&gt;groupSearchAllOver.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;RibbonPageGroupConnManager.Name" xml:space="preserve">
+    <value>RibbonPageGroupConnManager</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupConnManager.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;pageForms.Name" xml:space="preserve">
    <value>pageForms</value>
  </data>
--- a/app/DD-Record-Organizer/frmMain.vb
+++ b/app/DD-Record-Organizer/frmMain.vb
@ -120,8 +120,35 @@ Public Class frmMain
                MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            End Try
            Proxy_Server_Controls()
+            CONN_Manager
+
        End If
    End Sub
+    Sub CONN_Manager()
+        Try
+            RibbonPageGroupConnManager.Visible = False
+            If Not IsNothing(CURRENT_TBPMO_CONN_SWITCH) Then
+                If CURRENT_TBPMO_CONN_SWITCH.Rows.Count > 1 Then
+                    Dim dt2 As DataTable = CURRENT_TBPMO_CONN_SWITCH
+                    Dim dr2 As DataRow() = dt2.Select("ACTIVE = 0")
+                    Dim name = ""
+
+                    For Each row As DataRow In dr2
+                        name = row.Item("DESCRIPTION")
+                    Next
+                    If name <> "" Then
+                        BarButtonItemSwitchCon.Caption = "Switch Connection to: " & name
+                        RibbonPageGroupConnManager.Visible = True
+                    End If
+
+
+
+                End If
+            End If
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in CONN_Manager:" & ex.Message, True)
+        End Try
+    End Sub
    Sub Proxy_Server_Controls()
        If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
            'itemRefreshProxy.Visibility = BarItemVisibility.Always
@ -966,4 +993,44 @@ Public Class frmMain
    Private Sub BarButtonItem13_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem13.ItemClick
        OpenLogRecord()
    End Sub
+
+    Private Sub BarButtonItemSwitchCon_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItemSwitchCon.ItemClick
+        Try
+            Dim dt2 As DataTable = CURRENT_TBPMO_CONN_SWITCH
+            Dim drActive As DataRow() = dt2.Select("ACTIVE = 1")
+            Dim drInActive As DataRow() = dt2.Select("ACTIVE = 0")
+            Dim name = ""
+            Dim sqlcon = ""
+            Dim sqlcon_Proxy = ""
+            Dim WM_ALIAS = ""
+            Dim INACTIVE_GUID
+            For Each row As DataRow In drInActive
+                INACTIVE_GUID = row.Item("GUID")
+                name = row.Item("DESCRIPTION")
+                sqlcon = row.Item("SQL_CONNECTION")
+                sqlcon_Proxy = row.Item("SQL_CONNECTION_PROXY")
+                WM_ALIAS = row.Item("WM_ALIAS")
+            Next
+
+
+            If name <> "" Then
+                Dim result As MsgBoxResult
+                Dim msg = "Wollen Sie die Verbindungs-Konfiguration nun auf '" & name & "' ändern?"
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "Would You like to change the Connection-configuration to '" & name & "'?"
+                End If
+                result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                If result = MsgBoxResult.Yes Then
+                    BarButtonItemSwitchCon.Caption = "Switch Connection to: " & name
+                    Dim sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE GUID = {0}", INACTIVE_GUID)
+                    ClassDatabase.Execute_Scalar(sql)
+                    ClassInit.Init_CONN_SWITCH()
+
+                End If
+
+            End If
+        Catch ex As Exception
+
+        End Try
+    End Sub
 End Class
--- a/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb
+++ b/app/DD-Record-Organizer/frmUserKonfig_AddUsers.vb
@ -88,6 +88,7 @@ Public Class frmUserKonfig_AddUsers
        Dim group As String = lbGroups.SelectedItem
        Dim users As List(Of UserPrincipal) = GetUsersForGroup(group)
        DD_ECMAdmin.TBAD_Users.Clear()
+        Me.Cursor = Cursors.WaitCursor
        For Each user In users
            Dim newUserRow As DD_ECMAdmin.TBAD_UsersRow
            newUserRow = DD_ECMAdmin.TBAD_Users.NewTBAD_UsersRow
@ -102,90 +103,120 @@ Public Class frmUserKonfig_AddUsers
                    newUserRow.Username = user.ToString
                End Try
                Dim email As String = userldap.EmailAddress
-                newUserRow.Prename = PRENAME
-                newUserRow.Surname = NAME
-                newUserRow.Email = email
+                newUserRow.Prename = IIf((IsDBNull(PRENAME) Or IsNothing(PRENAME)), "", PRENAME)
+                newUserRow.Surname = IIf((IsDBNull(NAME) Or IsNothing(NAME)), "", NAME)
+                newUserRow.Email = IIf((IsDBNull(email) Or IsNothing(email)), "", email)
            Catch ex As Exception
                ClassLogger.Add("Unexpected Error in Read User LDAP-Configurations: " & vbNewLine)
            End Try
            DD_ECMAdmin.TBAD_Users.Rows.Add(newUserRow)
        Next
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub btnAddUsers_Click(sender As Object, e As EventArgs) Handles btnAddUsers.Click
-        'Dim items As CheckedListBox.CheckedItemCollection = clbUsers.CheckedItems
-        Dim usersAdded As Integer = 0
+        Dim _Step
+        Try
+            'Dim items As CheckedListBox.CheckedItemCollection = clbUsers.CheckedItems
+            Dim usersAdded As Integer = 0
+            Dim usersRefreshed As Integer = 0
+            'If items.Count = 0 Then
+            '    MsgBox("Keine Benutzer ausgewählt!", MsgBoxStyle.Information)
+            '    Exit Sub
+            'End If

-        'If items.Count = 0 Then
-        '    MsgBox("Keine Benutzer ausgewählt!", MsgBoxStyle.Information)
-        '    Exit Sub
-        'End If
+            For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
+                If row.Item(0) = CBool(True) Then
+                    _Step = 1
+                    Dim USERNAME As String
+                    USERNAME = row.Item(1)
+                    _Step = 2
+                    Dim PRENAME As String
+                    Try
+                        PRENAME = row.Item(2)
+                        _Step = 3
+                    Catch ex As Exception
+                        PRENAME = ""
+                    End Try
+                    Dim NAME As String
+                    _Step = 4
+                    Try
+                        NAME = row.Item(3)
+                        'IIf(IsDBNull(row.Item(3)), NAME = "", NAME = row.Item(3))
+                        _Step = 5
+                    Catch ex As Exception
+                        NAME = ""
+                    End Try

-        For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
-            If row.Item(0) = CBool(True) Then
-                Dim USERNAME As String = row.Item(1)
-                Dim PRENAME As String
-                Try
-                    PRENAME = row.Item(2)
-                Catch ex As Exception
-                    PRENAME = ""
-                End Try
-                Dim NAME As String = row.Item(3)
-                Try
-                    NAME = row.Item(3)
-                Catch ex As Exception
-                    NAME = ""
-                End Try
-
-                Dim email As String
-                Try
-                    email = row.Item(4)
-                Catch ex As Exception
-                    email = ""
-                End Try
-                Dim SQL
-                If Not UserExists(USERNAME) Then
-                    SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_RECORD_ORG,LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "','" & USER_USERNAME & "')"
-                    If ClassDatabase.Execute_non_Query(SQL, False) = True Then
-                        Dim ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_USER")
-                        Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, USERNAME)
-                        ClassLogger.Add(msg, False)
-                        ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace(">> ", ""))
-                        usersAdded = usersAdded + 1
-                    End If
-                Else
-                    SQL = String.Format("UPDATE TBDD_USER SET MODULE_RECORD_ORG = 1,PRENAME = '{0}', NAME = '{1}', EMAIL = '{2}' WHERE UPPER(USERNAME) = UPPER('{3}')", PRENAME, NAME, email, USERNAME)
-                    If ClassDatabase.Execute_non_Query(SQL, False) = True Then
-                        usersAdded = usersAdded + 1
+                    Dim email As String
+                    Try
+                        email = row.Item(4)
+                        ' IIf(IsDBNull(row.Item(4)), email = "", email = row.Item(4))
+                        _Step = 6
+                    Catch ex As Exception
+                        email = ""
+                    End Try
+                    Dim SQL
+                    If UserExists(USERNAME) = False Then
+                        _Step = 7
+                        SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_RECORD_ORG,LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "','" & USER_USERNAME & "')"
+                        _Step = 8
+                        If ClassDatabase.Execute_non_Query(SQL, False) = True Then
+                            _Step = 9
+                            Dim ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_USER")
+                            Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, USERNAME)
+                            _Step = 10
+                            ClassLogger.Add(msg, False)
+                            ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace(">> ", ""))
+                            usersAdded += 1
+                        Else
+                            MsgBox("Unexpected Error In Adding User (" & USERNAME & ") : " & "Check the log!", MsgBoxStyle.Exclamation)
+                        End If
+                    Else
+                        _Step = 11
+                        SQL = String.Format("UPDATE TBDD_USER SET MODULE_RECORD_ORG = 1,PRENAME = '{0}', NAME = '{1}', EMAIL = '{2}' WHERE UPPER(USERNAME) = UPPER('{3}')", PRENAME, NAME, email, USERNAME)
+                        _Step = 12
+                        If ClassDatabase.Execute_non_Query(SQL, False) = True Then
+                            usersRefreshed += 1
+                        End If
                    End If
                End If
+
+            Next
+            'For Each item As UserPrincipal In items
+            '    Dim user As UserPrincipal = item
+            '    Dim PRENAME As String = user.GivenName
+            '    Dim NAME As String = user.Surname
+            '    Dim USERNAME As String = user.SamAccountName
+            '    Dim email As String = user.EmailAddress
+            '    Dim SQL
+
+            'Next
+            If USER_LANGUAGE = "de-DE" Then
+                MsgBox(usersAdded & " Benutzer hinzugefügt." & vbNewLine & usersRefreshed & " Benutzer aktualisiert.", MsgBoxStyle.Information)
+            Else
+                MsgBox(usersAdded & " user(s) added." & vbNewLine & usersRefreshed & " user(s) refreshed.", MsgBoxStyle.Information)
            End If
+        Catch ex As Exception
+            MsgBox("Unexpected Error In Adding User (Step " & _Step.ToString & ") : " & vbNewLine & ex.Message)
+        End Try

-        Next
-        'For Each item As UserPrincipal In items
-        '    Dim user As UserPrincipal = item
-        '    Dim PRENAME As String = user.GivenName
-        '    Dim NAME As String = user.Surname
-        '    Dim USERNAME As String = user.SamAccountName
-        '    Dim email As String = user.EmailAddress
-        '    Dim SQL
-
-        'Next
-        If USER_LANGUAGE = "de-DE" Then
-            MsgBox(usersAdded & " Benutzer hinzugefügt/upgedatet!", MsgBoxStyle.Information)
-        Else
-            MsgBox(usersAdded & " User added/updatet!", MsgBoxStyle.Information)
-        End If
    End Sub

    Private Function UserExists(username As String) As Boolean
        Try
-            Dim SQL = "SELECT GUID FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER('" & username & "')"
-            If ClassDatabase.Execute_Scalar(SQL) = Nothing Then
-                Return False
-            Else
-                Return True
-            End If
+            Dim SQL = "SELECT * FROM TBDD_USER WHERE UPPER(USERNAME) = UPPER('" & username & "')"
+            Dim result As DataTable = ClassDatabase.Return_Datatable(SQL)
+
+            Select Case result.Rows.Count
+                Case 0
+                    Return False
+                Case 1
+                    Return True
+                Case Else
+                    MsgBox("Could not check whether user '" & username & "' exists!" & vbNewLine & SQL, MsgBoxStyle.Exclamation)
+            End Select
+
        Catch ex As Exception
            MsgBox("Error in UserExists: " & vbNewLine & ex.Message)
            Return False