diff --git a/app/DD-Record-Organiser/ClassImport_Windream.vb b/app/DD-Record-Organiser/ClassImport_Windream.vb index d6f529d..7b2e1a6 100644 --- a/app/DD-Record-Organiser/ClassImport_Windream.vb +++ b/app/DD-Record-Organiser/ClassImport_Windream.vb @@ -180,6 +180,7 @@ Public Class ClassImport_Windream Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_AUTOindexresult, True) If IsNothing(AUTOindexresult) Then ClassLogger.Add(">> unexpected: AUTOindexresult is nothing!!", False) + ClassLogger.Add(">> " & sql_AUTOindexresult, False) value = "" Else If IsDBNull(AUTOindexresult) Then diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index 7440659..d6d7104 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -90,12 +90,35 @@ Partial Class frmConstructorDesigner Me.SQL_SELECT_EBENE2TextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox1 = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox1 = New System.Windows.Forms.TextBox() + Me.XtraTabPage5 = New DevExpress.XtraTab.XtraTabPage() + Me.ListBoxConfiguredDisplay = New System.Windows.Forms.ListBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.listBoxControls = New System.Windows.Forms.ListBox() + Me.Label3 = New System.Windows.Forms.Label() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() + Me.chkWDSearch_Active = New System.Windows.Forms.CheckBox() + Me.grpbxWD_RecordSearch = New System.Windows.Forms.GroupBox() + Me.lblSave1 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.txtWindreamsuche = New System.Windows.Forms.TextBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.cmbSearchPattern5 = New System.Windows.Forms.ComboBox() + Me.cmbSearchPattern1 = New System.Windows.Forms.ComboBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.btnWindreamsuche = New System.Windows.Forms.Button() + Me.Label14 = New System.Windows.Forms.Label() + Me.cmbSearchPattern4 = New System.Windows.Forms.ComboBox() + Me.cmbSearchPattern3 = New System.Windows.Forms.ComboBox() + Me.cmbSearchPattern2 = New System.Windows.Forms.ComboBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.SEARCH_PATTERN4ComboBox = New System.Windows.Forms.ComboBox() + Me.SEARCH_PATTERN1ComboBox = New System.Windows.Forms.ComboBox() Me.SEARCH_PATTERN3ComboBox = New System.Windows.Forms.ComboBox() Me.SEARCH_PATTERN2ComboBox = New System.Windows.Forms.ComboBox() - Me.SEARCH_PATTERN1ComboBox = New System.Windows.Forms.ComboBox() - Me.XtraTabPage5 = New DevExpress.XtraTab.XtraTabPage() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() @@ -107,6 +130,8 @@ Partial Class frmConstructorDesigner Me.TBPMO_FORM_CONSTRUCTORTableAdapter1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager() Me.lblSave = New System.Windows.Forms.Label() + Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog() + Me.btnAddControl = New System.Windows.Forms.Button() GUIDLabel = New System.Windows.Forms.Label() FORM_TITLELabel = New System.Windows.Forms.Label() SEQUENCE_MENULabel = New System.Windows.Forms.Label() @@ -140,7 +165,10 @@ Partial Class frmConstructorDesigner CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPage3.SuspendLayout() + Me.XtraTabPage5.SuspendLayout() Me.XtraTabPage4.SuspendLayout() + Me.grpbxWD_RecordSearch.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -230,11 +258,11 @@ Partial Class frmConstructorDesigner 'WINDREAM_SEARCHLabel ' WINDREAM_SEARCHLabel.AutoSize = True - WINDREAM_SEARCHLabel.Location = New System.Drawing.Point(5, 11) + WINDREAM_SEARCHLabel.Location = New System.Drawing.Point(6, 18) WINDREAM_SEARCHLabel.Name = "WINDREAM_SEARCHLabel" - WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(114, 13) + WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(96, 13) WINDREAM_SEARCHLabel.TabIndex = 34 - WINDREAM_SEARCHLabel.Text = "WINDREAM SEARCH:" + WINDREAM_SEARCHLabel.Text = "windream-Suche:" ' 'ADDED_WHOLabel1 ' @@ -302,38 +330,38 @@ Partial Class frmConstructorDesigner 'SEARCH_PATTERN1Label1 ' SEARCH_PATTERN1Label1.AutoSize = True - SEARCH_PATTERN1Label1.Location = New System.Drawing.Point(5, 52) + SEARCH_PATTERN1Label1.Location = New System.Drawing.Point(6, 59) SEARCH_PATTERN1Label1.Name = "SEARCH_PATTERN1Label1" - SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(104, 13) + SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(93, 13) SEARCH_PATTERN1Label1.TabIndex = 39 - SEARCH_PATTERN1Label1.Text = "SEARCH PATTERN1:" + SEARCH_PATTERN1Label1.Text = "Search Pattern 1:" ' 'SEARCH_PATTERN2Label1 ' SEARCH_PATTERN2Label1.AutoSize = True - SEARCH_PATTERN2Label1.Location = New System.Drawing.Point(5, 92) + SEARCH_PATTERN2Label1.Location = New System.Drawing.Point(181, 59) SEARCH_PATTERN2Label1.Name = "SEARCH_PATTERN2Label1" - SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(104, 13) + SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(93, 13) SEARCH_PATTERN2Label1.TabIndex = 40 - SEARCH_PATTERN2Label1.Text = "SEARCH PATTERN2:" + SEARCH_PATTERN2Label1.Text = "Search Pattern 2:" ' 'SEARCH_PATTERN3Label ' SEARCH_PATTERN3Label.AutoSize = True - SEARCH_PATTERN3Label.Location = New System.Drawing.Point(170, 52) + SEARCH_PATTERN3Label.Location = New System.Drawing.Point(6, 99) SEARCH_PATTERN3Label.Name = "SEARCH_PATTERN3Label" - SEARCH_PATTERN3Label.Size = New System.Drawing.Size(104, 13) + SEARCH_PATTERN3Label.Size = New System.Drawing.Size(93, 13) SEARCH_PATTERN3Label.TabIndex = 41 - SEARCH_PATTERN3Label.Text = "SEARCH PATTERN3:" + SEARCH_PATTERN3Label.Text = "Search Pattern 3:" ' 'SEARCH_PATTERN4Label ' SEARCH_PATTERN4Label.AutoSize = True - SEARCH_PATTERN4Label.Location = New System.Drawing.Point(170, 92) + SEARCH_PATTERN4Label.Location = New System.Drawing.Point(181, 99) SEARCH_PATTERN4Label.Name = "SEARCH_PATTERN4Label" - SEARCH_PATTERN4Label.Size = New System.Drawing.Size(104, 13) + SEARCH_PATTERN4Label.Size = New System.Drawing.Size(93, 13) SEARCH_PATTERN4Label.TabIndex = 42 - SEARCH_PATTERN4Label.Text = "SEARCH PATTERN4:" + SEARCH_PATTERN4Label.Text = "Search Pattern 4:" ' 'DD_ECMAdmin ' @@ -486,7 +514,7 @@ Partial Class frmConstructorDesigner Me.TreeView1.Location = New System.Drawing.Point(0, 0) Me.TreeView1.Name = "TreeView1" Me.TreeView1.SelectedImageIndex = 1 - Me.TreeView1.Size = New System.Drawing.Size(292, 355) + Me.TreeView1.Size = New System.Drawing.Size(292, 407) Me.TreeView1.TabIndex = 1 ' 'ImageList1 @@ -592,10 +620,11 @@ Partial Class frmConstructorDesigner ' 'WINDREAM_SEARCHTextBox ' + Me.WINDREAM_SEARCHTextBox.BackColor = System.Drawing.SystemColors.Info Me.WINDREAM_SEARCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "WINDREAM_SEARCH", True)) - Me.WINDREAM_SEARCHTextBox.Location = New System.Drawing.Point(8, 27) + Me.WINDREAM_SEARCHTextBox.Location = New System.Drawing.Point(9, 34) Me.WINDREAM_SEARCHTextBox.Name = "WINDREAM_SEARCHTextBox" - Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(670, 22) + Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(543, 22) Me.WINDREAM_SEARCHTextBox.TabIndex = 35 ' 'XtraTabControl1 @@ -603,7 +632,7 @@ Partial Class frmConstructorDesigner Me.XtraTabControl1.Location = New System.Drawing.Point(15, 249) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(1147, 380) + Me.XtraTabControl1.Size = New System.Drawing.Size(1147, 435) Me.XtraTabControl1.TabIndex = 40 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1}) ' @@ -614,7 +643,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage1.Controls.Add(Me.ToolStrip1) Me.XtraTabPage1.Controls.Add(Me.TreeView1) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1145, 355) + Me.XtraTabPage1.Size = New System.Drawing.Size(1141, 407) Me.XtraTabPage1.Text = "Entitäten-Übersicht" ' 'XtraTabControl2 @@ -623,9 +652,9 @@ Partial Class frmConstructorDesigner Me.XtraTabControl2.Location = New System.Drawing.Point(292, 25) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 - Me.XtraTabControl2.Size = New System.Drawing.Size(853, 308) + Me.XtraTabControl2.Size = New System.Drawing.Size(849, 360) Me.XtraTabControl2.TabIndex = 35 - Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5}) + Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage5, Me.XtraTabPage3, Me.XtraTabPage4}) ' 'XtraTabPage3 ' @@ -650,7 +679,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Controls.Add(Me.LEVEL1_SELECTCheckBox) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(851, 283) + Me.XtraTabPage3.Size = New System.Drawing.Size(843, 332) Me.XtraTabPage3.Text = "Allgemein" ' 'Label4 @@ -739,41 +768,310 @@ Partial Class frmConstructorDesigner Me.ADDED_WHOTextBox1.ReadOnly = True Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(160, 22) Me.ADDED_WHOTextBox1.TabIndex = 44 + ' + 'XtraTabPage5 + ' + Me.XtraTabPage5.Controls.Add(Me.btnAddControl) + Me.XtraTabPage5.Controls.Add(Me.ListBoxConfiguredDisplay) + Me.XtraTabPage5.Controls.Add(Me.Label6) + Me.XtraTabPage5.Controls.Add(Me.Label5) + Me.XtraTabPage5.Controls.Add(Me.listBoxControls) + Me.XtraTabPage5.Controls.Add(Me.Label3) + Me.XtraTabPage5.Name = "XtraTabPage5" + Me.XtraTabPage5.Size = New System.Drawing.Size(843, 332) + Me.XtraTabPage5.Text = "Quick View Konfiguration" + ' + 'ListBoxConfiguredDisplay + ' + Me.ListBoxConfiguredDisplay.FormattingEnabled = True + Me.ListBoxConfiguredDisplay.Location = New System.Drawing.Point(288, 49) + Me.ListBoxConfiguredDisplay.Name = "ListBoxConfiguredDisplay" + Me.ListBoxConfiguredDisplay.Size = New System.Drawing.Size(186, 134) + Me.ListBoxConfiguredDisplay.TabIndex = 4 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(285, 33) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(146, 13) + Me.Label6.TabIndex = 3 + Me.Label6.Text = "Konfigurierte Feldauswahl:" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(5, 33) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(108, 13) + Me.Label5.TabIndex = 2 + Me.Label5.Text = "Felder zur Auswahl:" + ' + 'listBoxControls + ' + Me.listBoxControls.FormattingEnabled = True + Me.listBoxControls.Location = New System.Drawing.Point(8, 49) + Me.listBoxControls.Name = "listBoxControls" + Me.listBoxControls.Size = New System.Drawing.Size(186, 277) + Me.listBoxControls.TabIndex = 1 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(3, 10) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(449, 13) + Me.Label3.TabIndex = 0 + Me.Label3.Text = "Konfigurieren Sie hier die Erstansicht zur Navigation innerhalb der Eintitätsdate" & _ + "nsätze" ' 'XtraTabPage4 ' - Me.XtraTabPage4.Controls.Add(SEARCH_PATTERN4Label) - Me.XtraTabPage4.Controls.Add(Me.SEARCH_PATTERN4ComboBox) - Me.XtraTabPage4.Controls.Add(SEARCH_PATTERN3Label) - Me.XtraTabPage4.Controls.Add(Me.SEARCH_PATTERN3ComboBox) - Me.XtraTabPage4.Controls.Add(SEARCH_PATTERN2Label1) - Me.XtraTabPage4.Controls.Add(Me.SEARCH_PATTERN2ComboBox) - Me.XtraTabPage4.Controls.Add(SEARCH_PATTERN1Label1) - Me.XtraTabPage4.Controls.Add(Me.SEARCH_PATTERN1ComboBox) - Me.XtraTabPage4.Controls.Add(Me.WINDREAM_SEARCHTextBox) - Me.XtraTabPage4.Controls.Add(WINDREAM_SEARCHLabel) + Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active) + Me.XtraTabPage4.Controls.Add(Me.grpbxWD_RecordSearch) + Me.XtraTabPage4.Controls.Add(Me.GroupBox1) Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(843, 277) + Me.XtraTabPage4.Size = New System.Drawing.Size(843, 332) Me.XtraTabPage4.Text = "windream-Suche Konfiguration" ' + 'chkWDSearch_Active + ' + Me.chkWDSearch_Active.AutoSize = True + Me.chkWDSearch_Active.Location = New System.Drawing.Point(14, 3) + Me.chkWDSearch_Active.Name = "chkWDSearch_Active" + Me.chkWDSearch_Active.Size = New System.Drawing.Size(141, 17) + Me.chkWDSearch_Active.TabIndex = 79 + Me.chkWDSearch_Active.Text = "Windream-Suche aktiv" + Me.chkWDSearch_Active.UseVisualStyleBackColor = True + ' + 'grpbxWD_RecordSearch + ' + Me.grpbxWD_RecordSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.grpbxWD_RecordSearch.Controls.Add(Me.lblSave1) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label9) + Me.grpbxWD_RecordSearch.Controls.Add(Me.txtWindreamsuche) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label15) + Me.grpbxWD_RecordSearch.Controls.Add(Me.cmbSearchPattern5) + Me.grpbxWD_RecordSearch.Controls.Add(Me.cmbSearchPattern1) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label11) + Me.grpbxWD_RecordSearch.Controls.Add(Me.btnWindreamsuche) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label14) + Me.grpbxWD_RecordSearch.Controls.Add(Me.cmbSearchPattern4) + Me.grpbxWD_RecordSearch.Controls.Add(Me.cmbSearchPattern3) + Me.grpbxWD_RecordSearch.Controls.Add(Me.cmbSearchPattern2) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label13) + Me.grpbxWD_RecordSearch.Controls.Add(Me.Label7) + Me.grpbxWD_RecordSearch.Enabled = False + Me.grpbxWD_RecordSearch.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.grpbxWD_RecordSearch.Location = New System.Drawing.Point(5, 24) + Me.grpbxWD_RecordSearch.Name = "grpbxWD_RecordSearch" + Me.grpbxWD_RecordSearch.Size = New System.Drawing.Size(825, 157) + Me.grpbxWD_RecordSearch.TabIndex = 78 + Me.grpbxWD_RecordSearch.TabStop = False + Me.grpbxWD_RecordSearch.Text = "windream-Suche für Recordbezogene Suche:" + ' + 'lblSave1 + ' + Me.lblSave1.AutoSize = True + Me.lblSave1.BackColor = System.Drawing.Color.Yellow + Me.lblSave1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblSave1.Location = New System.Drawing.Point(346, 126) + Me.lblSave1.Name = "lblSave1" + Me.lblSave1.Size = New System.Drawing.Size(129, 13) + Me.lblSave1.TabIndex = 78 + Me.lblSave1.Text = "Erfolgreich gespeichert." + Me.lblSave1.Visible = False + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(6, 18) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(96, 13) + Me.Label9.TabIndex = 64 + Me.Label9.Text = "windream-Suche:" + ' + 'txtWindreamsuche + ' + Me.txtWindreamsuche.BackColor = System.Drawing.SystemColors.Info + Me.txtWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtWindreamsuche.Location = New System.Drawing.Point(9, 34) + Me.txtWindreamsuche.Name = "txtWindreamsuche" + Me.txtWindreamsuche.Size = New System.Drawing.Size(543, 22) + Me.txtWindreamsuche.TabIndex = 66 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.Location = New System.Drawing.Point(346, 63) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(93, 13) + Me.Label15.TabIndex = 76 + Me.Label15.Text = "Search Pattern 5:" + ' + 'cmbSearchPattern5 + ' + Me.cmbSearchPattern5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSearchPattern5.FormattingEnabled = True + Me.cmbSearchPattern5.Items.AddRange(New Object() {"Form-ID (Entity)", "Record-ID"}) + Me.cmbSearchPattern5.Location = New System.Drawing.Point(349, 79) + Me.cmbSearchPattern5.Name = "cmbSearchPattern5" + Me.cmbSearchPattern5.Size = New System.Drawing.Size(203, 21) + Me.cmbSearchPattern5.TabIndex = 77 + ' + 'cmbSearchPattern1 + ' + Me.cmbSearchPattern1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSearchPattern1.FormattingEnabled = True + Me.cmbSearchPattern1.Items.AddRange(New Object() {"Form-ID (Entity)", "Record-ID"}) + Me.cmbSearchPattern1.Location = New System.Drawing.Point(9, 79) + Me.cmbSearchPattern1.Name = "cmbSearchPattern1" + Me.cmbSearchPattern1.Size = New System.Drawing.Size(166, 21) + Me.cmbSearchPattern1.TabIndex = 69 + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(6, 63) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(93, 13) + Me.Label11.TabIndex = 68 + Me.Label11.Text = "Search Pattern 1:" + ' + 'btnWindreamsuche + ' + Me.btnWindreamsuche.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnWindreamsuche.Location = New System.Drawing.Point(558, 33) + Me.btnWindreamsuche.Name = "btnWindreamsuche" + Me.btnWindreamsuche.Size = New System.Drawing.Size(24, 21) + Me.btnWindreamsuche.TabIndex = 65 + Me.btnWindreamsuche.Text = "..." + Me.btnWindreamsuche.UseVisualStyleBackColor = True + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(181, 107) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(93, 13) + Me.Label14.TabIndex = 74 + Me.Label14.Text = "Search Pattern 4:" + ' + 'cmbSearchPattern4 + ' + Me.cmbSearchPattern4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSearchPattern4.FormattingEnabled = True + Me.cmbSearchPattern4.Items.AddRange(New Object() {"Form-ID (Entity)", "Record-ID"}) + Me.cmbSearchPattern4.Location = New System.Drawing.Point(184, 123) + Me.cmbSearchPattern4.Name = "cmbSearchPattern4" + Me.cmbSearchPattern4.Size = New System.Drawing.Size(156, 21) + Me.cmbSearchPattern4.TabIndex = 75 + ' + 'cmbSearchPattern3 + ' + Me.cmbSearchPattern3.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSearchPattern3.FormattingEnabled = True + Me.cmbSearchPattern3.Items.AddRange(New Object() {"Form-ID (Entity)", "Record-ID"}) + Me.cmbSearchPattern3.Location = New System.Drawing.Point(9, 123) + Me.cmbSearchPattern3.Name = "cmbSearchPattern3" + Me.cmbSearchPattern3.Size = New System.Drawing.Size(166, 21) + Me.cmbSearchPattern3.TabIndex = 73 + ' + 'cmbSearchPattern2 + ' + Me.cmbSearchPattern2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbSearchPattern2.FormattingEnabled = True + Me.cmbSearchPattern2.Items.AddRange(New Object() {"Form-ID (Entity)", "Record-ID"}) + Me.cmbSearchPattern2.Location = New System.Drawing.Point(184, 79) + Me.cmbSearchPattern2.Name = "cmbSearchPattern2" + Me.cmbSearchPattern2.Size = New System.Drawing.Size(156, 21) + Me.cmbSearchPattern2.TabIndex = 71 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label13.Location = New System.Drawing.Point(6, 107) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(93, 13) + Me.Label13.TabIndex = 72 + Me.Label13.Text = "Search Pattern 3:" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(181, 63) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(93, 13) + Me.Label7.TabIndex = 70 + Me.Label7.Text = "Search Pattern 2:" + ' + 'GroupBox1 + ' + Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupBox1.Controls.Add(Me.Button1) + Me.GroupBox1.Controls.Add(WINDREAM_SEARCHLabel) + Me.GroupBox1.Controls.Add(SEARCH_PATTERN4Label) + Me.GroupBox1.Controls.Add(Me.WINDREAM_SEARCHTextBox) + Me.GroupBox1.Controls.Add(Me.SEARCH_PATTERN4ComboBox) + Me.GroupBox1.Controls.Add(Me.SEARCH_PATTERN1ComboBox) + Me.GroupBox1.Controls.Add(SEARCH_PATTERN3Label) + Me.GroupBox1.Controls.Add(SEARCH_PATTERN1Label1) + Me.GroupBox1.Controls.Add(Me.SEARCH_PATTERN3ComboBox) + Me.GroupBox1.Controls.Add(Me.SEARCH_PATTERN2ComboBox) + Me.GroupBox1.Controls.Add(SEARCH_PATTERN2Label1) + Me.GroupBox1.Location = New System.Drawing.Point(5, 187) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(825, 148) + Me.GroupBox1.TabIndex = 44 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "windream-Suche für Entitätsweite Suche:" + ' + 'Button1 + ' + Me.Button1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.Location = New System.Drawing.Point(558, 33) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(24, 21) + Me.Button1.TabIndex = 66 + Me.Button1.Text = "..." + Me.Button1.UseVisualStyleBackColor = True + ' 'SEARCH_PATTERN4ComboBox ' Me.SEARCH_PATTERN4ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN4", True)) Me.SEARCH_PATTERN4ComboBox.FormattingEnabled = True Me.SEARCH_PATTERN4ComboBox.Items.AddRange(New Object() {"@Record-ID", "@EntityID", "@ParentID"}) - Me.SEARCH_PATTERN4ComboBox.Location = New System.Drawing.Point(173, 108) + Me.SEARCH_PATTERN4ComboBox.Location = New System.Drawing.Point(184, 115) Me.SEARCH_PATTERN4ComboBox.Name = "SEARCH_PATTERN4ComboBox" - Me.SEARCH_PATTERN4ComboBox.Size = New System.Drawing.Size(171, 21) + Me.SEARCH_PATTERN4ComboBox.Size = New System.Drawing.Size(156, 21) Me.SEARCH_PATTERN4ComboBox.TabIndex = 43 ' + 'SEARCH_PATTERN1ComboBox + ' + Me.SEARCH_PATTERN1ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN1", True)) + Me.SEARCH_PATTERN1ComboBox.FormattingEnabled = True + Me.SEARCH_PATTERN1ComboBox.Items.AddRange(New Object() {"@Record-ID", "@EntityID", "@ParentID"}) + Me.SEARCH_PATTERN1ComboBox.Location = New System.Drawing.Point(9, 75) + Me.SEARCH_PATTERN1ComboBox.Name = "SEARCH_PATTERN1ComboBox" + Me.SEARCH_PATTERN1ComboBox.Size = New System.Drawing.Size(166, 21) + Me.SEARCH_PATTERN1ComboBox.TabIndex = 40 + ' 'SEARCH_PATTERN3ComboBox ' Me.SEARCH_PATTERN3ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN3", True)) Me.SEARCH_PATTERN3ComboBox.FormattingEnabled = True Me.SEARCH_PATTERN3ComboBox.Items.AddRange(New Object() {"@Record-ID", "@EntityID", "@ParentID"}) - Me.SEARCH_PATTERN3ComboBox.Location = New System.Drawing.Point(173, 68) + Me.SEARCH_PATTERN3ComboBox.Location = New System.Drawing.Point(9, 115) Me.SEARCH_PATTERN3ComboBox.Name = "SEARCH_PATTERN3ComboBox" - Me.SEARCH_PATTERN3ComboBox.Size = New System.Drawing.Size(171, 21) + Me.SEARCH_PATTERN3ComboBox.Size = New System.Drawing.Size(166, 21) Me.SEARCH_PATTERN3ComboBox.TabIndex = 42 ' 'SEARCH_PATTERN2ComboBox @@ -781,33 +1079,17 @@ Partial Class frmConstructorDesigner Me.SEARCH_PATTERN2ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN2", True)) Me.SEARCH_PATTERN2ComboBox.FormattingEnabled = True Me.SEARCH_PATTERN2ComboBox.Items.AddRange(New Object() {"@Record-ID", "@EntityID", "@ParentID"}) - Me.SEARCH_PATTERN2ComboBox.Location = New System.Drawing.Point(8, 108) + Me.SEARCH_PATTERN2ComboBox.Location = New System.Drawing.Point(184, 75) Me.SEARCH_PATTERN2ComboBox.Name = "SEARCH_PATTERN2ComboBox" Me.SEARCH_PATTERN2ComboBox.Size = New System.Drawing.Size(156, 21) Me.SEARCH_PATTERN2ComboBox.TabIndex = 41 ' - 'SEARCH_PATTERN1ComboBox - ' - Me.SEARCH_PATTERN1ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN1", True)) - Me.SEARCH_PATTERN1ComboBox.FormattingEnabled = True - Me.SEARCH_PATTERN1ComboBox.Items.AddRange(New Object() {"@Record-ID", "@EntityID", "@ParentID"}) - Me.SEARCH_PATTERN1ComboBox.Location = New System.Drawing.Point(8, 68) - Me.SEARCH_PATTERN1ComboBox.Name = "SEARCH_PATTERN1ComboBox" - Me.SEARCH_PATTERN1ComboBox.Size = New System.Drawing.Size(156, 21) - Me.SEARCH_PATTERN1ComboBox.TabIndex = 40 - ' - 'XtraTabPage5 - ' - Me.XtraTabPage5.Name = "XtraTabPage5" - Me.XtraTabPage5.Size = New System.Drawing.Size(843, 277) - Me.XtraTabPage5.Text = "XtraTabPage5" - ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblSaveDetail}) - Me.StatusStrip1.Location = New System.Drawing.Point(292, 333) + Me.StatusStrip1.Location = New System.Drawing.Point(292, 385) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(853, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(849, 22) Me.StatusStrip1.TabIndex = 35 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -824,7 +1106,7 @@ Partial Class frmConstructorDesigner Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave}) Me.ToolStrip1.Location = New System.Drawing.Point(292, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(853, 25) + Me.ToolStrip1.Size = New System.Drawing.Size(849, 25) Me.ToolStrip1.TabIndex = 34 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -889,6 +1171,24 @@ Partial Class frmConstructorDesigner Me.lblSave.TabIndex = 44 Me.lblSave.Text = "Erfolgreich gespeichert." ' + 'OFDWindreamsuche + ' + Me.OFDWindreamsuche.Filter = "windream-Suche|*.wdf|Alle Dateien|*.*" + Me.OFDWindreamsuche.RestoreDirectory = True + Me.OFDWindreamsuche.Title = "windream-Suche wählen" + ' + 'btnAddControl + ' + Me.btnAddControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_Forward_16xLG + Me.btnAddControl.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAddControl.Location = New System.Drawing.Point(201, 71) + Me.btnAddControl.Name = "btnAddControl" + Me.btnAddControl.Size = New System.Drawing.Size(81, 23) + Me.btnAddControl.TabIndex = 5 + Me.btnAddControl.Text = "Add field" + Me.btnAddControl.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddControl.UseVisualStyleBackColor = True + ' 'frmConstructorDesigner ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -935,8 +1235,14 @@ Partial Class frmConstructorDesigner Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPage3.ResumeLayout(False) Me.XtraTabPage3.PerformLayout() + Me.XtraTabPage5.ResumeLayout(False) + Me.XtraTabPage5.PerformLayout() Me.XtraTabPage4.ResumeLayout(False) Me.XtraTabPage4.PerformLayout() + Me.grpbxWD_RecordSearch.ResumeLayout(False) + Me.grpbxWD_RecordSearch.PerformLayout() + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() Me.ToolStrip1.ResumeLayout(False) @@ -1008,4 +1314,29 @@ Partial Class frmConstructorDesigner Friend WithEvents SEARCH_PATTERN2ComboBox As System.Windows.Forms.ComboBox Friend WithEvents SEARCH_PATTERN1ComboBox As System.Windows.Forms.ComboBox Friend WithEvents lblSave As System.Windows.Forms.Label + Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox + Friend WithEvents cmbSearchPattern5 As System.Windows.Forms.ComboBox + Friend WithEvents cmbSearchPattern4 As System.Windows.Forms.ComboBox + Friend WithEvents cmbSearchPattern3 As System.Windows.Forms.ComboBox + Friend WithEvents cmbSearchPattern2 As System.Windows.Forms.ComboBox + Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents cmbSearchPattern1 As System.Windows.Forms.ComboBox + Friend WithEvents btnWindreamsuche As System.Windows.Forms.Button + Friend WithEvents txtWindreamsuche As System.Windows.Forms.TextBox + Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents OFDWindreamsuche As System.Windows.Forms.OpenFileDialog + Friend WithEvents grpbxWD_RecordSearch As System.Windows.Forms.GroupBox + Friend WithEvents Label11 As System.Windows.Forms.Label + Friend WithEvents Label14 As System.Windows.Forms.Label + Friend WithEvents Label13 As System.Windows.Forms.Label + Friend WithEvents Label15 As System.Windows.Forms.Label + Friend WithEvents chkWDSearch_Active As System.Windows.Forms.CheckBox + Friend WithEvents lblSave1 As System.Windows.Forms.Label + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents Label5 As System.Windows.Forms.Label + Friend WithEvents listBoxControls As System.Windows.Forms.ListBox + Friend WithEvents ListBoxConfiguredDisplay As System.Windows.Forms.ListBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents btnAddControl As System.Windows.Forms.Button End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index e756de6..2113060 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -281,7 +281,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAcABCAHAAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAQgBCQEIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -338,6 +338,9 @@ 17, 95 + + 421, 95 + 250 diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index 293e334..a2f3253 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -1,4 +1,6 @@ Public Class frmConstructorDesigner + Dim SELECTED_ENTITY_ID As Integer + Dim SELECTED_CONSTRUCTOR_DETAIL_ID As Integer Dim formloaded As Boolean = False Private Sub TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem.Click Try @@ -15,13 +17,14 @@ Catch ex As Exception MsgBox("Error in Saving FormConstructor:" & vbNewLine & ex.Message) End Try - + End Sub Private Sub frmConstructorDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_ECMAdmin1.TBPMO_FORM_CONSTRUCTOR". Sie können sie bei Bedarf verschieben oder entfernen. Try + XtraTabControl2.SelectedTabPageIndex = 0 formloaded = False Me.TBPMO_FORM_CONSTRUCTORTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter.Connection.ConnectionString = MyConnectionString @@ -52,11 +55,115 @@ Private Sub Load_Detail(ID As Integer) Try Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter.Fill(Me.DD_ECMAdmin.TBPMO_FORM_CONSTRUCTOR_DETAIL, ID) + SELECTED_ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & ID, True) Catch ex As System.Exception MsgBox("Error Loading Details:" & vbNewLine & ex.Message) End Try - End Sub + Select Case XtraTabControl2.SelectedTabPageIndex + Case 0 + Load_QuickDisplay() + + Case 2 + RecordSearch_Config() + End Select + End Sub + Public Sub Load_QuickDisplay() + Try + If SELECTED_CONSTRUCTOR_DETAIL_ID = 0 Then Exit Sub + Dim formId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID, True) + Dim sql = "SELECT T.GUID, T.COL_NAME AS 'COL_NAME' FROM TBPMO_CONTROL T, TBPMO_CONTROL_SCREEN T1, TBPMO_CONTROL_TYPE T2 WHERE T.SHOW_COLUMN = 1 AND T.[COL_NAME] <> '' AND T.GUID = T1.CONTROL_ID AND T.CONTROL_TYPE_ID = T2.GUID AND T.FORM_ID = " & formId & " AND LEN(ISNULL(T.COL_NAME,'')) > 0 and t.CONTROL_TYPE_ID not in (1,5,12) " & _ + "AND T2.GUID not in (1,5,7,8,9) AND T.GUID NOT IN (SELECT CONTROL_ID FROM TBPMO_FORM_CONSTR_QUICK_DISPLAY WHERE CONSTRUCT_ID = " & SELECTED_CONSTRUCTOR_DETAIL_ID & ") ORDER BY T1.TAB_INDEX" + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, "LOAD QUICKDISPLAY") + listBoxControls.DataSource = DT + listBoxControls.DisplayMember = DT.Columns(1).ColumnName + listBoxControls.ValueMember = DT.Columns(0).ColumnName + + Dim DT2 = ClassDatabase.Return_Datatable("SELECT T.GUID, T1.COL_NAME FROM TBPMO_FORM_CONSTR_QUICK_DISPLAY T, TBPMO_CONTROL T1 WHERE T.CONTROL_ID = T1.GUID AND T.CONSTRUCT_ID = " & SELECTED_CONSTRUCTOR_DETAIL_ID, "LOAD QUICKDISPLAY") + ListBoxConfiguredDisplay.DataSource = DT2 + ListBoxConfiguredDisplay.DisplayMember = DT2.Columns(1).ColumnName + ListBoxConfiguredDisplay.ValueMember = DT2.Columns(0).ColumnName + + Catch ex As Exception + MsgBox("Error Load_QuickDisplay:" & vbNewLine & ex.Message) + End Try + End Sub + Public Sub RecordSearch_Config() + Try + 'Zurücksetzen + txtWindreamsuche.Text = "" + cmbSearchPattern1.SelectedIndex = -1 + cmbSearchPattern2.SelectedIndex = -1 + cmbSearchPattern3.SelectedIndex = -1 + cmbSearchPattern4.SelectedIndex = -1 + cmbSearchPattern5.SelectedIndex = -1 + Dim res = ClassDatabase.Execute_Scalar("SELECT DOCUMENT_VIEW FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID) + + If res = True Then + chkWDSearch_Active.Checked = True + + Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT WINDREAM_SEARCH,SEARCH_PATTERN1,SEARCH_PATTERN2,SEARCH_PATTERN3,SEARCH_PATTERN4,SEARCH_PATTERN5 FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID) + If DT.Rows.Count = 1 Then + If Not IsDBNull(DT.Rows(0).Item(0)) Then + txtWindreamsuche.Text = ClassHelper.CheckDBNull(DT.Rows(0).Item(0), "String") + 'Form-ID (Entity) + 'Record -ID + Dim result + result = ClassHelper.CheckDBNull(DT.Rows(0).Item(1), "String") + If result <> "" Then + If result.ToString.ToUpper.Contains("RECORD") Then + cmbSearchPattern1.SelectedIndex = 1 + Else + cmbSearchPattern1.SelectedIndex = 0 + End If + End If + result = ClassHelper.CheckDBNull(DT.Rows(0).Item(2), "String") + If result <> "" Then + If result.ToString.ToUpper.Contains("RECORD") Then + cmbSearchPattern2.SelectedIndex = 1 + Else + cmbSearchPattern2.SelectedIndex = 0 + End If + End If + result = ClassHelper.CheckDBNull(DT.Rows(0).Item(3), "String") + If result <> "" Then + If result.ToString.ToUpper.Contains("RECORD") Then + cmbSearchPattern3.SelectedIndex = 1 + Else + cmbSearchPattern3.SelectedIndex = 0 + End If + End If + result = ClassHelper.CheckDBNull(DT.Rows(0).Item(4), "String") + If result <> "" Then + If result.ToString.ToUpper.Contains("RECORD") Then + cmbSearchPattern4.SelectedIndex = 1 + Else + cmbSearchPattern4.SelectedIndex = 0 + End If + End If + result = ClassHelper.CheckDBNull(DT.Rows(0).Item(5), "String") + If result <> "" Then + If result.ToString.ToUpper.Contains("RECORD") Then + cmbSearchPattern5.SelectedIndex = 1 + Else + cmbSearchPattern5.SelectedIndex = 0 + End If + End If + 'cmbSearchPattern1.SelectedIndex = cmbSearchPattern1.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(1), "String")) + 'cmbSearchPattern2.SelectedIndex = cmbSearchPattern2.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(2), "String")) + 'cmbSearchPattern3.SelectedIndex = cmbSearchPattern3.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(3), "String")) + 'cmbSearchPattern4.SelectedIndex = cmbSearchPattern4.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(4), "String")) + 'cmbSearchPattern5.SelectedIndex = cmbSearchPattern5.FindStringExact(ClassHelper.CheckDBNull("@" & DT.Rows(0).Item(5), "String")) + End If + End If + Else + chkWDSearch_Active.Checked = False + End If + Catch ex As Exception + MsgBox("Error in RecordSearch_Config:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub Private Sub frmConstructorDesigner_Shown(sender As Object, e As EventArgs) Handles Me.Shown formloaded = True Load_TreeViewEbene() @@ -121,9 +228,10 @@ Try If Not TreeView1.SelectedNode Is Nothing Then Dim construct_id As Integer = Integer.Parse(TreeView1.SelectedNode.Tag) + SELECTED_CONSTRUCTOR_DETAIL_ID = construct_id Me.tslblSaveDetail.Visible = False Load_Detail(construct_id) - + lblSave1.Visible = False End If Catch ex As Exception MsgBox("Error in AfterSelect:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -172,5 +280,110 @@ Catch ex As Exception MsgBox("Error in Save Constructor-Details:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try + Try + Try + Dim SP1, SP2, SP3, SP4, SP5 + If cmbSearchPattern1.SelectedIndex <> -1 Then + SP1 = "@" & cmbSearchPattern1.Text + Else + SP1 = "" + End If + If cmbSearchPattern2.SelectedIndex <> -1 Then + SP2 = "@" & cmbSearchPattern2.Text + Else + SP2 = "" + End If + If cmbSearchPattern3.SelectedIndex <> -1 Then + SP3 = "@" & cmbSearchPattern3.Text + Else + SP3 = "" + End If + If cmbSearchPattern4.SelectedIndex <> -1 Then + SP4 = "@" & cmbSearchPattern4.Text + Else + SP4 = "" + End If + If cmbSearchPattern5.SelectedIndex <> -1 Then + SP5 = "@" & cmbSearchPattern5.Text + Else + SP5 = "" + End If + Dim sql = "UPDATE TBPMO_FORM_VIEW SET WINDREAM_SEARCH = '" & txtWindreamsuche.Text & "',SEARCH_PATTERN1 = '" & SP1 & "',SEARCH_PATTERN2= '" & SP2 & "',SEARCH_PATTERN3= '" & SP3 & _ + "',SEARCH_PATTERN4 = '" & SP4 & "',SEARCH_PATTERN5 = '" & SP5 & "', CHANGED_WHO = '" & Environment.UserName & "' where FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID + If ClassDatabase.Execute_non_Query(sql) = True Then + lblSave1.Visible = True + lblSave1.Text = "Erfolgreich gespeichert - " & Now + End If + Catch ex As Exception + MsgBox("Error in Save DocView-properties:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + lblSave1.Visible = False + End Try + Catch ex As Exception + + End Try + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If Not Me.txtWindreamsuche.Text = "" Then + Me.OFDWindreamsuche.FileName = Me.WINDREAM_SEARCHTextBox.Text + End If + + If Me.OFDWindreamsuche.ShowDialog = Windows.Forms.DialogResult.OK Then + Me.WINDREAM_SEARCHTextBox.Text = Me.OFDWindreamsuche.FileName + End If + End Sub + + Private Sub btnWindreamsuche_Click(sender As Object, e As EventArgs) Handles btnWindreamsuche.Click + If Not Me.txtWindreamsuche.Text = "" Then + Me.OFDWindreamsuche.FileName = Me.txtWindreamsuche.Text + End If + + If Me.OFDWindreamsuche.ShowDialog = Windows.Forms.DialogResult.OK Then + Me.txtWindreamsuche.Text = Me.OFDWindreamsuche.FileName + End If + End Sub + + Private Sub chkWDSearch_Active_CheckedChanged(sender As Object, e As EventArgs) Handles chkWDSearch_Active.CheckedChanged + Try + Dim check = ClassDatabase.Execute_Scalar("SELECT DOCUMENT_VIEW FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID) + + If chkWDSearch_Active.Checked Then + grpbxWD_RecordSearch.Enabled = True + If check = False Then + ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True) + End If + Else + grpbxWD_RecordSearch.Enabled = False + If check = True Then + ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True) + End If + End If + Catch ex As Exception + MsgBox("Error in Checked Change WD-Search:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub + + Private Sub XtraTabControl2_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl2.SelectedPageChanged + Select Case XtraTabControl2.SelectedTabPageIndex + Case 0 + Load_QuickDisplay() + Case 2 + RecordSearch_Config() + End Select + End Sub + + Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click + Try + Dim i = listBoxControls.SelectedValue + If Not IsNothing(i) Then + Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",'" & Environment.UserName & "')" + If ClassDatabase.Execute_non_Query(insert, True) Then + Load_QuickDisplay() + End If + End If + Catch ex As Exception + MsgBox("Error in Adding Control to Quick-Display: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb index 561ca09..b534981 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb @@ -869,7 +869,7 @@ Partial Class frmDokumentart_Konfig Me.XtraTabPage1.Controls.Add(Me.ListBox2) Me.XtraTabPage1.Controls.Add(Me.TBDD_INDEX_AUTOMBindingNavigator) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1265, 252) + Me.XtraTabPage1.Size = New System.Drawing.Size(1261, 249) Me.XtraTabPage1.Text = "Automatische Indexe" ' 'SQL_RESULTTextBox @@ -1004,7 +1004,7 @@ Partial Class frmDokumentart_Konfig Me.ListBox2.ItemHeight = 15 Me.ListBox2.Location = New System.Drawing.Point(0, 25) Me.ListBox2.Name = "ListBox2" - Me.ListBox2.Size = New System.Drawing.Size(305, 227) + Me.ListBox2.Size = New System.Drawing.Size(305, 224) Me.ListBox2.TabIndex = 2 Me.ListBox2.TabStop = False Me.ListBox2.ValueMember = "GUID" @@ -1024,7 +1024,7 @@ Partial Class frmDokumentart_Konfig Me.TBDD_INDEX_AUTOMBindingNavigator.MovePreviousItem = Me.ToolStripButton4 Me.TBDD_INDEX_AUTOMBindingNavigator.Name = "TBDD_INDEX_AUTOMBindingNavigator" Me.TBDD_INDEX_AUTOMBindingNavigator.PositionItem = Me.ToolStripTextBox1 - Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1265, 25) + Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1261, 25) Me.TBDD_INDEX_AUTOMBindingNavigator.TabIndex = 1 Me.TBDD_INDEX_AUTOMBindingNavigator.Text = "BindingNavigator1" ' @@ -1131,7 +1131,7 @@ Partial Class frmDokumentart_Konfig Me.XtraTabPage2.Controls.Add(Me.ComboBox1) Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1265, 252) + Me.XtraTabPage2.Size = New System.Drawing.Size(1261, 249) Me.XtraTabPage2.Text = "Zurodnung Dokumentart - Entität" ' 'Label3 @@ -1161,7 +1161,7 @@ Partial Class frmDokumentart_Konfig 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(59, Byte), Integer), CType(CType(59, Byte), Integer), CType(CType(59, Byte), Integer)) + 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] @@ -1278,7 +1278,7 @@ Partial Class frmDokumentart_Konfig Me.BindingNavigator1.MovePreviousItem = Me.ToolStripButton11 Me.BindingNavigator1.Name = "BindingNavigator1" Me.BindingNavigator1.PositionItem = Me.ToolStripTextBox2 - Me.BindingNavigator1.Size = New System.Drawing.Size(1265, 25) + Me.BindingNavigator1.Size = New System.Drawing.Size(1261, 25) Me.BindingNavigator1.TabIndex = 2 Me.BindingNavigator1.Text = "BindingNavigator1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor.vb b/app/DD-Record-Organiser/frmForm_Constructor.vb index 475e93b..8f12419 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.vb @@ -1764,6 +1764,11 @@ Public Class frmForm_Constructor Return False End Try End If + Dim SQL1 As String = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & PARENT_RECORDID & " AND RECORD2_ID = " & CURRENT_RECORD_ID + + If ClassDatabase.Execute_Scalar(SQL1) = 0 Then + ClassControlCommandsUI.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID) + End If Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID) Return True End Function @@ -1960,6 +1965,9 @@ Public Class frmForm_Constructor tsbtnRecordAdd.Visible = False tsbtnRecorddelete.Visible = False tsbtnRecordSave.Visible = False + Dim id = CURRENT_RECORD_ID + MsgBox(CURRENT_RECORD_ID) + Case Else tsbtnRecordAdd.Visible = True tsbtnRecorddelete.Visible = True diff --git a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb index 2387996..0b85daa 100644 --- a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb +++ b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb @@ -134,7 +134,7 @@ Partial Class frmLevel_Designer Me.grpbxDocumentView.Controls.Add(Me.Label1) Me.grpbxDocumentView.Location = New System.Drawing.Point(0, 11) Me.grpbxDocumentView.Name = "grpbxDocumentView" - Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 176) + Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 181) Me.grpbxDocumentView.TabIndex = 4 Me.grpbxDocumentView.TabStop = False Me.grpbxDocumentView.Text = "Document View - Eigenschaften" diff --git a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb index e345e2b..88590ad 100644 --- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb +++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb @@ -375,7 +375,6 @@ Public Class frmWD_Index_Dokart CURRENT_DOKARTID = cmbDokumentart.SelectedValue CURRENT_DOKARTSTRING = cmbDokumentart.Text Refresh_indices() - Indexing_File() End If End If