From 10dfab4cf5a295551915e295c36bb8935be1f1d4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 24 Apr 2018 13:26:49 +0200 Subject: [PATCH] jj: Remove refs to TBPM_CONNECTION, replace with TBDD_CONNECTION --- .../DD_DMSLiteDataSet.Designer.vb | 15 ++- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 83 +++++------- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 30 ++--- app/DD_PM_WINDREAM/frmConnection.Designer.vb | 118 +++++++++--------- app/DD_PM_WINDREAM/frmConnection.resx | 6 +- app/DD_PM_WINDREAM/frmConnection.vb | 26 ++-- app/DD_PM_WINDREAM/frmValidator.Designer.vb | 8 +- app/DD_PM_WINDREAM/frmValidator.vb | 10 +- 8 files changed, 141 insertions(+), 155 deletions(-) diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index f01b184..800abce 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -15595,7 +15595,7 @@ Namespace DD_DMSLiteDataSetTableAdapters " (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERK"& _ "UNG,@AKTIV,@ERSTELLTWER); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DA"& _ "TENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDE"& _ - "RTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" + "RTWER, GEAENDERTWANN FROM TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY())" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_PROVIDER", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_PROVIDER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -15841,7 +15841,7 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function CmdInsert(ByVal BEZEICHNUNG As String, ByVal SQL_PROVIDER As String, ByVal SERVER As String, ByVal DATENBANK As String, ByVal USERNAME As String, ByVal PASSWORD As String, ByVal BEMERKUNG As String, ByVal AKTIV As Boolean, ByVal ERSTELLTWER As String) As Integer + Public Overloads Overridable Function CmdInsert(ByVal BEZEICHNUNG As String, ByVal SQL_PROVIDER As String, ByVal SERVER As String, ByVal DATENBANK As String, ByVal USERNAME As String, ByVal PASSWORD As String, ByVal BEMERKUNG As String, ByVal AKTIV As Boolean, ByVal ERSTELLTWER As String) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) If (BEZEICHNUNG Is Nothing) Then command.Parameters(0).Value = Global.System.DBNull.Value @@ -15889,15 +15889,20 @@ Namespace DD_DMSLiteDataSetTableAdapters <> Global.System.Data.ConnectionState.Open) Then command.Connection.Open End If - Dim returnValue As Integer + Dim returnValue As Object Try - returnValue = command.ExecuteNonQuery + returnValue = command.ExecuteScalar Finally If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then command.Connection.Close End If End Try - Return returnValue + If ((returnValue Is Nothing) _ + OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then + Return Nothing + Else + Return CType(returnValue,Object) + End If End Function End Class diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 35cc7e4..c031bb1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -833,42 +833,23 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B - - - - INSERT INTO TBPM_CONNECTION - (BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER) -VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); -SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - + INSERT INTO TBDD_CONNECTION (BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER) VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD,@BEMERKUNG,@AKTIV,@ERSTELLTWER); -SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBPM_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) +SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - + + + + + + + + + @@ -1919,7 +1900,7 @@ WHERE (GUID = @GUID) - + @@ -1964,7 +1945,7 @@ WHERE (GUID = @GUID) - + @@ -2067,7 +2048,7 @@ WHERE (GUID = @GUID) - + @@ -2163,7 +2144,7 @@ WHERE (GUID = @GUID) - + @@ -2214,7 +2195,7 @@ WHERE (GUID = @GUID) - + @@ -2244,7 +2225,7 @@ WHERE (GUID = @GUID) - + @@ -2267,7 +2248,7 @@ WHERE (GUID = @GUID) - + @@ -2356,7 +2337,7 @@ WHERE (GUID = @GUID) - + @@ -2429,7 +2410,7 @@ WHERE (GUID = @GUID) - + @@ -2465,7 +2446,7 @@ WHERE (GUID = @GUID) - + @@ -2480,7 +2461,7 @@ WHERE (GUID = @GUID) - + @@ -2501,7 +2482,7 @@ WHERE (GUID = @GUID) - + @@ -2609,7 +2590,7 @@ WHERE (GUID = @GUID) - + @@ -2682,7 +2663,7 @@ WHERE (GUID = @GUID) - + @@ -2733,7 +2714,7 @@ WHERE (GUID = @GUID) - + @@ -2824,7 +2805,7 @@ WHERE (GUID = @GUID) - + @@ -2955,11 +2936,11 @@ WHERE (GUID = @GUID) - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 135f5c1..5a552ab 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - - - - + + + + + - - - - + + + + @@ -52,7 +52,7 @@ - + 515 @@ -64,7 +64,7 @@ - + 844 @@ -80,7 +80,7 @@ - + 141 diff --git a/app/DD_PM_WINDREAM/frmConnection.Designer.vb b/app/DD_PM_WINDREAM/frmConnection.Designer.vb index c1154da..ba8e5f2 100644 --- a/app/DD_PM_WINDREAM/frmConnection.Designer.vb +++ b/app/DD_PM_WINDREAM/frmConnection.Designer.vb @@ -30,7 +30,7 @@ Partial Class frmConnection Me.chkOR_ohne_TNS = New System.Windows.Forms.CheckBox() Me.Chckwin_aut = New System.Windows.Forms.CheckBox() Me.txtBezeichnung = New System.Windows.Forms.TextBox() - Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.Label1 = New System.Windows.Forms.Label() Me.btnCheck_Con = New System.Windows.Forms.Button() @@ -46,7 +46,7 @@ Partial Class frmConnection Me.lblDatenbanktyp = New System.Windows.Forms.Label() Me.txtDatasource2 = New System.Windows.Forms.TextBox() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBPM_CONNECTIONBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) + Me.TBDD_CONNECTIONBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() @@ -57,9 +57,9 @@ Partial Class frmConnection Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.TBPM_CONNECTIONBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() + Me.TBDD_CONNECTIONBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() - Me.TBPM_CONNECTIONDataGridView = New System.Windows.Forms.DataGridView() + Me.TBDD_CONNECTIONDataGridView = New System.Windows.Forms.DataGridView() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -76,11 +76,11 @@ Partial Class frmConnection Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() GEANDERTWERLabel = New System.Windows.Forms.Label() GEAENDERTWANNLabel = New System.Windows.Forms.Label() - CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_CONNECTIONBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TBPM_CONNECTIONBindingNavigator.SuspendLayout() - CType(Me.TBPM_CONNECTIONDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_CONNECTIONBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TBDD_CONNECTIONBindingNavigator.SuspendLayout() + CType(Me.TBDD_CONNECTIONDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpbx_ConnAdd.SuspendLayout() Me.SuspendLayout() ' @@ -134,10 +134,10 @@ Partial Class frmConnection Me.txtBezeichnung.Size = New System.Drawing.Size(294, 25) Me.txtBezeichnung.TabIndex = 41 ' - 'TBPM_CONNECTIONBindingSource + 'TBDD_CONNECTIONBindingSource ' - Me.TBPM_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" - Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet + Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" + Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' 'DD_DMSLiteDataSet ' @@ -309,24 +309,24 @@ Partial Class frmConnection Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'TBPM_CONNECTIONBindingNavigator - ' - Me.TBPM_CONNECTIONBindingNavigator.AddNewItem = Nothing - Me.TBPM_CONNECTIONBindingNavigator.BindingSource = Me.TBPM_CONNECTIONBindingSource - Me.TBPM_CONNECTIONBindingNavigator.CountItem = Me.BindingNavigatorCountItem - Me.TBPM_CONNECTIONBindingNavigator.CountItemFormat = "von {0} Connections" - Me.TBPM_CONNECTIONBindingNavigator.DeleteItem = Nothing - Me.TBPM_CONNECTIONBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.ToolStripButton1, Me.TBPM_CONNECTIONBindingNavigatorSaveItem, Me.ToolStripButton2}) - Me.TBPM_CONNECTIONBindingNavigator.Location = New System.Drawing.Point(0, 0) - Me.TBPM_CONNECTIONBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem - Me.TBPM_CONNECTIONBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem - Me.TBPM_CONNECTIONBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem - Me.TBPM_CONNECTIONBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem - Me.TBPM_CONNECTIONBindingNavigator.Name = "TBPM_CONNECTIONBindingNavigator" - Me.TBPM_CONNECTIONBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBPM_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(838, 25) - Me.TBPM_CONNECTIONBindingNavigator.TabIndex = 53 - Me.TBPM_CONNECTIONBindingNavigator.Text = "BindingNavigator1" + 'TBDD_CONNECTIONBindingNavigator + ' + Me.TBDD_CONNECTIONBindingNavigator.AddNewItem = Nothing + Me.TBDD_CONNECTIONBindingNavigator.BindingSource = Me.TBDD_CONNECTIONBindingSource + Me.TBDD_CONNECTIONBindingNavigator.CountItem = Me.BindingNavigatorCountItem + Me.TBDD_CONNECTIONBindingNavigator.CountItemFormat = "von {0} Connections" + Me.TBDD_CONNECTIONBindingNavigator.DeleteItem = Nothing + Me.TBDD_CONNECTIONBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.ToolStripButton1, Me.TBDD_CONNECTIONBindingNavigatorSaveItem, Me.ToolStripButton2}) + Me.TBDD_CONNECTIONBindingNavigator.Location = New System.Drawing.Point(0, 0) + Me.TBDD_CONNECTIONBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem + Me.TBDD_CONNECTIONBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem + Me.TBDD_CONNECTIONBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem + Me.TBDD_CONNECTIONBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem + Me.TBDD_CONNECTIONBindingNavigator.Name = "TBDD_CONNECTIONBindingNavigator" + Me.TBDD_CONNECTIONBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem + Me.TBDD_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(838, 25) + Me.TBDD_CONNECTIONBindingNavigator.TabIndex = 53 + Me.TBDD_CONNECTIONBindingNavigator.Text = "BindingNavigator1" ' 'BindingNavigatorCountItem ' @@ -407,10 +407,10 @@ Partial Class frmConnection ' 'TBPM_CONNECTIONBindingNavigatorSaveItem ' - Me.TBPM_CONNECTIONBindingNavigatorSaveItem.Image = CType(resources.GetObject("TBPM_CONNECTIONBindingNavigatorSaveItem.Image"), System.Drawing.Image) - Me.TBPM_CONNECTIONBindingNavigatorSaveItem.Name = "TBPM_CONNECTIONBindingNavigatorSaveItem" - Me.TBPM_CONNECTIONBindingNavigatorSaveItem.Size = New System.Drawing.Size(112, 22) - Me.TBPM_CONNECTIONBindingNavigatorSaveItem.Text = "Daten speichern" + Me.TBDD_CONNECTIONBindingNavigatorSaveItem.Image = CType(resources.GetObject("TBDD_CONNECTIONBindingNavigatorSaveItem.Image"), System.Drawing.Image) + Me.TBDD_CONNECTIONBindingNavigatorSaveItem.Name = "TBDD_CONNECTIONBindingNavigatorSaveItem" + Me.TBDD_CONNECTIONBindingNavigatorSaveItem.Size = New System.Drawing.Size(112, 22) + Me.TBDD_CONNECTIONBindingNavigatorSaveItem.Text = "Daten speichern" ' 'ToolStripButton2 ' @@ -423,22 +423,22 @@ Partial Class frmConnection ' 'TBPM_CONNECTIONDataGridView ' - Me.TBPM_CONNECTIONDataGridView.AllowUserToAddRows = False - Me.TBPM_CONNECTIONDataGridView.AllowUserToDeleteRows = False + Me.TBDD_CONNECTIONDataGridView.AllowUserToAddRows = False + Me.TBDD_CONNECTIONDataGridView.AllowUserToDeleteRows = False DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.TBPM_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.TBPM_CONNECTIONDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Me.TBDD_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.TBDD_CONNECTIONDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TBPM_CONNECTIONDataGridView.AutoGenerateColumns = False - Me.TBPM_CONNECTIONDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.TBPM_CONNECTIONDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn8, Me.DataGridViewCheckBoxColumn1}) - Me.TBPM_CONNECTIONDataGridView.DataSource = Me.TBPM_CONNECTIONBindingSource - Me.TBPM_CONNECTIONDataGridView.Location = New System.Drawing.Point(15, 303) - Me.TBPM_CONNECTIONDataGridView.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.TBPM_CONNECTIONDataGridView.Name = "TBPM_CONNECTIONDataGridView" - Me.TBPM_CONNECTIONDataGridView.Size = New System.Drawing.Size(817, 276) - Me.TBPM_CONNECTIONDataGridView.TabIndex = 53 + Me.TBDD_CONNECTIONDataGridView.AutoGenerateColumns = False + Me.TBDD_CONNECTIONDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.TBDD_CONNECTIONDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn8, Me.DataGridViewCheckBoxColumn1}) + Me.TBDD_CONNECTIONDataGridView.DataSource = Me.TBDD_CONNECTIONBindingSource + Me.TBDD_CONNECTIONDataGridView.Location = New System.Drawing.Point(15, 303) + Me.TBDD_CONNECTIONDataGridView.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.TBDD_CONNECTIONDataGridView.Name = "TBDD_CONNECTIONDataGridView" + Me.TBDD_CONNECTIONDataGridView.Size = New System.Drawing.Size(817, 276) + Me.TBDD_CONNECTIONDataGridView.TabIndex = 53 ' 'DataGridViewTextBoxColumn1 ' @@ -491,7 +491,7 @@ Partial Class frmConnection ' 'GEANDERTWERTextBox ' - Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONNECTIONBindingSource, "GEANDERTWER", True)) + Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEANDERTWER", True)) Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(504, 270) Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" Me.GEANDERTWERTextBox.ReadOnly = True @@ -550,7 +550,7 @@ Partial Class frmConnection ' 'GEAENDERTWANNTextBox ' - Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONNECTIONBindingSource, "GEAENDERTWANN", True)) + Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEAENDERTWANN", True)) Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(657, 270) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" Me.GEAENDERTWANNTextBox.ReadOnly = True @@ -571,18 +571,18 @@ Partial Class frmConnection Me.Controls.Add(Me.grpbx_ConnAdd) Me.Controls.Add(GEANDERTWERLabel) Me.Controls.Add(Me.GEANDERTWERTextBox) - Me.Controls.Add(Me.TBPM_CONNECTIONDataGridView) - Me.Controls.Add(Me.TBPM_CONNECTIONBindingNavigator) + Me.Controls.Add(Me.TBDD_CONNECTIONDataGridView) + Me.Controls.Add(Me.TBDD_CONNECTIONBindingNavigator) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Name = "frmConnection" Me.Text = "Verwaltung der Connections" - CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_CONNECTIONBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() - Me.TBPM_CONNECTIONBindingNavigator.ResumeLayout(False) - Me.TBPM_CONNECTIONBindingNavigator.PerformLayout() - CType(Me.TBPM_CONNECTIONDataGridView, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_CONNECTIONBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() + Me.TBDD_CONNECTIONBindingNavigator.ResumeLayout(False) + Me.TBDD_CONNECTIONBindingNavigator.PerformLayout() + CType(Me.TBDD_CONNECTIONDataGridView, System.ComponentModel.ISupportInitialize).EndInit() Me.grpbx_ConnAdd.ResumeLayout(False) Me.grpbx_ConnAdd.PerformLayout() Me.ResumeLayout(False) @@ -602,9 +602,9 @@ Partial Class frmConnection Friend WithEvents lblDatenbanktyp As System.Windows.Forms.Label Friend WithEvents txtDatasource2 As System.Windows.Forms.TextBox Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet - Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource + Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager - Friend WithEvents TBPM_CONNECTIONBindingNavigator As System.Windows.Forms.BindingNavigator + Friend WithEvents TBDD_CONNECTIONBindingNavigator As System.Windows.Forms.BindingNavigator Friend WithEvents BindingNavigatorCountItem As System.Windows.Forms.ToolStripLabel Friend WithEvents BindingNavigatorMoveFirstItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorMovePreviousItem As System.Windows.Forms.ToolStripButton @@ -614,8 +614,8 @@ Partial Class frmConnection Friend WithEvents BindingNavigatorMoveNextItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorMoveLastItem As System.Windows.Forms.ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents TBPM_CONNECTIONBindingNavigatorSaveItem As System.Windows.Forms.ToolStripButton - Friend WithEvents TBPM_CONNECTIONDataGridView As System.Windows.Forms.DataGridView + Friend WithEvents TBDD_CONNECTIONBindingNavigatorSaveItem As System.Windows.Forms.ToolStripButton + Friend WithEvents TBDD_CONNECTIONDataGridView As System.Windows.Forms.DataGridView Friend WithEvents txtBezeichnung As System.Windows.Forms.TextBox Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents chkOR_ohne_TNS As System.Windows.Forms.CheckBox diff --git a/app/DD_PM_WINDREAM/frmConnection.resx b/app/DD_PM_WINDREAM/frmConnection.resx index e99f58f..d63176d 100644 --- a/app/DD_PM_WINDREAM/frmConnection.resx +++ b/app/DD_PM_WINDREAM/frmConnection.resx @@ -123,7 +123,7 @@ False - + 179, 17 @@ -149,7 +149,7 @@ 424, 17 - + 597, 17 @@ -192,7 +192,7 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAAi9JREFUOE+tkt1L01EYx3//QvfdBF10W1NjOBerwa9cQ1k2DCvCXn6RZmm6TBMV diff --git a/app/DD_PM_WINDREAM/frmConnection.vb b/app/DD_PM_WINDREAM/frmConnection.vb index b876f6b..1293d77 100644 --- a/app/DD_PM_WINDREAM/frmConnection.vb +++ b/app/DD_PM_WINDREAM/frmConnection.vb @@ -131,19 +131,19 @@ Public Class frmConnection End Try End Sub - Private Sub TBPM_CONNECTIONBindingNavigatorSaveItem_Click(sender As System.Object, e As System.EventArgs) Handles TBPM_CONNECTIONBindingNavigatorSaveItem.Click + Private Sub TBDD_CONNECTIONBindingNavigatorSaveItem_Click(sender As System.Object, e As System.EventArgs) Handles TBDD_CONNECTIONBindingNavigatorSaveItem.Click Try - Me.TBPM_CONNECTIONBindingSource.EndEdit() + Me.TBDD_CONNECTIONBindingSource.EndEdit() If DD_DMSLiteDataSet.TBDD_CONNECTION.GetChanges Is Nothing = False Then Me.GEANDERTWERTextBox.Text = Environment.UserName - Me.TBPM_CONNECTIONBindingSource.EndEdit() + Me.TBDD_CONNECTIONBindingSource.EndEdit() Me.TBDD_CONNECTIONTableAdapter.Update(DD_DMSLiteDataSet.TBDD_CONNECTION) MsgBox("Änderungen wurden erfolgreich gespeichert!", MsgBoxStyle.Information) End If Catch ex As Exception MsgBox("Fehler beim Speichern: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try - + End Sub Private Sub frmConnection_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load @@ -157,7 +157,7 @@ Public Class frmConnection Sub load_connections() Try Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) - TBPM_CONNECTIONDataGridView.AutoResizeColumns() + TBDD_CONNECTIONDataGridView.AutoResizeColumns() Catch ex As Exception MsgBox("Fehler bei Connections laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -180,12 +180,12 @@ Public Class frmConnection formloaded = True End Sub - Private Sub TBPM_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPM_CONNECTIONBindingSource.AddingNew + Private Sub TBDD_CONNECTIONBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CONNECTIONBindingSource.AddingNew DD_DMSLiteDataSet.TBDD_CONNECTION.ERSTELLTWERColumn.DefaultValue = Environment.UserName End Sub - Private Sub TBPM_CONNECTIONBindingSource_PositionChanged(sender As Object, e As EventArgs) Handles TBPM_CONNECTIONBindingSource.PositionChanged - + Private Sub TBDD_CONNECTIONBindingSource_PositionChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONBindingSource.PositionChanged + End Sub Private Sub chkOR_ohne_TNS_CheckedChanged(sender As Object, e As EventArgs) Handles chkOR_ohne_TNS.CheckedChanged @@ -200,7 +200,7 @@ Public Class frmConnection End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click - TBPM_CONNECTIONBindingSource.AddNew() + TBDD_CONNECTIONBindingSource.AddNew() Me.grpbx_ConnAdd.Visible = True End Sub @@ -219,19 +219,19 @@ Public Class frmConnection Catch ex As Exception MsgBox("Fehler bei Insert Connection: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + load_connections() End Sub - Private Sub TBPM_CONNECTIONDataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles TBPM_CONNECTIONDataGridView.SelectionChanged + Private Sub TBDD_CONNECTIONDataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONDataGridView.SelectionChanged grpbx_ConnAdd.Visible = False End Sub Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click Try Dim i, ID As Integer - i = TBPM_CONNECTIONDataGridView.CurrentRow.Index - ID = TBPM_CONNECTIONDataGridView.Item(0, i).Value + i = TBDD_CONNECTIONDataGridView.CurrentRow.Index + ID = TBDD_CONNECTIONDataGridView.Item(0, i).Value If ID > 0 Then Dim result As MsgBoxResult = MsgBox("Wollen Sie die Connection wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") ' wenn Löschen ja diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index c7ed1e6..cc5514e 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -48,7 +48,7 @@ Partial Class frmValidator Me.pnldesigner = New System.Windows.Forms.Panel() Me.VWPM_PROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() + Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_FILES_USER_NOT_INDEXEDTableAdapter() Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() @@ -397,7 +397,7 @@ Partial Class frmValidator ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter @@ -411,7 +411,7 @@ Partial Class frmValidator ' 'TBPM_CONNECTIONTableAdapter ' - Me.TBPM_CONNECTIONTableAdapter.ClearBeforeFill = True + Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True ' 'TBPM_CONTROL_TABLETableAdapter ' @@ -1099,7 +1099,7 @@ Partial Class frmValidator Friend WithEvents TBPM_FILES_USER_NOT_INDEXEDBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter + Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents TBPM_PROFILE_FILESBindingSource As System.Windows.Forms.BindingSource diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 7534032..1d42551 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -300,7 +300,7 @@ Public Class frmValidator DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID) TBPM_FILES_USER_NOT_INDEXEDTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString - TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString + TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = MyConnectionString TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString @@ -311,7 +311,7 @@ Public Class frmValidator VWPM_PROFILE_USERTableAdapter.FillByName(DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName) VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName) - TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) + TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False) Catch ex As Exception MsgBox("Error LOADING profile-data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") @@ -427,7 +427,7 @@ Public Class frmValidator Exit Sub End If - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConnectionId) + TBDD_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConnectionId) Dim connectionString As String @@ -548,7 +548,7 @@ Public Class frmValidator If ConID > 0 And commandsql <> "" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False) Dim connectionString As String - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) + TBDD_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBDD_CONNECTION Dim drConnection As DataRow For Each drConnection In DTConnection.Rows @@ -776,7 +776,7 @@ Public Class frmValidator If ConID > 0 And commandsql <> "" Then If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False) Dim connectionString As String - TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) + TBDD_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBDD_CONNECTION, ConID) Dim DT As DataTable = DD_DMSLiteDataSet.TBDD_CONNECTION Dim drConnection As DataRow For Each drConnection In DT.Rows