MS_19.10

app/DD-Record-Organiser/frmConnections.vb

@@ -3,14 +3,14 @@
 
 Public Class frmConnections
 
-    Private Sub TBPMO_CONNECTIONBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_CONNECTIONBindingNavigatorSaveItem.Click
+    Private Sub TBDD_CONNECTIONBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONBindingNavigatorSaveItem.Click
         Try
             Me.Validate()
-            Me.TBPMO_CONNECTIONBindingSource.EndEdit()
-            If DD_DMSDataSet.TBPMO_CONNECTION.GetChanges Is Nothing = False Then
+            Me.TBDD_CONNECTIONBindingSource.EndEdit()
+            If DD_ECMAdmin.TBDD_CONNECTION.GetChanges Is Nothing = False Then
                 CHANGED_WHOTextBox.Text = Environment.UserName
-                TBPMO_CONNECTIONBindingSource.EndEdit()
-                TBPMO_CONNECTIONTableAdapter.Update(DD_DMSDataSet.TBPMO_CONNECTION)
+                TBDD_CONNECTIONBindingSource.EndEdit()
+                TBDD_CONNECTIONTableAdapter.Update(DD_ECMAdmin.TBDD_CONNECTION)
                 Me.lblSave.Visible = True
             Else
                 Me.lblSave.Visible = False
@@ -21,8 +21,10 @@ Public Class frmConnections
     End Sub
 
     Private Sub frmConnections_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBPMO_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
-        Me.TBPMO_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
+        'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_ECMAdmin.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
+
+        'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_ECMDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen.
+        Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
         Load_Connections()
     End Sub
 
@@ -32,7 +34,7 @@ Public Class frmConnections
 
     Sub Load_Connections()
         Try
-            Me.TBPMO_CONNECTIONTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_CONNECTION)
+            Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_ECMAdmin.TBDD_CONNECTION)
         Catch ex As Exception
             MsgBox("Error in Laod Form: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -45,7 +47,8 @@ Public Class frmConnections
             chkOR_ohne_TNS.Visible = False
             Select Case Me.SQL_PROVIDERComboBox.SelectedItem
                 Case "MS-SQLServer"
-
+                    cmbDatabase.Items.Clear()
+                    ' DATABASETextBox.Visible = False
                     Me.lblDataSource.Text = "Datenbank-Server (IP-Adresse oder Name)*:"
                     Me.lblInitialCatalog.Text = "Datenbank-Name:"
                     Me.SERVERTextBox.ReadOnly = False
@@ -54,12 +57,14 @@ Public Class frmConnections
                     Me.lblUserId.Text = "UserId:"
                     Me.lblPassword.Text = "Passwort:"
                     Me.lblInitialCatalog.Visible = False
+                    cmbDatabase.Items.Add(DATABASETextBox.Text)
                     'Me.DATENBANKTextBox.Visible = False
-                    Me.cmbInitialCatalog.Visible = True
+                    Me.cmbDatabase.Visible = True
                     'Me.lblDatenbank.Visible = True
                     CheckBoxwin_aut.Visible = True
                 Case "Oracle"
-                    Me.cmbInitialCatalog.Visible = False
+                    ' DATABASETextBox.Visible = True
+                    Me.cmbDatabase.Visible = False
                     Me.lblDataSource.Text = "IP Oracle-Server:"
                     Me.lblInitialCatalog.Text = "Servicename:"
                     Me.SERVERTextBox.ReadOnly = False
@@ -123,9 +128,9 @@ Public Class frmConnections
                     Case "MS-SQLServer"
                         Dim con As String
                         If CheckBoxwin_aut.Checked Then
-                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbInitialCatalog.Text & ";Trusted_Connection=True;"
+                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
                         Else
-                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbInitialCatalog.Text & ";User Id=" & Me.USERNAMETextBox.Text & ";Password=" & Me.PASSWORDTextBox.Text & ";"
+                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbDatabase.Text & ";User Id=" & Me.USERNAMETextBox.Text & ";Password=" & Me.PASSWORDTextBox.Text & ";"
                         End If
                         msg_string = con
                         Dim connection As New SqlClient.SqlConnection(con)
@@ -176,7 +181,7 @@ Public Class frmConnections
         Cursor = Cursors.Default
     End Sub
 
-    Private Sub cmbInitialCatalog_Click(sender As Object, e As EventArgs) Handles cmbInitialCatalog.Click
+    Private Sub cmbInitialCatalog_Click(sender As Object, e As EventArgs) Handles cmbDatabase.Click
         Get_MSSQL_Databases()
     End Sub
     Sub Get_MSSQL_Databases()
@@ -188,9 +193,9 @@ Public Class frmConnections
                     Case "MS-SQLServer"
                         Dim con As String
                         If CheckBoxwin_aut.Checked Then
-                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbInitialCatalog.Text & ";Trusted_Connection=True;"
+                            con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.cmbDatabase.Text & ";Trusted_Connection=True;"
                         Else
-                            con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.cmbInitialCatalog.Text & ";User Id=" & Me.USERNAMETextBox.Text & ";Password=" & Me.PASSWORDTextBox.Text & ";"
+                            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
@@ -207,11 +212,11 @@ Public Class frmConnections
                         ' Ausführen und Ergebnis in einer ListBox anzeigen
                         Dim dr As SqlClient.SqlDataReader = cmd.ExecuteReader
                         If dr.HasRows Then
-                            cmbInitialCatalog.Items.Clear()
+                            cmbDatabase.Items.Clear()
                             Do While dr.Read
-                                cmbInitialCatalog.Items.Add(dr("name"))
+                                cmbDatabase.Items.Add(dr("name"))
                             Loop
-                            cmbInitialCatalog.DroppedDown = True
+                            cmbDatabase.DroppedDown = True
                         End If
                 End Select
             End If
@@ -226,17 +231,10 @@ Public Class frmConnections
         End Try
     End Sub
 
-    Private Sub TBPMO_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_CONNECTIONBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBPMO_CONNECTION.ADDED_WHOColumn.DefaultValue = Environment.UserName
-        Me.DD_DMSDataSet.TBPMO_CONNECTION.ADDED_WHENColumn.DefaultValue = Date.Now
+    Private Sub TBDD_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs)
+        Me.DD_ECMAdmin.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName
+        Me.DD_ECMAdmin.TBDD_CONNECTION.ERSTELLTWANNColumn.DefaultValue = Date.Now
     End Sub
-
-   
-
-    Private Sub TBPMO_CONNECTIONBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_CONNECTIONBindingSource.CurrentChanged
-        Me.lblSave.Visible = False
-    End Sub
-
     Private Sub BEMERKUNGTextBox_TextChanged(sender As Object, e As EventArgs) Handles BEMERKUNGTextBox.TextChanged
         If BEMERKUNGTextBox.Text.Contains("without tnsnames") Then
             Me.chkOR_ohne_TNS.Checked = True
@@ -244,4 +242,24 @@ Public Class frmConnections
             Me.chkOR_ohne_TNS.Checked = False
         End If
     End Sub
+
+    Private Sub TBDD_CONNECTIONBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONBindingSource.CurrentChanged
+        Me.lblSave.Visible = False
+         Select Me.SQL_PROVIDERComboBox.SelectedItem
+            Case "MS-SQLServer"
+                cmbDatabase.Items.Clear()
+                cmbDatabase.Items.Add(DATABASETextBox.Text)
+                cmbDatabase.SelectedIndex = 0
+        End Select
+
+    End Sub
+
+    Private Sub frmConnections_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        Select Case Me.SQL_PROVIDERComboBox.SelectedItem
+            Case "MS-SQLServer"
+                cmbDatabase.Items.Clear()
+                cmbDatabase.Items.Add(DATABASETextBox.Text)
+                cmbDatabase.SelectedIndex = 0
+        End Select
+    End Sub
 End Class