From b7c3bc343df264cb3f677705d1f114eab42f4861 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 25 Nov 2015 17:41:30 +0100 Subject: [PATCH] MS_25112015_2 --- .../frmDokumentart_Konfig.Designer.vb | 49 ++++++++----------- .../frmDokumentart_Konfig.resx | 5 +- app/DD-Record-Organiser/frmUserKonfig.vb | 5 ++ .../frmUserKonfig_AddUsers.Designer.vb | 3 ++ .../frmUserKonfig_AddUsers.resx | 3 ++ .../frmUserKonfig_AddUsers.vb | 11 +++++ 6 files changed, 47 insertions(+), 29 deletions(-) diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb index b534981..9e071db 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb @@ -44,7 +44,6 @@ Partial Class frmDokumentart_Konfig Dim SQL_RESULTLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDokumentart_Konfig)) 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.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton() Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -151,6 +150,7 @@ Partial Class frmDokumentart_Konfig Me.TBPMO_FORM_VIEWTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter() Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter() Me.TBWH_DOKART_MODULETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter() + Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() KURZNAMELabel = New System.Windows.Forms.Label() @@ -287,7 +287,7 @@ Partial Class frmDokumentart_Konfig GUIDLabel1.AutoSize = True GUIDLabel1.Location = New System.Drawing.Point(311, 63) GUIDLabel1.Name = "GUIDLabel1" - GUIDLabel1.Size = New System.Drawing.Size(21, 15) + GUIDLabel1.Size = New System.Drawing.Size(22, 13) GUIDLabel1.TabIndex = 2 GUIDLabel1.Text = "ID:" ' @@ -296,7 +296,7 @@ Partial Class frmDokumentart_Konfig INDEXNAMELabel.AutoSize = True INDEXNAMELabel.Location = New System.Drawing.Point(388, 63) INDEXNAMELabel.Name = "INDEXNAMELabel" - INDEXNAMELabel.Size = New System.Drawing.Size(68, 15) + INDEXNAMELabel.Size = New System.Drawing.Size(65, 13) INDEXNAMELabel.TabIndex = 4 INDEXNAMELabel.Text = "Indexname:" ' @@ -305,7 +305,7 @@ Partial Class frmDokumentart_Konfig VALUELabel.AutoSize = True VALUELabel.Location = New System.Drawing.Point(662, 63) VALUELabel.Name = "VALUELabel" - VALUELabel.Size = New System.Drawing.Size(150, 15) + VALUELabel.Size = New System.Drawing.Size(141, 13) VALUELabel.TabIndex = 6 VALUELabel.Text = "Platzhalter Laufzeitvariable:" ' @@ -314,7 +314,7 @@ Partial Class frmDokumentart_Konfig COMMENTLabel.AutoSize = True COMMENTLabel.Location = New System.Drawing.Point(311, 107) COMMENTLabel.Name = "COMMENTLabel" - COMMENTLabel.Size = New System.Drawing.Size(71, 15) + COMMENTLabel.Size = New System.Drawing.Size(64, 13) COMMENTLabel.TabIndex = 8 COMMENTLabel.Text = "Bemerkung:" ' @@ -323,7 +323,7 @@ Partial Class frmDokumentart_Konfig ADDED_WHOLabel.AutoSize = True ADDED_WHOLabel.Location = New System.Drawing.Point(311, 155) ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ADDED_WHOLabel.Size = New System.Drawing.Size(67, 15) + ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) ADDED_WHOLabel.TabIndex = 12 ADDED_WHOLabel.Text = "Erstellt wer:" ' @@ -332,7 +332,7 @@ Partial Class frmDokumentart_Konfig ADDED_WHENLabel.AutoSize = True ADDED_WHENLabel.Location = New System.Drawing.Point(434, 155) ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ADDED_WHENLabel.Size = New System.Drawing.Size(77, 15) + ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) ADDED_WHENLabel.TabIndex = 14 ADDED_WHENLabel.Text = "Erstellt wann:" ' @@ -341,7 +341,7 @@ Partial Class frmDokumentart_Konfig CHANGED_WHOLabel.AutoSize = True CHANGED_WHOLabel.Location = New System.Drawing.Point(583, 155) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 15) + CHANGED_WHOLabel.Size = New System.Drawing.Size(73, 13) CHANGED_WHOLabel.TabIndex = 16 CHANGED_WHOLabel.Text = "Geändert wo:" ' @@ -350,7 +350,7 @@ Partial Class frmDokumentart_Konfig CHANGED_WHENLabel.AutoSize = True CHANGED_WHENLabel.Location = New System.Drawing.Point(703, 155) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 15) + CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel.TabIndex = 18 CHANGED_WHENLabel.Text = "Geändert wann:" ' @@ -369,7 +369,7 @@ Partial Class frmDokumentart_Konfig SQL_RESULTLabel.AutoSize = True SQL_RESULTLabel.Location = New System.Drawing.Point(929, 63) SQL_RESULTLabel.Name = "SQL_RESULTLabel" - SQL_RESULTLabel.Size = New System.Drawing.Size(68, 15) + SQL_RESULTLabel.Size = New System.Drawing.Size(64, 13) SQL_RESULTLabel.TabIndex = 79 SQL_RESULTLabel.Text = "SQL-Result:" ' @@ -912,7 +912,7 @@ Partial Class frmDokumentart_Konfig Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(706, 173) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True - Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(142, 23) + Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(142, 21) Me.CHANGED_WHENTextBox.TabIndex = 19 Me.CHANGED_WHENTextBox.TabStop = False ' @@ -922,7 +922,7 @@ Partial Class frmDokumentart_Konfig Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(586, 173) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True - Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(111, 23) + Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(111, 21) Me.CHANGED_WHOTextBox.TabIndex = 17 Me.CHANGED_WHOTextBox.TabStop = False ' @@ -932,7 +932,7 @@ Partial Class frmDokumentart_Konfig Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(435, 173) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True - Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(142, 23) + Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(142, 21) Me.ADDED_WHENTextBox.TabIndex = 15 Me.ADDED_WHENTextBox.TabStop = False ' @@ -942,7 +942,7 @@ Partial Class frmDokumentart_Konfig Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(314, 173) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True - Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(111, 23) + Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(111, 21) Me.ADDED_WHOTextBox.TabIndex = 13 Me.ADDED_WHOTextBox.TabStop = False ' @@ -961,7 +961,7 @@ Partial Class frmDokumentart_Konfig Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "COMMENT", True)) Me.COMMENTTextBox.Location = New System.Drawing.Point(314, 125) Me.COMMENTTextBox.Name = "COMMENTTextBox" - Me.COMMENTTextBox.Size = New System.Drawing.Size(534, 23) + Me.COMMENTTextBox.Size = New System.Drawing.Size(534, 21) Me.COMMENTTextBox.TabIndex = 2 ' 'VALUEComboBox @@ -971,7 +971,7 @@ Partial Class frmDokumentart_Konfig Me.VALUEComboBox.Items.AddRange(New Object() {"@Record-ID", "@Dokart"}) Me.VALUEComboBox.Location = New System.Drawing.Point(665, 80) Me.VALUEComboBox.Name = "VALUEComboBox" - Me.VALUEComboBox.Size = New System.Drawing.Size(183, 23) + Me.VALUEComboBox.Size = New System.Drawing.Size(183, 21) Me.VALUEComboBox.TabIndex = 1 ' 'INDEXNAMEComboBox @@ -980,7 +980,7 @@ Partial Class frmDokumentart_Konfig Me.INDEXNAMEComboBox.FormattingEnabled = True Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(391, 80) Me.INDEXNAMEComboBox.Name = "INDEXNAMEComboBox" - Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(268, 23) + Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(268, 21) Me.INDEXNAMEComboBox.TabIndex = 0 ' 'GUIDTextBox1 @@ -989,7 +989,7 @@ Partial Class frmDokumentart_Konfig Me.GUIDTextBox1.Location = New System.Drawing.Point(314, 81) Me.GUIDTextBox1.Name = "GUIDTextBox1" Me.GUIDTextBox1.ReadOnly = True - Me.GUIDTextBox1.Size = New System.Drawing.Size(68, 23) + Me.GUIDTextBox1.Size = New System.Drawing.Size(68, 21) Me.GUIDTextBox1.TabIndex = 3 Me.GUIDTextBox1.TabStop = False ' @@ -1158,14 +1158,6 @@ Partial Class frmDokumentart_Konfig Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn7, Me.DataGridViewTextBoxColumn8, Me.DataGridViewTextBoxColumn9}) Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DataSource = Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(31, Byte), Integer), CType(CType(53, Byte), Integer)) - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DefaultCellStyle = DataGridViewCellStyle2 Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Location = New System.Drawing.Point(11, 106) Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Name = "TBPMO_WD_FORMVIEW_DOKTYPESDataGridView" Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ReadOnly = True @@ -1231,7 +1223,7 @@ Partial Class frmDokumentart_Konfig Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(8, 57) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(229, 15) + Me.Label1.Size = New System.Drawing.Size(212, 13) Me.Label1.TabIndex = 5 Me.Label1.Text = "Entität auswählen (Angezeigtes Formular):" ' @@ -1254,7 +1246,7 @@ Partial Class frmDokumentart_Konfig Me.ComboBox1.FormattingEnabled = True Me.ComboBox1.Location = New System.Drawing.Point(11, 77) Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(274, 23) + Me.ComboBox1.Size = New System.Drawing.Size(274, 21) Me.ComboBox1.TabIndex = 3 Me.ComboBox1.ValueMember = "GUID" ' @@ -1545,4 +1537,5 @@ Partial Class frmDokumentart_Konfig Friend WithEvents ListBox3 As System.Windows.Forms.ListBox Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents SQL_RESULTTextBox As System.Windows.Forms.TextBox + Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController End Class diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx index c56b19e..7cf164c 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx @@ -445,8 +445,11 @@ 610, 95 + + 876, 95 + - 89 + 136 diff --git a/app/DD-Record-Organiser/frmUserKonfig.vb b/app/DD-Record-Organiser/frmUserKonfig.vb index b2415d8..8caa659 100644 --- a/app/DD-Record-Organiser/frmUserKonfig.vb +++ b/app/DD-Record-Organiser/frmUserKonfig.vb @@ -106,6 +106,11 @@ Private Sub LoadGroupsForSelectedUser() Dim user As DataRowView = GetSelectedUserObject() + Try + Dim userID As Integer = user.Item(0) + Catch ex As Exception + Exit Sub + End Try If Not user Is Nothing Then Dim userID As Integer = user.Item(0) Dim SQL As String = String.Format("SELECT GROUP_NAME FROM VWPMO_USERS_GROUPS WHERE USER_ID = {0}", userID) diff --git a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb index ab9b2fa..e388205 100644 --- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb +++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmUserKonfig_AddUsers 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUserKonfig_AddUsers)) Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.lbGroups = New System.Windows.Forms.ListBox() @@ -34,6 +35,7 @@ Partial Class frmUserKonfig_AddUsers Me.tbSelectNone = New System.Windows.Forms.ToolStripButton() Me.btnCancel = New System.Windows.Forms.Button() Me.btnAddUsers = New System.Windows.Forms.Button() + Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -193,4 +195,5 @@ Partial Class frmUserKonfig_AddUsers Friend WithEvents tbSelectNone As System.Windows.Forms.ToolStripButton Friend WithEvents clbUsers As System.Windows.Forms.CheckedListBox Friend WithEvents ToolStripLabel2 As System.Windows.Forms.ToolStripLabel + Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController End Class diff --git a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx index 7c9d719..f3f9411 100644 --- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx +++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.resx @@ -154,6 +154,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 231, 17 + AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA diff --git a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb index 91b8f77..25ae12c 100644 --- a/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb +++ b/app/DD-Record-Organiser/frmUserKonfig_AddUsers.vb @@ -126,4 +126,15 @@ Public Class frmUserKonfig_AddUsers clbUsers.SetItemChecked(i, False) Next End Sub + + Private Sub clbUsers_SelectedIndexChanged(sender As Object, e As EventArgs) Handles clbUsers.SelectedIndexChanged + ToolTipController1.HideHint() + Dim userstring As String = clbUsers.SelectedItem.ToString + Dim userldap As UserPrincipal = clbUsers.SelectedItem + Dim PRENAME As String = userldap.GivenName + Dim NAME As String = userldap.Surname + Dim USERNAME As String = userldap.SamAccountName + Dim email As String = userldap.EmailAddress + ToolTipController1.ShowHint("Used ldap paramters:", userstring & USERNAME & vbNewLine & email, DevExpress.Utils.ToolTipLocation.RightCenter) + End Sub End Class \ No newline at end of file