jj: bugfixes
This commit is contained in:
Jonathan Jenne
parent
e41e9cc575
commit
4c7092ec8d
@ -36,15 +36,26 @@
|
||||
</TableUISetting>
|
||||
<TableUISetting Name="TBDD_CONNECTION">
|
||||
<ColumnUISettings>
|
||||
<ColumnUISetting Name="DATENBANK">
|
||||
<ControlSettings>
|
||||
<ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
|
||||
<BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</ControlSetting>
|
||||
</ControlSettings>
|
||||
</ColumnUISetting>
|
||||
<ColumnUISetting Name="ERSTELLTWANN">
|
||||
<ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<ControlSettings>
|
||||
<ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
|
||||
<BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</ControlSetting></ControlSettings>
|
||||
</ControlSetting>
|
||||
</ControlSettings>
|
||||
</ColumnUISetting>
|
||||
<ColumnUISetting Name="GEAENDERTWANN">
|
||||
<ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<ControlSettings>
|
||||
<ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
|
||||
<BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</ControlSetting></ControlSettings>
|
||||
</ControlSetting>
|
||||
</ControlSettings>
|
||||
</ColumnUISetting>
|
||||
</ColumnUISettings>
|
||||
</TableUISetting>
|
||||
|
||||
37
app/DD_PM_WINDREAM/frmAdministration.Designer.vb
generated
37
app/DD_PM_WINDREAM/frmAdministration.Designer.vb
generated
@ -22,6 +22,7 @@ Partial Class frmAdministration
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()>
|
||||
Private Sub InitializeComponent()
|
||||
Me.components = New System.ComponentModel.Container()
|
||||
Dim GUIDLabel As System.Windows.Forms.Label
|
||||
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdministration))
|
||||
Dim NAMELabel As System.Windows.Forms.Label
|
||||
@ -48,10 +49,10 @@ Partial Class frmAdministration
|
||||
Dim VEKTOR_DELIMITERLabel As System.Windows.Forms.Label
|
||||
Dim WORK_HISTORY_ENTRYLabel As System.Windows.Forms.Label
|
||||
Dim SQL_VIEWLabel As System.Windows.Forms.Label
|
||||
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
|
||||
Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer()
|
||||
Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl()
|
||||
Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
|
||||
Me.viewAssignedUsers = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.colPRENAME1 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
@ -63,7 +64,7 @@ Partial Class frmAdministration
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.Label20 = New System.Windows.Forms.Label()
|
||||
Me.gridAvailableUsers = New DevExpress.XtraGrid.GridControl()
|
||||
Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.viewAvailableUsers = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.colPRENAME = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
@ -75,21 +76,21 @@ Partial Class frmAdministration
|
||||
Me.Label19 = New System.Windows.Forms.Label()
|
||||
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
|
||||
Me.gridAssignedGroups = New DevExpress.XtraGrid.GridControl()
|
||||
Me.TBPROFILE_GROUPBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPROFILE_GROUPBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.viewAssignedGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.colNAME5 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.colCOMMENT1 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.Panel3 = New System.Windows.Forms.Panel()
|
||||
Me.Label22 = New System.Windows.Forms.Label()
|
||||
Me.gridAvailableGroups = New DevExpress.XtraGrid.GridControl()
|
||||
Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.viewAvailableGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
|
||||
Me.colNAME4 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.colCOMMENT = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||
Me.Panel4 = New System.Windows.Forms.Panel()
|
||||
Me.Label23 = New System.Windows.Forms.Label()
|
||||
Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
|
||||
Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter()
|
||||
Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
|
||||
@ -101,7 +102,7 @@ Partial Class frmAdministration
|
||||
Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
|
||||
Me.VWPM_PROFILE_USERBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
|
||||
Me.TBPM_PROFILEBindingNavigator = New System.Windows.Forms.BindingNavigator()
|
||||
Me.TBPM_PROFILEBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
|
||||
Me.tstrpbtn_add = New System.Windows.Forms.ToolStripButton()
|
||||
Me.tstrlblSave = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.btnRefreshProfiles = New System.Windows.Forms.ToolStripButton()
|
||||
@ -119,7 +120,7 @@ Partial Class frmAdministration
|
||||
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
|
||||
Me.Label1 = New System.Windows.Forms.Label()
|
||||
Me.cmbType = New System.Windows.Forms.ComboBox()
|
||||
Me.TBPM_TYPEBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
|
||||
Me.MOVE2FOLDERTextBox = New System.Windows.Forms.TextBox()
|
||||
Me.btnmovetoFolderDialog = New System.Windows.Forms.Button()
|
||||
@ -178,15 +179,15 @@ Partial Class frmAdministration
|
||||
Me.cmbIndexe2 = New System.Windows.Forms.ComboBox()
|
||||
Me.btnSaveSQLCommand = New System.Windows.Forms.Button()
|
||||
Me.SQL_COMMANDTextBox = New System.Windows.Forms.TextBox()
|
||||
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.btnShowConnections = New System.Windows.Forms.Button()
|
||||
Me.Label14 = New System.Windows.Forms.Label()
|
||||
Me.cmbConnection = New System.Windows.Forms.ComboBox()
|
||||
Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.Label4 = New System.Windows.Forms.Label()
|
||||
Me.Label5 = New System.Windows.Forms.Label()
|
||||
Me.Label6 = New System.Windows.Forms.Label()
|
||||
Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator = New System.Windows.Forms.BindingNavigator()
|
||||
Me.TBPM_PROFILE_FINAL_INDEXINGBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
|
||||
Me.BindingNavigatorCountItem4 = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.BindingNavigatorMoveFirstItem4 = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorMovePreviousItem4 = New System.Windows.Forms.ToolStripButton()
|
||||
@ -225,7 +226,7 @@ Partial Class frmAdministration
|
||||
Me.btnUserManager = New System.Windows.Forms.Button()
|
||||
Me.Button2 = New System.Windows.Forms.Button()
|
||||
Me.VEKTOR_DELIMITERTextBox = New System.Windows.Forms.TextBox()
|
||||
Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.btnConnections = New System.Windows.Forms.Button()
|
||||
Me.btnopen_SQLAdmin = New System.Windows.Forms.Button()
|
||||
Me.EMAIL_ACTIVECheckBox = New System.Windows.Forms.CheckBox()
|
||||
@ -253,8 +254,8 @@ Partial Class frmAdministration
|
||||
Me.DataGridViewTextBoxColumn23 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn24 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.DataGridViewTextBoxColumn25 = New System.Windows.Forms.DataGridViewTextBoxColumn()
|
||||
Me.TBPM_ERROR_LOGBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_ERROR_LOGBindingNavigator = New System.Windows.Forms.BindingNavigator()
|
||||
Me.TBPM_ERROR_LOGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.TBPM_ERROR_LOGBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
|
||||
Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton()
|
||||
@ -265,7 +266,7 @@ Partial Class frmAdministration
|
||||
Me.BindingNavigatorMoveNextItem3 = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorMoveLastItem3 = New System.Windows.Forms.ToolStripButton()
|
||||
Me.BindingNavigatorSeparator11 = New System.Windows.Forms.ToolStripSeparator()
|
||||
Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
|
||||
Me.tstrpinfo = New System.Windows.Forms.ToolStripStatusLabel()
|
||||
Me.TBPROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPROFILE_USERTableAdapter()
|
||||
@ -275,7 +276,7 @@ Partial Class frmAdministration
|
||||
Me.TBPM_ERROR_LOGTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_ERROR_LOGTableAdapter()
|
||||
Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter()
|
||||
Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter()
|
||||
Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource()
|
||||
Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components)
|
||||
Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter()
|
||||
Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter()
|
||||
Me.TBDD_GROUPSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_GROUPSTableAdapter()
|
||||
@ -1945,8 +1946,8 @@ Partial Class frmAdministration
|
||||
'TBPM_ERROR_LOGDataGridView
|
||||
'
|
||||
Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False
|
||||
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
|
||||
Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
|
||||
DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
|
||||
Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
|
||||
Me.TBPM_ERROR_LOGDataGridView.AutoGenerateColumns = False
|
||||
Me.TBPM_ERROR_LOGDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
|
||||
Me.TBPM_ERROR_LOGDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn17, Me.DataGridViewTextBoxColumn22, Me.DataGridViewTextBoxColumn23, Me.DataGridViewTextBoxColumn24, Me.DataGridViewTextBoxColumn25})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -464,7 +464,7 @@ Public Class frmAdministration
|
||||
Me.lblIndex.Text = "Definieren Sie den festen Wert: (Date)"
|
||||
Me.lblIndex.Visible = True
|
||||
Me.txtindexwert_final.Visible = True
|
||||
Me.grbxSystemStamps.Visible = False
|
||||
Me.grbxSystemStamps.Visible = True
|
||||
Me.txtindexwert_final.Text = ""
|
||||
Me.chkbxfinalIndex.Visible = False
|
||||
Case 4107 'Vektor Zahl
|
||||
@ -850,33 +850,38 @@ Public Class frmAdministration
|
||||
End Sub
|
||||
|
||||
Private Sub btnEditor_Click(sender As Object, e As EventArgs) Handles btnEditor.Click
|
||||
Dim CONID = 0
|
||||
If cmbConnection.SelectedValue > 0 Then
|
||||
CONID = cmbConnection.SelectedValue
|
||||
End If
|
||||
If INSERT_ACTIVE = True Then
|
||||
If cmbIndexe2.SelectedIndex = -1 Then
|
||||
MsgBox("Bitte wählen Sie einen Index!", MsgBoxStyle.Exclamation)
|
||||
Exit Sub
|
||||
Try
|
||||
Dim CONID = 0
|
||||
If cmbConnection.SelectedValue > 0 Then
|
||||
CONID = cmbConnection.SelectedValue
|
||||
End If
|
||||
If INSERT_ACTIVE = True Then
|
||||
If cmbIndexe2.SelectedIndex = -1 Then
|
||||
MsgBox("Bitte wählen Sie einen Index!", MsgBoxStyle.Exclamation)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", Environment.UserName, CONID, SQL_COMMANDTextBox.Text)
|
||||
|
||||
End If
|
||||
Dim i, ID As Integer
|
||||
i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index
|
||||
ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value
|
||||
If ID > 0 Then
|
||||
CURRENT_INDEX_ID = ID
|
||||
CURRENT_DESIGN_TYPE = "FINAL_INDEX"
|
||||
CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text
|
||||
CURRENT_SQL_CON = CONID
|
||||
CURRENT_ProfilGUID = PROFILGUIDTextBox.Text
|
||||
|
||||
frmSQL_DESIGNER.ShowDialog()
|
||||
End If
|
||||
|
||||
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.CmdInsert(PROFILGUIDTextBox.Text, cmbIndexe2.Text, "SQL-Command", Environment.UserName, CONID, SQL_COMMANDTextBox.Text)
|
||||
|
||||
End If
|
||||
Dim i, ID As Integer
|
||||
i = TBPM_PROFILE_FINAL_INDEXINGDataGridView.CurrentRow.Index
|
||||
ID = TBPM_PROFILE_FINAL_INDEXINGDataGridView.Item(0, i).Value
|
||||
If ID > 0 Then
|
||||
CURRENT_INDEX_ID = ID
|
||||
CURRENT_DESIGN_TYPE = "FINAL_INDEX"
|
||||
CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text
|
||||
CURRENT_SQL_CON = CONID
|
||||
CURRENT_ProfilGUID = PROFILGUIDTextBox.Text
|
||||
|
||||
frmSQL_DESIGNER.ShowDialog()
|
||||
End If
|
||||
|
||||
Refresh_Final_indexe()
|
||||
Refresh_Final_indexe()
|
||||
Catch ex As Exception
|
||||
MsgBox("Error while opening SQLEditor: " & ex.Message, MsgBoxStyle.Critical)
|
||||
clsLogger.Add("Error while opening SQLEditor: " & ex.Message)
|
||||
End Try
|
||||
End Sub
|
||||
Private Sub TBPM_PROFILE_FINAL_INDEXINGDataGridView_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles TBPM_PROFILE_FINAL_INDEXINGDataGridView.CellClick
|
||||
Try
|
||||
@ -902,7 +907,8 @@ Public Class frmAdministration
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
|
||||
MsgBox("Error while loading final Index: " & ex.Message, MsgBoxStyle.Critical)
|
||||
clsLogger.Add("Error while loading final Index: " & ex.Message)
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
@ -941,7 +947,7 @@ Public Class frmAdministration
|
||||
End If
|
||||
End With
|
||||
End If
|
||||
If System.IO.File.Exists(USRMNGRPATH) Then
|
||||
If File.Exists(USRMNGRPATH) Then
|
||||
Process.Start(USRMNGRPATH)
|
||||
End If
|
||||
Catch ex As Exception
|
||||
|
||||
38
app/DD_PM_WINDREAM/frmConnection.Designer.vb
generated
38
app/DD_PM_WINDREAM/frmConnection.Designer.vb
generated
@ -27,7 +27,7 @@ Partial Class frmConnection
|
||||
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()
|
||||
Dim DataGridViewCellStyle2 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()
|
||||
@ -45,7 +45,6 @@ Partial Class frmConnection
|
||||
Me.lblDataSource = New System.Windows.Forms.Label()
|
||||
Me.cmbDbArt = New System.Windows.Forms.ComboBox()
|
||||
Me.lblDatenbanktyp = New System.Windows.Forms.Label()
|
||||
Me.txtDatasource2 = New System.Windows.Forms.TextBox()
|
||||
Me.TBDD_CONNECTIONBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
|
||||
Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
|
||||
Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
|
||||
@ -75,6 +74,7 @@ Partial Class frmConnection
|
||||
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.DATENBANKComboBox = New System.Windows.Forms.ComboBox()
|
||||
GEANDERTWERLabel = New System.Windows.Forms.Label()
|
||||
GEAENDERTWANNLabel = New System.Windows.Forms.Label()
|
||||
GUIDLabel = New System.Windows.Forms.Label()
|
||||
@ -297,17 +297,6 @@ Partial Class frmConnection
|
||||
Me.lblDatenbanktyp.TabIndex = 0
|
||||
Me.lblDatenbanktyp.Text = "Datenbanktyp*:"
|
||||
'
|
||||
'txtDatasource2
|
||||
'
|
||||
Me.txtDatasource2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "DATENBANK", True))
|
||||
Me.txtDatasource2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.txtDatasource2.Location = New System.Drawing.Point(231, 103)
|
||||
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 = 3
|
||||
Me.txtDatasource2.Visible = False
|
||||
'
|
||||
'TBDD_CONNECTIONBindingNavigator
|
||||
'
|
||||
Me.TBDD_CONNECTIONBindingNavigator.AddNewItem = Nothing
|
||||
@ -323,7 +312,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(1154, 25)
|
||||
Me.TBDD_CONNECTIONBindingNavigator.Size = New System.Drawing.Size(1165, 25)
|
||||
Me.TBDD_CONNECTIONBindingNavigator.TabIndex = 53
|
||||
Me.TBDD_CONNECTIONBindingNavigator.Text = "BindingNavigator1"
|
||||
'
|
||||
@ -432,8 +421,8 @@ Partial Class frmConnection
|
||||
'
|
||||
Me.TBDD_CONNECTIONDataGridView.AllowUserToAddRows = False
|
||||
Me.TBDD_CONNECTIONDataGridView.AllowUserToDeleteRows = False
|
||||
DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
|
||||
Me.TBDD_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
|
||||
DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
|
||||
Me.TBDD_CONNECTIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
|
||||
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)
|
||||
@ -444,7 +433,7 @@ Partial Class frmConnection
|
||||
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(1133, 316)
|
||||
Me.TBDD_CONNECTIONDataGridView.Size = New System.Drawing.Size(1144, 316)
|
||||
Me.TBDD_CONNECTIONDataGridView.TabIndex = 53
|
||||
'
|
||||
'DataGridViewTextBoxColumn1
|
||||
@ -552,11 +541,21 @@ Partial Class frmConnection
|
||||
'
|
||||
Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True
|
||||
'
|
||||
'DATENBANKComboBox
|
||||
'
|
||||
Me.DATENBANKComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_CONNECTIONBindingSource, "DATENBANK", True))
|
||||
Me.DATENBANKComboBox.FormattingEnabled = True
|
||||
Me.DATENBANKComboBox.Location = New System.Drawing.Point(232, 102)
|
||||
Me.DATENBANKComboBox.Name = "DATENBANKComboBox"
|
||||
Me.DATENBANKComboBox.Size = New System.Drawing.Size(259, 24)
|
||||
Me.DATENBANKComboBox.TabIndex = 66
|
||||
'
|
||||
'frmConnection
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.ClientSize = New System.Drawing.Size(1154, 619)
|
||||
Me.ClientSize = New System.Drawing.Size(1165, 619)
|
||||
Me.Controls.Add(Me.DATENBANKComboBox)
|
||||
Me.Controls.Add(GUIDLabel)
|
||||
Me.Controls.Add(Me.GUIDTextBox)
|
||||
Me.Controls.Add(Me.SERVERTextBox)
|
||||
@ -580,7 +579,6 @@ Partial Class frmConnection
|
||||
Me.Controls.Add(Me.Label1)
|
||||
Me.Controls.Add(Me.lblDatasource2)
|
||||
Me.Controls.Add(Me.btnCheck_Con)
|
||||
Me.Controls.Add(Me.txtDatasource2)
|
||||
Me.Controls.Add(Me.chkOR_ohne_TNS)
|
||||
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)
|
||||
@ -607,7 +605,6 @@ Partial Class frmConnection
|
||||
Friend WithEvents lblDataSource As System.Windows.Forms.Label
|
||||
Friend WithEvents cmbDbArt As System.Windows.Forms.ComboBox
|
||||
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 TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
|
||||
Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager
|
||||
@ -643,4 +640,5 @@ Partial Class frmConnection
|
||||
Friend WithEvents SERVERTextBox As TextBox
|
||||
Friend WithEvents ToolStripButton3 As ToolStripButton
|
||||
Friend WithEvents GUIDTextBox As TextBox
|
||||
Friend WithEvents DATENBANKComboBox As ComboBox
|
||||
End Class
|
||||
|
||||
@ -129,6 +129,12 @@
|
||||
<metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>179, 17</value>
|
||||
</metadata>
|
||||
<metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>179, 17</value>
|
||||
</metadata>
|
||||
<metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
|
||||
@ -26,7 +26,8 @@ Public Class frmConnection
|
||||
Me.lblPassword.Text = "Passwort:"
|
||||
Me.lblDatasource2.Visible = True
|
||||
Me.lblDatasource2.Text = "Datenbank:"
|
||||
Me.txtDatasource2.Visible = True
|
||||
'Me.txtDatasource2.Visible = True
|
||||
Me.DATENBANKComboBox.Visible = True
|
||||
Chckwin_aut.Visible = True
|
||||
Me.btnCheck_Con.Visible = True
|
||||
|
||||
@ -43,7 +44,8 @@ Public Class frmConnection
|
||||
Me.lblPassword.Text = "Passwort:"
|
||||
Me.lblDatasource2.Text = "SID:"
|
||||
Me.lblDatasource2.Visible = True
|
||||
Me.txtDatasource2.Visible = True
|
||||
'Me.txtDatasource2.Visible = True
|
||||
Me.DATENBANKComboBox.Visible = True
|
||||
chkOR_ohne_TNS.Visible = True
|
||||
Me.btnCheck_Con.Visible = True
|
||||
MsgBox("Bitte beachten Sie das Auswahllisten aktuell nur mit MS-SQl möglich sind", MsgBoxStyle.Information)
|
||||
@ -57,7 +59,8 @@ Public Class frmConnection
|
||||
Me.lblUserId.Text = "UserId:"
|
||||
Me.lblPassword.Text = "Passwort:"
|
||||
Me.lblDatasource2.Visible = False
|
||||
Me.txtDatasource2.Visible = False
|
||||
'Me.txtDatasource2.Visible = False
|
||||
Me.DATENBANKComboBox.Visible = False
|
||||
MsgBox("Bitte beachten Sie das Auswahllisten aktuell nur mit MS-SQl möglich sind", MsgBoxStyle.Information)
|
||||
Case "Ole (Access)"
|
||||
Me.lblDataSource.Text = ".mdb Datei*:"
|
||||
@ -69,8 +72,8 @@ Public Class frmConnection
|
||||
Me.lblUserId.Text = "UserId:"
|
||||
Me.lblPassword.Text = "Passwort:"
|
||||
Me.lblDatasource2.Visible = False
|
||||
Me.txtDatasource2.Visible = False
|
||||
|
||||
'Me.txtDatasource2.Visible = False
|
||||
Me.DATENBANKComboBox.Visible = False
|
||||
|
||||
End Select
|
||||
Else
|
||||
@ -87,9 +90,11 @@ Public Class frmConnection
|
||||
Case "MS-SQL"
|
||||
Dim con As String
|
||||
If Chckwin_aut.Checked Then
|
||||
con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.txtDatasource2.Text & ";Trusted_Connection=True;"
|
||||
'con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.txtDatasource2.Text & ";Trusted_Connection=True;"
|
||||
con = "Data Source=" & Me.SERVERTextBox.Text & ";Initial Catalog=" & Me.DATENBANKComboBox.Text & ";Trusted_Connection=True;"
|
||||
Else
|
||||
con = "Server=" & Me.SERVERTextBox.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 & ";"
|
||||
con = "Server=" & Me.SERVERTextBox.Text & ";Database=" & Me.DATENBANKComboBox.Text & ";User Id=" & Me.txtUserId.Text & ";Password=" & Me.txtPassword.Text & ";"
|
||||
End If
|
||||
Dim connection As New SqlClient.SqlConnection(con)
|
||||
connstr = con
|
||||
@ -101,10 +106,13 @@ 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=" & SERVERTextBox.Text & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
|
||||
' txtDatasource2.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";"
|
||||
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 & ";"
|
||||
DATENBANKComboBox.Text & ")));User Id=" & txtUserId.Text & ";Password=" & txtPassword.Text & ";"
|
||||
Else
|
||||
conn.DataSource = txtDatasource2.Text
|
||||
'conn.DataSource = txtDatasource2.Text
|
||||
conn.DataSource = DATENBANKComboBox.Text
|
||||
conn.UserID = txtUserId.Text
|
||||
conn.Password = txtPassword.Text
|
||||
conn.PersistSecurityInfo = True
|
||||
@ -195,11 +203,14 @@ Public Class frmConnection
|
||||
Private Sub chkOR_ohne_TNS_CheckedChanged(sender As Object, e As EventArgs) Handles chkOR_ohne_TNS.CheckedChanged
|
||||
If chkOR_ohne_TNS.Checked Then
|
||||
Me.lblDatasource2.Visible = True
|
||||
Me.txtDatasource2.Visible = True
|
||||
'Me.txtDatasource2.Visible = True
|
||||
Me.DATENBANKComboBox.Visible = True
|
||||
Else
|
||||
Me.lblDatasource2.Visible = False
|
||||
Me.txtDatasource2.Visible = False
|
||||
Me.txtDatasource2.Text = ""
|
||||
'Me.txtDatasource2.Visible = False
|
||||
'Me.txtDatasource2.Text = ""
|
||||
Me.DATENBANKComboBox.Visible = True
|
||||
Me.DATENBANKComboBox.Text = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@ -266,4 +277,54 @@ Public Class frmConnection
|
||||
Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click
|
||||
load_connections()
|
||||
End Sub
|
||||
|
||||
Private Sub DATENBANKComboBox_Click(sender As Object, e As EventArgs) Handles DATENBANKComboBox.Click
|
||||
Try
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim csb As New SqlClient.SqlConnectionStringBuilder
|
||||
|
||||
If SERVERTextBox.Text = String.Empty Then
|
||||
MsgBox("Bitte geben sie einen Server an!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If Chckwin_aut.Checked Then
|
||||
csb.DataSource = SERVERTextBox.Text
|
||||
csb.IntegratedSecurity = True
|
||||
Else
|
||||
If txtUserId.Text = String.Empty Or txtPassword.Text = String.Empty Then
|
||||
MsgBox("Bitte geben sie Benutzer und Passwort an!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
csb.DataSource = SERVERTextBox.Text
|
||||
csb.IntegratedSecurity = False
|
||||
csb.UserID = txtUserId.Text
|
||||
csb.Password = txtPassword.Text
|
||||
End If
|
||||
|
||||
Dim connection As New SqlClient.SqlConnection(csb.ToString)
|
||||
connection.Open()
|
||||
|
||||
Dim cmd As New SqlClient.SqlCommand("sp_databases", connection) With {.CommandType = CommandType.StoredProcedure}
|
||||
Dim dr As SqlClient.SqlDataReader = cmd.ExecuteReader
|
||||
|
||||
If dr.HasRows Then
|
||||
DATENBANKComboBox.Items.Clear()
|
||||
Do While dr.Read
|
||||
DATENBANKComboBox.Items.Add(dr.Item("Database_Name"))
|
||||
Loop
|
||||
DATENBANKComboBox.DroppedDown = True
|
||||
Else
|
||||
MsgBox("The standard-databases could not be retrieved. The default database will be set!" & vbNewLine & "Check rights in sql-server for user", MsgBoxStyle.Exclamation)
|
||||
End If
|
||||
|
||||
connection.Close()
|
||||
Catch ex As Exception
|
||||
MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical)
|
||||
DD_LIB_Standards.clsLogger.Add("Error while loading Databases:" & ex.Message)
|
||||
Finally
|
||||
Me.Cursor = Cursors.Default
|
||||
End Try
|
||||
End Sub
|
||||
End Class
|
||||
@ -230,7 +230,12 @@ Public Class frmMain
|
||||
ClassLogger.Add("CurrGroupClear - Error: " & ex.Message)
|
||||
|
||||
End Try
|
||||
Load_Profiles_for_User()
|
||||
|
||||
|
||||
If Load_Profiles_for_User() = False Then
|
||||
Throw New Exception("Could not load Profiles. Datatable is empty")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
For Each profile As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
|
||||
Dim item1 As NavBarItem = NavBarControl1.Items.Add()
|
||||
@ -278,14 +283,21 @@ Public Class frmMain
|
||||
End If
|
||||
|
||||
End Sub
|
||||
Sub Load_Profiles_for_User()
|
||||
Function Load_Profiles_for_User() As Boolean
|
||||
Try
|
||||
Dim sql = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", CURRENT_USER_ID)
|
||||
CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(sql)
|
||||
|
||||
If IsNothing(CURR_DT_VWPM_PROFILE_ACTIVE) Then
|
||||
Return False
|
||||
End If
|
||||
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
ClassLogger.Add("Load_Profiles_for_User - Error: " & ex.Message)
|
||||
Return False
|
||||
End Try
|
||||
End Sub
|
||||
End Function
|
||||
Sub Layout_Single_Profile()
|
||||
If GridControl_Docs.Visible = False Then
|
||||
GridControl_Docs.Visible = True
|
||||
|
||||
@ -1032,6 +1032,18 @@ Public Class frmValidator
|
||||
cmbpanel.DisplayMember = resultDT.Columns(0).ColumnName
|
||||
cmbpanel.ValueMember = resultDT.Columns(0).ColumnName
|
||||
|
||||
Dim maxWith As Integer = cmbpanel.Width
|
||||
Using g As Graphics = Me.CreateGraphics
|
||||
For Each oItem As Object In cmbpanel.Items 'Für alle Einträge...
|
||||
Dim g1 As Graphics = cmbpanel.CreateGraphics
|
||||
If g1.MeasureString(Text, cmbpanel.Font).Width + 30 > maxWith Then
|
||||
maxWith = g1.MeasureString(Text, cmbpanel.Font).Width + 30
|
||||
End If
|
||||
g1.Dispose()
|
||||
Next oItem
|
||||
End Using
|
||||
cmbpanel.DropDownWidth = maxWith
|
||||
|
||||
ElseIf displayboxname.StartsWith(ClassControlCreator.PREFIX_DATAGRIDVIEW) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_TABLE) Then
|
||||
'not implemented
|
||||
End If
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user