diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index dc3406f..67d7be1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -4297,6 +4297,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true Me.columnBEZEICHNUNG.MaxLength = 100 + Me.columnSQL_PROVIDER.AllowDBNull = false Me.columnSQL_PROVIDER.MaxLength = 100 Me.columnSERVER.MaxLength = 150 Me.columnDATENBANK.MaxLength = 100 @@ -10487,11 +10488,7 @@ Partial Public Class DD_DMSLiteDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Public Property SQL_PROVIDER() As String Get - Try - Return CType(Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_PROVIDER in Tabelle TBDD_CONNECTION ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn),String) End Get Set Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = value @@ -10652,18 +10649,6 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBDD_CONNECTION.BEZEICHNUNGColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsSQL_PROVIDERNull() As Boolean - Return Me.IsNull(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) - End Function - - _ - Public Sub SetSQL_PROVIDERNull() - Me(Me.tableTBDD_CONNECTION.SQL_PROVIDERColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsSERVERNull() As Boolean @@ -17566,7 +17551,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.InsertCommand.Parameters(0).Value = CType(BEZEICHNUNG,String) End If If (SQL_PROVIDER Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_PROVIDER") Else Me.Adapter.InsertCommand.Parameters(1).Value = CType(SQL_PROVIDER,String) End If @@ -17627,7 +17612,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(0).Value = CType(BEZEICHNUNG,String) End If If (SQL_PROVIDER Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_PROVIDER") Else Me.Adapter.UpdateCommand.Parameters(1).Value = CType(SQL_PROVIDER,String) End If @@ -17690,7 +17675,7 @@ Namespace DD_DMSLiteDataSetTableAdapters command.Parameters(0).Value = CType(BEZEICHNUNG,String) End If If (SQL_PROVIDER Is Nothing) Then - command.Parameters(1).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_PROVIDER") Else command.Parameters(1).Value = CType(SQL_PROVIDER,String) End If diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc index 5716e53..9ce6340 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -46,14 +46,18 @@ - + + - + + - + + - + + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 4c9eb26..30196ef 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -835,7 +835,7 @@ VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - + @@ -862,7 +862,7 @@ WHERE (GUID = @Original_GUID); SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_CONNECTION WHERE (GUID = @GUID) - + @@ -902,7 +902,7 @@ VALUES (@BEZEICHNUNG,@SQL_PROVIDER,@SERVER,@DATENBANK,@USERNAME,@PASSWORD SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_CONNECTION WHERE (GUID = SCOPE_IDENTITY()) - + @@ -2112,7 +2112,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2157,7 +2157,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2260,7 +2260,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2356,7 +2356,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2421,7 +2421,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2451,7 +2451,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2474,7 +2474,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2564,7 +2564,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2575,7 +2575,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2637,7 +2637,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2686,7 +2686,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2701,7 +2701,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2722,7 +2722,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2830,7 +2830,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2903,7 +2903,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -2954,7 +2954,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3046,7 +3046,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3103,7 +3103,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3144,7 +3144,7 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - + @@ -3264,11 +3264,11 @@ VALUES (@PROFIL_ID,@GROUP_ID,@WHO) - - - - - + + + + + \ 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 8922c20..d8e67f4 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,29 +4,29 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + 461 @@ -38,7 +38,7 @@ - + 175 @@ -54,7 +54,7 @@ - + 515 @@ -66,7 +66,7 @@ - + 844 @@ -74,15 +74,15 @@ 844 - 394 + 393 - 861 - 394 + 862 + 393 - + 141 @@ -90,11 +90,11 @@ 141 - 127 + 126 - 861 - 127 + 862 + 126 diff --git a/app/DD_PM_WINDREAM/frmConnection.Designer.vb b/app/DD_PM_WINDREAM/frmConnection.Designer.vb index 788cb74..d96c59c 100644 --- a/app/DD_PM_WINDREAM/frmConnection.Designer.vb +++ b/app/DD_PM_WINDREAM/frmConnection.Designer.vb @@ -25,11 +25,14 @@ Partial Class frmConnection Me.components = New System.ComponentModel.Container() Dim GEANDERTWERLabel As System.Windows.Forms.Label Dim GEAENDERTWANNLabel As System.Windows.Forms.Label + Dim GUIDLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConnection)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() 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.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() Me.lblDatasource2 = New System.Windows.Forms.Label() @@ -53,15 +56,11 @@ Partial Class frmConnection Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.TBDD_CONNECTIONBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.TBDD_CONNECTIONDataGridView = New System.Windows.Forms.DataGridView() - Me.GEANDERTWERTextBox = New System.Windows.Forms.TextBox() - Me.btnadd = New System.Windows.Forms.Button() - Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() - Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -70,16 +69,20 @@ Partial Class frmConnection Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn8 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewCheckBoxColumn1 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.GEANDERTWERTextBox = New System.Windows.Forms.TextBox() + Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() + Me.SERVERTextBox = New System.Windows.Forms.TextBox() + Me.GUIDTextBox = New System.Windows.Forms.TextBox() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() - Me.txtDatasource1 = New System.Windows.Forms.TextBox() GEANDERTWERLabel = New System.Windows.Forms.Label() GEAENDERTWANNLabel = New System.Windows.Forms.Label() + GUIDLabel = New System.Windows.Forms.Label() + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBDD_CONNECTIONBindingNavigator.SuspendLayout() CType(Me.TBDD_CONNECTIONDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GEANDERTWERLabel @@ -100,6 +103,15 @@ Partial Class frmConnection GEAENDERTWANNLabel.TabIndex = 62 GEAENDERTWANNLabel.Text = "wann:" ' + 'GUIDLabel + ' + GUIDLabel.AutoSize = True + GUIDLabel.Location = New System.Drawing.Point(529, 36) + GUIDLabel.Name = "GUIDLabel" + GUIDLabel.Size = New System.Drawing.Size(25, 16) + GUIDLabel.TabIndex = 64 + GUIDLabel.Text = "ID:" + ' 'chkOR_ohne_TNS ' Me.chkOR_ohne_TNS.AutoSize = True @@ -119,7 +131,7 @@ Partial Class frmConnection Me.Chckwin_aut.Location = New System.Drawing.Point(12, 191) Me.Chckwin_aut.Name = "Chckwin_aut" Me.Chckwin_aut.Size = New System.Drawing.Size(180, 20) - Me.Chckwin_aut.TabIndex = 44 + Me.Chckwin_aut.TabIndex = 8 Me.Chckwin_aut.Text = "Windows-Authentifizierung" Me.Chckwin_aut.UseVisualStyleBackColor = True Me.Chckwin_aut.Visible = False @@ -131,7 +143,17 @@ Partial Class frmConnection Me.txtBezeichnung.Location = New System.Drawing.Point(232, 53) Me.txtBezeichnung.Name = "txtBezeichnung" Me.txtBezeichnung.Size = New System.Drawing.Size(294, 23) - Me.txtBezeichnung.TabIndex = 41 + Me.txtBezeichnung.TabIndex = 1 + ' + 'TBDD_CONNECTIONBindingSource + ' + Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" + Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet + ' + 'DD_DMSLiteDataSet + ' + Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" + Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' 'Label1 ' @@ -152,7 +174,7 @@ Partial Class frmConnection Me.btnCheck_Con.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.btnCheck_Con.Name = "btnCheck_Con" Me.btnCheck_Con.Size = New System.Drawing.Size(152, 28) - Me.btnCheck_Con.TabIndex = 39 + Me.btnCheck_Con.TabIndex = 7 Me.btnCheck_Con.Text = "Test DB-Verbindung" Me.btnCheck_Con.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnCheck_Con.UseVisualStyleBackColor = True @@ -190,7 +212,7 @@ Partial Class frmConnection Me.btnMdbLocation.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.btnMdbLocation.Name = "btnMdbLocation" Me.btnMdbLocation.Size = New System.Drawing.Size(29, 26) - Me.btnMdbLocation.TabIndex = 32 + Me.btnMdbLocation.TabIndex = 4 Me.btnMdbLocation.Text = "..." Me.btnMdbLocation.UseVisualStyleBackColor = True Me.btnMdbLocation.Visible = False @@ -204,7 +226,7 @@ Partial Class frmConnection Me.txtPassword.Name = "txtPassword" Me.txtPassword.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) Me.txtPassword.Size = New System.Drawing.Size(137, 23) - Me.txtPassword.TabIndex = 7 + Me.txtPassword.TabIndex = 6 Me.txtPassword.UseSystemPasswordChar = True Me.txtPassword.Visible = False ' @@ -216,7 +238,7 @@ Partial Class frmConnection Me.txtUserId.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.txtUserId.Name = "txtUserId" Me.txtUserId.Size = New System.Drawing.Size(200, 23) - Me.txtUserId.TabIndex = 6 + Me.txtUserId.TabIndex = 5 Me.txtUserId.Visible = False ' 'lblPassword @@ -263,7 +285,7 @@ Partial Class frmConnection Me.cmbDbArt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmbDbArt.Name = "cmbDbArt" Me.cmbDbArt.Size = New System.Drawing.Size(210, 24) - Me.cmbDbArt.TabIndex = 1 + Me.cmbDbArt.TabIndex = 0 ' 'lblDatenbanktyp ' @@ -283,7 +305,7 @@ Partial Class frmConnection Me.txtDatasource2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.txtDatasource2.Name = "txtDatasource2" Me.txtDatasource2.Size = New System.Drawing.Size(259, 23) - Me.txtDatasource2.TabIndex = 35 + Me.txtDatasource2.TabIndex = 3 Me.txtDatasource2.Visible = False ' 'TBDD_CONNECTIONBindingNavigator @@ -293,7 +315,7 @@ Partial Class frmConnection 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.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.ToolStripButton3, 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 @@ -301,7 +323,7 @@ Partial Class frmConnection 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(1132, 25) + Me.TBDD_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(1154, 25) Me.TBDD_CONNECTIONBindingNavigator.TabIndex = 53 Me.TBDD_CONNECTIONBindingNavigator.Text = "BindingNavigator1" ' @@ -372,6 +394,14 @@ Partial Class frmConnection Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25) ' + 'ToolStripButton3 + ' + Me.ToolStripButton3.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton3.Name = "ToolStripButton3" + Me.ToolStripButton3.Size = New System.Drawing.Size(95, 22) + Me.ToolStripButton3.Text = "Aktualisieren" + ' 'ToolStripButton1 ' Me.ToolStripButton1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add @@ -411,53 +441,12 @@ Partial Class frmConnection 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.Location = New System.Drawing.Point(12, 276) 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(1111, 316) + Me.TBDD_CONNECTIONDataGridView.Size = New System.Drawing.Size(1133, 316) Me.TBDD_CONNECTIONDataGridView.TabIndex = 53 ' - 'GEANDERTWERTextBox - ' - Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEANDERTWER", True)) - Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(12, 246) - Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" - Me.GEANDERTWERTextBox.ReadOnly = True - Me.GEANDERTWERTextBox.Size = New System.Drawing.Size(147, 23) - Me.GEANDERTWERTextBox.TabIndex = 57 - ' - 'btnadd - ' - Me.btnadd.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnadd.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add - Me.btnadd.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnadd.Location = New System.Drawing.Point(231, 185) - Me.btnadd.Name = "btnadd" - Me.btnadd.Size = New System.Drawing.Size(295, 30) - Me.btnadd.TabIndex = 60 - Me.btnadd.Text = "Verbindung hinzufügen" - Me.btnadd.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnadd.UseVisualStyleBackColor = True - ' - 'GEAENDERTWANNTextBox - ' - Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEAENDERTWANN", True)) - Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(165, 246) - Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" - Me.GEAENDERTWANNTextBox.ReadOnly = True - Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(155, 23) - Me.GEAENDERTWANNTextBox.TabIndex = 63 - ' - 'TBDD_CONNECTIONBindingSource - ' - Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" - Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'DD_DMSLiteDataSet - ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID" @@ -507,6 +496,41 @@ Partial Class frmConnection Me.DataGridViewCheckBoxColumn1.HeaderText = "Aktiv" Me.DataGridViewCheckBoxColumn1.Name = "DataGridViewCheckBoxColumn1" ' + 'GEANDERTWERTextBox + ' + Me.GEANDERTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEANDERTWER", True)) + Me.GEANDERTWERTextBox.Location = New System.Drawing.Point(12, 246) + Me.GEANDERTWERTextBox.Name = "GEANDERTWERTextBox" + Me.GEANDERTWERTextBox.ReadOnly = True + Me.GEANDERTWERTextBox.Size = New System.Drawing.Size(147, 23) + Me.GEANDERTWERTextBox.TabIndex = 57 + ' + 'GEAENDERTWANNTextBox + ' + Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GEAENDERTWANN", True)) + Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(165, 246) + Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" + Me.GEAENDERTWANNTextBox.ReadOnly = True + Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(155, 23) + Me.GEAENDERTWANNTextBox.TabIndex = 63 + ' + 'SERVERTextBox + ' + Me.SERVERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "SERVER", True)) + Me.SERVERTextBox.Location = New System.Drawing.Point(15, 103) + Me.SERVERTextBox.Name = "SERVERTextBox" + Me.SERVERTextBox.Size = New System.Drawing.Size(210, 23) + Me.SERVERTextBox.TabIndex = 2 + ' + 'GUIDTextBox + ' + Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "GUID", True)) + Me.GUIDTextBox.Location = New System.Drawing.Point(532, 53) + Me.GUIDTextBox.Name = "GUIDTextBox" + Me.GUIDTextBox.ReadOnly = True + Me.GUIDTextBox.Size = New System.Drawing.Size(72, 23) + Me.GUIDTextBox.TabIndex = 65 + ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -528,21 +552,14 @@ Partial Class frmConnection ' Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True ' - 'txtDatasource1 - ' - Me.txtDatasource1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "SERVER", True)) - Me.txtDatasource1.Location = New System.Drawing.Point(15, 103) - Me.txtDatasource1.Name = "txtDatasource1" - Me.txtDatasource1.Size = New System.Drawing.Size(210, 23) - Me.txtDatasource1.TabIndex = 65 - ' 'frmConnection ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1132, 619) - Me.Controls.Add(Me.txtDatasource1) - Me.Controls.Add(Me.btnadd) + Me.ClientSize = New System.Drawing.Size(1154, 619) + Me.Controls.Add(GUIDLabel) + Me.Controls.Add(Me.GUIDTextBox) + Me.Controls.Add(Me.SERVERTextBox) Me.Controls.Add(GEAENDERTWANNLabel) Me.Controls.Add(Me.lblDatenbanktyp) Me.Controls.Add(Me.txtUserId) @@ -569,12 +586,12 @@ Partial Class frmConnection Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Name = "frmConnection" Me.Text = "Verwaltung der Connections" + CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSLiteDataSet, 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() - CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -620,9 +637,10 @@ Partial Class frmConnection Friend WithEvents DataGridViewTextBoxColumn8 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents DataGridViewCheckBoxColumn1 As System.Windows.Forms.DataGridViewCheckBoxColumn Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents btnadd As System.Windows.Forms.Button Friend WithEvents GEAENDERTWANNTextBox As System.Windows.Forms.TextBox Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter - Friend WithEvents txtDatasource1 As TextBox + Friend WithEvents SERVERTextBox As TextBox + Friend WithEvents ToolStripButton3 As ToolStripButton + Friend WithEvents GUIDTextBox As TextBox End Class diff --git a/app/DD_PM_WINDREAM/frmConnection.resx b/app/DD_PM_WINDREAM/frmConnection.resx index 6c91490..66e466b 100644 --- a/app/DD_PM_WINDREAM/frmConnection.resx +++ b/app/DD_PM_WINDREAM/frmConnection.resx @@ -123,6 +123,9 @@ False + + False + 179, 17 diff --git a/app/DD_PM_WINDREAM/frmConnection.vb b/app/DD_PM_WINDREAM/frmConnection.vb index 5e8e234..1d516af 100644 --- a/app/DD_PM_WINDREAM/frmConnection.vb +++ b/app/DD_PM_WINDREAM/frmConnection.vb @@ -11,14 +11,13 @@ Public Class frmConnection chkOR_ohne_TNS.Visible = False Select Case Me.cmbDbArt.SelectedItem Case "MS-SQL" - Me.txtDatasource1.Visible = True + Me.SERVERTextBox.Visible = True Me.txtUserId.Visible = True Me.txtPassword.Visible = True Me.lblDataSource.Text = "SQL-Server (IP oder Name):" Me.lblDataSource.Visible = True - Me.txtDatasource1.ReadOnly = False - Me.txtDatasource1.Text = "" + Me.SERVERTextBox.ReadOnly = False Me.btnMdbLocation.Visible = False Me.btnMdbLöschen.Visible = False Me.lblUserId.Visible = True @@ -32,13 +31,12 @@ Public Class frmConnection Me.btnCheck_Con.Visible = True Case "ORACLE" - Me.txtDatasource1.Visible = True + Me.SERVERTextBox.Visible = True Me.txtUserId.Visible = True Me.txtPassword.Visible = True Me.lblDataSource.Text = "Host (IP-Adresse):" - Me.txtDatasource1.ReadOnly = False - Me.txtDatasource1.BackColor = System.Drawing.SystemColors.Window - Me.txtDatasource1.Text = "" + Me.SERVERTextBox.ReadOnly = False + Me.SERVERTextBox.BackColor = System.Drawing.SystemColors.Window Me.btnMdbLocation.Visible = False Me.btnMdbLöschen.Visible = False Me.lblUserId.Text = "UserId:" @@ -51,9 +49,9 @@ Public Class frmConnection MsgBox("Bitte beachten Sie das Auswahllisten aktuell nur mit MS-SQl möglich sind", MsgBoxStyle.Information) Case "ODBC" Me.lblDataSource.Text = "DSN*:" - Me.txtDatasource1.ReadOnly = False - Me.txtDatasource1.BackColor = System.Drawing.SystemColors.Window - Me.txtDatasource1.Text = "" + Me.SERVERTextBox.ReadOnly = False + Me.SERVERTextBox.BackColor = System.Drawing.SystemColors.Window + Me.btnMdbLocation.Visible = False Me.btnMdbLöschen.Visible = False Me.lblUserId.Text = "UserId:" @@ -63,9 +61,9 @@ Public Class frmConnection MsgBox("Bitte beachten Sie das Auswahllisten aktuell nur mit MS-SQl möglich sind", MsgBoxStyle.Information) Case "Ole (Access)" Me.lblDataSource.Text = ".mdb Datei*:" - Me.txtDatasource1.ReadOnly = True - Me.txtDatasource1.BackColor = System.Drawing.SystemColors.Info - Me.txtDatasource1.Text = "" + Me.SERVERTextBox.ReadOnly = True + Me.SERVERTextBox.BackColor = System.Drawing.SystemColors.Info + Me.btnMdbLocation.Visible = True Me.btnMdbLöschen.Visible = True Me.lblUserId.Text = "UserId:" @@ -76,7 +74,7 @@ Public Class frmConnection End Select Else - Me.txtDatasource1.Visible = False + Me.SERVERTextBox.Visible = False Me.txtUserId.Visible = False Me.txtPassword.Visible = False End If @@ -89,9 +87,9 @@ Public Class frmConnection Case "MS-SQL" Dim con As String If Chckwin_aut.Checked Then - con = "Data Source=" & Me.txtDataSource1.Text & ";Initial Catalog=" & Me.txtDatasource2.Text & ";Trusted_Connection=True;" + con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.txtDatasource2.Text & ";Trusted_Connection=True;" Else - con = "Server=" & Me.txtDataSource1.Text & ";Database=" & Me.txtDatasource2.Text & ";User Id=" & Me.txtUserId.Text & ";Password=" & Me.txtPassword.Text & ";" + con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.txtDatasource2.Text & ";User Id=" & Me.txtUserId.Text & ";Password=" & Me.txtPassword.Text & ";" End If Dim connection As New SqlClient.SqlConnection(con) connstr = con @@ -103,7 +101,7 @@ Public Class frmConnection Try Dim conn As New OracleConnectionStringBuilder If chkOR_ohne_TNS.Checked Then - connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & txtDatasource1.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & _ + connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & SERVERTextBox.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" & txtDatasource2.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";" Else conn.DataSource = txtDatasource2.Text @@ -124,7 +122,7 @@ Public Class frmConnection Case Else MsgBox("Test zur Zeit nicht möglich", MsgBoxStyle.Information, "Achtung:") End Select - Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) + End If Catch ex As Exception Cursor = Cursors.Default @@ -150,7 +148,7 @@ Public Class frmConnection Private Sub frmConnection_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load Try - Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString + load_connections() Catch ex As Exception MsgBox("Fehler bei Laden der Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -158,6 +156,7 @@ Public Class frmConnection End Sub Sub load_connections() Try + Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBDD_CONNECTION) TBDD_CONNECTIONDataGridView.AutoResizeColumns() Catch ex As Exception @@ -170,11 +169,13 @@ Public Class frmConnection Me.txtPassword.Enabled = False Me.txtUserId.Text = "WINAUTH" Me.txtPassword.Text = "" + Me.txtPassword.Enabled = False Else Me.txtUserId.Enabled = True Me.txtPassword.Enabled = True Me.txtUserId.Text = "" Me.txtPassword.Text = "" + Me.txtPassword.Enabled = True End If End Sub @@ -207,24 +208,24 @@ Public Class frmConnection ' Me.grpbx_ConnAdd.Visible = True End Sub - Private Sub btnadd_Click(sender As Object, e As EventArgs) Handles btnadd.Click - Try - Select Case cmbDbArt.Text - Case "ORACLE" - Case "MS-SQL" - If Me.txtUserId.Text = "WINAUTH" Then - TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, "WINAUTH", "", "", True, Environment.UserName) - Else - TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, txtDatasource1.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, Environment.UserName) - End If + 'Private Sub btnadd_Click(sender As Object, e As EventArgs) Handles btnadd.Click + ' Try + ' Select Case cmbDbArt.Text + ' Case "ORACLE" + ' Case "MS-SQL" + ' If Me.txtUserId.Text = "WINAUTH" Then + ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, "WINAUTH", "", "", True, Environment.UserName) + ' Else + ' TBDD_CONNECTIONTableAdapter.CmdInsert(txtBezeichnung.Text, cmbDbArt.Text, SERVERTextBox.Text, txtDatasource2.Text, txtUserId.Text, txtPassword.Text, "", True, Environment.UserName) + ' End If - End Select - Catch ex As Exception - MsgBox("Fehler bei Insert Connection: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - - load_connections() - End Sub + ' End Select + ' Catch ex As Exception + ' MsgBox("Fehler bei Insert Connection: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ' End Try + + ' load_connections() + 'End Sub Private Sub TBDD_CONNECTIONDataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles TBDD_CONNECTIONDataGridView.SelectionChanged ' grpbx_ConnAdd.Visible = False @@ -232,17 +233,20 @@ Public Class frmConnection Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click Try - Dim i, ID As Integer - i = TBDD_CONNECTIONDataGridView.CurrentRow.Index - ID = TBDD_CONNECTIONDataGridView.Item(0, i).Value - If ID > 0 Then + If GUIDTextBox.Text <> "" Then Dim result As MsgBoxResult = MsgBox("Wollen Sie die Connection wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung erforderlich:") ' wenn Löschen ja If result = MsgBoxResult.Yes Then - TBDD_CONNECTIONTableAdapter.Delete(ID) + TBDD_CONNECTIONTableAdapter.Delete(GUIDTextBox.Text) load_connections() End If End If + 'Dim i, ID As Integer + 'i = TBDD_CONNECTIONDataGridView.CurrentRow.Index + 'ID = TBDD_CONNECTIONDataGridView.Item(0, i).Value + 'If ID > 0 Then + + 'End If Catch ex As Exception MsgBox("Fehler bei Löschen Connection: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -251,4 +255,15 @@ Public Class frmConnection Private Sub btnMdbLöschen_Click(sender As Object, e As EventArgs) Handles btnMdbLöschen.Click End Sub + + Private Sub txtUserId_TextChanged(sender As Object, e As EventArgs) Handles txtUserId.TextChanged + If Me.txtUserId.Text = "WINAUTH" Then + Me.Chckwin_aut.Checked = True + Else + Me.Chckwin_aut.Checked = False + End If + End Sub + Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click + load_connections() + End Sub End Class \ No newline at end of file