diff --git a/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.Designer.vb index b1aed341..888f8bd8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_GlobixRelations.Designer.vb @@ -26,7 +26,6 @@ Partial Class frmAdmin_GlobixRelations Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() @@ -81,24 +80,20 @@ Partial Class frmAdmin_GlobixRelations Me.RibbonControl1.MaxItemId = 1 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.Size = New System.Drawing.Size(1087, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup1.Text = "Aktionen" ' 'RibbonStatusBar1 ' @@ -333,7 +328,7 @@ Partial Class frmAdmin_GlobixRelations Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1085, 554) + Me.XtraTabPage2.Size = New System.Drawing.Size(1085, 553) Me.XtraTabPage2.Text = "Group-Relations" ' 'frmAdmin_GlobixRelations @@ -378,7 +373,6 @@ Partial Class frmAdmin_GlobixRelations Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index aec396c9..bcd7c590 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -41,7 +41,7 @@ Partial Class frmAdmin_IDBAttribute Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() - Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() + Me.CheckEditMulticontext = New DevExpress.XtraEditors.CheckEdit() Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit() @@ -65,6 +65,7 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() Me.VWIDB_BE_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_BE_ATTRIBUTETableAdapter() Me.TBWH_ATTRIBUTE_TYPETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBWH_ATTRIBUTE_TYPETableAdapter() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() @@ -73,7 +74,7 @@ Partial Class frmAdmin_IDBAttribute CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEditMulticontext.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -99,15 +100,15 @@ Partial Class frmAdmin_IDBAttribute 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 7 + Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(894, 131) + Me.RibbonControl1.Size = New System.Drawing.Size(894, 132) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -150,6 +151,7 @@ Partial Class frmAdmin_IDBAttribute ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' @@ -171,7 +173,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.TextEdit1) Me.LayoutControl1.Controls.Add(Me.TextEdit2) Me.LayoutControl1.Controls.Add(Me.SpinEdit1) - Me.LayoutControl1.Controls.Add(Me.CheckEdit1) + Me.LayoutControl1.Controls.Add(Me.CheckEditMulticontext) Me.LayoutControl1.Controls.Add(Me.CheckEdit2) Me.LayoutControl1.Controls.Add(Me.TextEdit3) Me.LayoutControl1.Controls.Add(Me.txtAddedWho) @@ -180,21 +182,21 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 131) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 132) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(894, 408) + Me.LayoutControl1.Size = New System.Drawing.Size(894, 407) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_ID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(168, 20) + Me.TextEdit1.Location = New System.Drawing.Point(177, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(706, 20) + Me.TextEdit1.Size = New System.Drawing.Size(697, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -211,10 +213,10 @@ Partial Class frmAdmin_IDBAttribute 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(168, 60) + Me.TextEdit2.Location = New System.Drawing.Point(177, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(706, 20) + Me.TextEdit2.Size = New System.Drawing.Size(697, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' @@ -222,23 +224,24 @@ Partial Class frmAdmin_IDBAttribute ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(604, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(613, 180) Me.SpinEdit1.MenuManager = Me.RibbonControl1 Me.SpinEdit1.Name = "SpinEdit1" Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.SpinEdit1.Size = New System.Drawing.Size(270, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(261, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' - 'CheckEdit1 + 'CheckEditMulticontext ' - Me.CheckEdit1.Location = New System.Drawing.Point(20, 220) - Me.CheckEdit1.MenuManager = Me.RibbonControl1 - Me.CheckEdit1.Name = "CheckEdit1" - Me.CheckEdit1.Properties.Caption = "Attribut mehrzeilig" - Me.CheckEdit1.Size = New System.Drawing.Size(854, 18) - Me.CheckEdit1.StyleController = Me.LayoutControl1 - Me.CheckEdit1.TabIndex = 7 + Me.CheckEditMulticontext.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "MULTI_CONTEXT", True)) + Me.CheckEditMulticontext.Location = New System.Drawing.Point(20, 220) + Me.CheckEditMulticontext.MenuManager = Me.RibbonControl1 + Me.CheckEditMulticontext.Name = "CheckEditMulticontext" + Me.CheckEditMulticontext.Properties.Caption = "Attribut mehrzeilig" + Me.CheckEditMulticontext.Size = New System.Drawing.Size(854, 18) + Me.CheckEditMulticontext.StyleController = Me.LayoutControl1 + Me.CheckEditMulticontext.TabIndex = 7 ' 'CheckEdit2 ' @@ -253,61 +256,61 @@ Partial Class frmAdmin_IDBAttribute ' 'TextEdit3 ' - Me.TextEdit3.Location = New System.Drawing.Point(168, 140) + Me.TextEdit3.Location = New System.Drawing.Point(177, 140) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(706, 20) + Me.TextEdit3.Size = New System.Drawing.Size(697, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(168, 258) + Me.txtAddedWho.Location = New System.Drawing.Point(177, 258) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(268, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(259, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(604, 258) + Me.txtAddedWhen.Location = New System.Drawing.Point(613, 258) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(270, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(261, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(168, 298) + Me.txtChangedWho.Location = New System.Drawing.Point(177, 298) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(268, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(259, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(604, 298) + Me.txtChangedWhen.Location = New System.Drawing.Point(613, 298) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(270, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(261, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 13 ' 'ComboBoxEdit1 ' Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "TYPE_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(168, 100) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(177, 100) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit @@ -317,7 +320,7 @@ Partial Class frmAdmin_IDBAttribute Me.ComboBoxEdit1.Properties.NullText = "" Me.ComboBoxEdit1.Properties.PopupSizeable = False Me.ComboBoxEdit1.Properties.ValueMember = "GUID" - Me.ComboBoxEdit1.Size = New System.Drawing.Size(706, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(697, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 14 ' @@ -332,7 +335,7 @@ Partial Class frmAdmin_IDBAttribute Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(894, 408) + Me.Root.Size = New System.Drawing.Size(894, 407) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -361,7 +364,7 @@ Partial Class frmAdmin_IDBAttribute ' 'LayoutControlItem4 ' - Me.LayoutControlItem4.Control = Me.CheckEdit1 + Me.LayoutControlItem4.Control = Me.CheckEditMulticontext Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) @@ -422,7 +425,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(436, 110) + Me.LayoutControlItem9.Size = New System.Drawing.Size(436, 109) Me.LayoutControlItem9.Text = "Geändert Wer" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) ' @@ -458,7 +461,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem10.Location = New System.Drawing.Point(436, 278) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(438, 110) + Me.LayoutControlItem10.Size = New System.Drawing.Size(438, 109) Me.LayoutControlItem10.Text = "Geändert Wann" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) ' @@ -470,6 +473,7 @@ Partial Class frmAdmin_IDBAttribute Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete @@ -483,6 +487,13 @@ Partial Class frmAdmin_IDBAttribute ' Me.TBWH_ATTRIBUTE_TYPETableAdapter.ClearBeforeFill = True ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Löschen" + Me.BarButtonItem4.Id = 7 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'frmAdmin_IDBAttribute ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -504,7 +515,7 @@ Partial Class frmAdmin_IDBAttribute CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEditMulticontext.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -546,7 +557,7 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents DSIDB_Stammdaten As DSIDB_Stammdaten Friend WithEvents TableAdapterManager As DSIDB_StammdatenTableAdapters.TableAdapterManager - Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents CheckEditMulticontext As DevExpress.XtraEditors.CheckEdit Friend WithEvents CheckEdit2 As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem @@ -569,4 +580,5 @@ Partial Class frmAdmin_IDBAttribute Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents TBWH_ATTRIBUTE_TYPEBindingSource As BindingSource Friend WithEvents TBWH_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBWH_ATTRIBUTE_TYPETableAdapter + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx index 3609e73c..512b7159 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx @@ -120,7 +120,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -142,6 +142,29 @@ M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJIDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4NCiAgICA8cGF0aCBk + PSJNMTguOCwxNmw4LjktOC45YzAuNC0wLjQsMC40LTEsMC0xLjRsLTEuNC0xLjRjLTAuNC0wLjQtMS0w + LjQtMS40LDBMMTYsMTMuMkw3LjEsNC4zYy0wLjQtMC40LTEtMC40LTEuNCwwICAgTDQuMyw1LjdjLTAu + NCwwLjQtMC40LDEsMCwxLjRsOC45LDguOWwtOC45LDguOWMtMC40LDAuNC0wLjQsMSwwLDEuNGwxLjQs + MS40YzAuNCwwLjQsMSwwLjQsMS40LDBsOC45LTguOWw4LjksOC45ICAgYzAuNCwwLjQsMSwwLjQsMS40 + LDBsMS40LTEuNGMwLjQtMC40LDAuNC0xLDAtMS40TDE4LjgsMTZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8 + L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index 4948e287..fdac67f4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -20,7 +20,8 @@ TBWH_ATTRIBUTE_TYPETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString TBWH_ATTRIBUTE_TYPETableAdapter.Fill(DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPE) VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString - VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1) + FillAttribute() + If IsInsert Then VWIDB_BE_ATTRIBUTEBindingSource.AddNew() DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName @@ -29,11 +30,14 @@ ShowErrorMessage(ex) End Try End Sub - + Private Sub FillAttribute() + VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1) + End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick ResetMessages() If SaveData() And HasChanges Then ShowStatus("Attribute saved!") + FillAttribute() End If End Sub @@ -73,7 +77,7 @@ If Not IsInsert Then Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " & $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" & - $", COMMENT = '{TextEdit3.Text}', CHANGED_WHO = '{My.Application.User.UserName}' " & + $",MULTI_CONTEXT = '{CheckEditMulticontext.Checked}', COMMENT = '{TextEdit3.Text}', CHANGED_WHO = '{My.Application.User.UserName}' " & $"WHERE (GUID = {TextEdit1.Text})" If My.DatabaseIDB.ExecuteNonQuery(oUpdate) = False Then @@ -90,7 +94,7 @@ Return False End If End If - VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE) + ' VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE) 'End If Return True @@ -101,10 +105,13 @@ End Function - Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData + Public Function DeleteAttribute() As Boolean Implements IAdminForm.DeleteData Try - 'VWIDB_BE_ATTRIBUTETableAdapter.Delete(PrimaryKey) - Return True + Dim oproc = $"EXEC PRIDB_DELETE_ATTRIBUTE {PrimaryKey}, '{My.Application.User.UserName}' " + If My.DatabaseIDB.ExecuteNonQuery(oproc) = True Then + Return True + End If + Catch ex As Exception ShowErrorMessage(ex) Return False @@ -112,8 +119,12 @@ End Function Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick - If MsgBox($"Wollen Sie das Attribut [{PrimaryKey}] wirklich löschen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then - If DeleteData() Then + + End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + If MsgBox($"Do You really want to delete the attribute [{PrimaryKey}]? All Metadata related to the Attribute will be deleted!", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + If DeleteAttribute() Then Close() End If End If diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb index 88d0cc13..b6c43dee 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBObjectStore.Designer.vb @@ -181,7 +181,7 @@ Partial Class frmAdmin_IDBObjectStore ' 'CAT_TITLETextBox ' - Me.CAT_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_CATALOGBindingSource, "CAT_TITLE", True)) + Me.CAT_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_CATALOGBindingSource, "CAT_STRING", True)) Me.CAT_TITLETextBox.Location = New System.Drawing.Point(308, 36) Me.CAT_TITLETextBox.Name = "CAT_TITLETextBox" Me.CAT_TITLETextBox.Size = New System.Drawing.Size(924, 20) @@ -392,6 +392,7 @@ Partial Class frmAdmin_IDBObjectStore Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Me.TBIDB_OBJECT_STORETableAdapter Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 90ce1195..8f30de15 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -418,7 +418,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.MenuManager = Me.RibbonControl1 Me.TreeListMenu.Name = "TreeListMenu" Me.TreeListMenu.BeginUnboundLoad() - Me.TreeListMenu.AppendNode(New Object() {"Entities"}, -1, "") + Me.TreeListMenu.AppendNode(New Object() {"Configurations IM"}, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Attribute Relations"}, 1, 9, 9, -1, "ATTRIBUTE_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") @@ -506,6 +506,7 @@ Partial Class frmAdmin_Start Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 82e3c58e..90bfd2ba 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -211,10 +211,19 @@ Public Class ClassInit Try Dim oSQL = "Select * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1" My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSQL, EDMI.API.Constants.DatabaseType.IDB) - oSQL = "Select * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '" + MyApplication.User.Language + "'" - My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, EDMI.API.Constants.DatabaseType.IDB, "LANG_CODE = '" + MyApplication.User.Language + "'") + oSQL = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}" + My.Tables.DTIDB_CATALOG_USER = My.Database.GetDatatable("TBIDB_CATALOG_USER", oSQL, EDMI.API.Constants.DatabaseType.IDB, $"USR_ID = {My.Application.User.UserId}") + oSQL = $"Select * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '{MyApplication.User.Language}'" + My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'") + For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then + DocResultBaseSearch = oRow.Item("SQL_COMMAND") + DocResultBaseSearch = DocResultBaseSearch.Replace("@USER_ID", My.Application.User.UserId) + DocResultBaseSearch = DocResultBaseSearch.Replace("@LANG_CODE", My.Application.User.Language) + End If + Next ' My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatableIDB("SELECT * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '" + MyApplication.User.Language + "'") Catch ex As Exception Logger.Error(ex) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index c4adef09..d5f2be0e 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -1924,6 +1924,8 @@ Partial Public Class DSIDB_Stammdaten Private columnSYS_ATTRIBUTE As Global.System.Data.DataColumn + Private columnMULTI_CONTEXT As Global.System.Data.DataColumn + _ Public Sub New() @@ -2087,6 +2089,14 @@ Partial Public Class DSIDB_Stammdaten End Get End Property + _ + Public ReadOnly Property MULTI_CONTEXTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnMULTI_CONTEXT + End Get + End Property + _ @@ -2140,14 +2150,21 @@ Partial Public Class DSIDB_Stammdaten ByVal ADDED_WHO As String, _ ByVal CHANGED_WHEN As Date, _ ByVal CHANGED_WHO As String, _ - ByVal SYS_ATTRIBUTE As Boolean) As VWIDB_BE_ATTRIBUTERow + ByVal SYS_ATTRIBUTE As Boolean, _ + ByVal MULTI_CONTEXT As Boolean) As VWIDB_BE_ATTRIBUTERow Dim rowVWIDB_BE_ATTRIBUTERow As VWIDB_BE_ATTRIBUTERow = CType(Me.NewRow,VWIDB_BE_ATTRIBUTERow) - Dim columnValuesArray() As Object = New Object() {BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, VIEW_SEQUENCE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, SYS_ATTRIBUTE} + Dim columnValuesArray() As Object = New Object() {BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, VIEW_SEQUENCE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, SYS_ATTRIBUTE, MULTI_CONTEXT} rowVWIDB_BE_ATTRIBUTERow.ItemArray = columnValuesArray Me.Rows.Add(rowVWIDB_BE_ATTRIBUTERow) Return rowVWIDB_BE_ATTRIBUTERow End Function + _ + Public Function FindByLANG_ID(ByVal LANG_ID As Byte) As VWIDB_BE_ATTRIBUTERow + Return CType(Me.Rows.Find(New Object() {LANG_ID}),VWIDB_BE_ATTRIBUTERow) + End Function + _ Public Overrides Function Clone() As Global.System.Data.DataTable @@ -2181,6 +2198,7 @@ Partial Public Class DSIDB_Stammdaten Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnSYS_ATTRIBUTE = MyBase.Columns("SYS_ATTRIBUTE") + Me.columnMULTI_CONTEXT = MyBase.Columns("MULTI_CONTEXT") End Sub _ Public Property ATTR_TITLE() As String Get - Try - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ATTR_TITLE in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn),String) End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) = value @@ -5558,11 +5582,7 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYP_ID() As Byte Get - Try - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn),Byte) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYP_ID in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn),Byte) End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) = value @@ -5573,11 +5593,7 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYPE_ID() As Byte Get - Try - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn),Byte) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYPE_ID in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn),Byte) End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) = value @@ -5588,11 +5604,7 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYPE_NAME() As String Get - Try - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYPE_NAME in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn),String) End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) = value @@ -5647,11 +5659,7 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get - Try - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) - End Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn),Date) End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) = value @@ -5710,6 +5718,17 @@ Partial Public Class DSIDB_Stammdaten End Set End Property + _ + Public Property MULTI_CONTEXT() As Boolean + Get + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.MULTI_CONTEXTColumn),Boolean) + End Get + Set + Me(Me.tableVWIDB_BE_ATTRIBUTE.MULTI_CONTEXTColumn) = value + End Set + End Property + _ Public Function IsBE_IDNull() As Boolean @@ -5746,66 +5765,6 @@ Partial Public Class DSIDB_Stammdaten Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_IDColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsATTR_TITLENull() As Boolean - Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) - End Function - - _ - Public Sub SetATTR_TITLENull() - Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsTYP_IDNull() As Boolean - Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) - End Function - - _ - Public Sub SetTYP_IDNull() - Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsTYPE_IDNull() As Boolean - Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) - End Function - - _ - Public Sub SetTYPE_IDNull() - Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsTYPE_NAMENull() As Boolean - Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) - End Function - - _ - Public Sub SetTYPE_NAMENull() - Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) - End Function - - _ - Public Sub SetADDED_WHENNull() - Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsCHANGED_WHENNull() As Boolean @@ -8506,6 +8465,7 @@ Namespace DSIDB_StammdatenTableAdapters tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("SYS_ATTRIBUTE", "SYS_ATTRIBUTE") + tableMapping.ColumnMappings.Add("MULTI_CONTEXT", "MULTI_CONTEXT") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -8552,14 +8512,18 @@ Namespace DSIDB_StammdatenTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VI"& _ "SIBLE, VIEW_SEQUENCE, SYS_ATTRIBUTE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, "& _ - "CHANGED_WHEN, CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_BE_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (LAN"& _ - "G_CODE = @LANG_CODE) AND (SYS_ATTRIBUTE = 0)" + "CHANGED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" MULTI_CONTEXT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " VWIDB_BE_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (LANG_CODE = @LANG_CODE) AND (SYS_ATTRIBUT"& _ + "E = 0)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANG_CODE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "LANG_CODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "SELECT VWIDB_BE_ATTRIBUTE.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_BE_ATTRIBUTE WHERE ATTR"& _ - "_ID = @ATTRIBUTE_ID AND LANG_ID = @LANGUAGE_ID" + Me._commandCollection(1).CommandText = "SELECT GUID, BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, V"& _ + "IEW_VISIBLE, MULTI_CONTEXT, VIEW_SEQUENCE, SYS_ATTRIBUTE, DEFAULT_SEARCH_ATTRIBU"& _ + "TE, LANG_ID, LANG_CODE, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ADDED_WHO, CHANGE"& _ + "D_WHEN, CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_BE_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (ATTR_ID ="& _ + " @ATTRIBUTE_ID) AND (LANG_ID = @LANGUAGE_ID)" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ATTRIBUTE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ATTR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LANG_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 93ce6517..64743cdd 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -258,7 +258,8 @@ VALUES (@TITLE,@TYP_ID,@VIEW_SEQUENCE,@VIEW_VISIBLE,@ADDED_WHO) - SELECT BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, VIEW_SEQUENCE, SYS_ATTRIBUTE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO + SELECT BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, VIEW_SEQUENCE, SYS_ATTRIBUTE, LANG_ID, LANG_CODE, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, + MULTI_CONTEXT FROM VWIDB_BE_ATTRIBUTE WHERE (LANG_CODE = @LANG_CODE) AND (SYS_ATTRIBUTE = 0) @@ -301,16 +302,19 @@ WHERE (GUID = @GUID) + - SELECT VWIDB_BE_ATTRIBUTE.* -FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = @ATTRIBUTE_ID AND LANG_ID = @LANGUAGE_ID + SELECT GUID, BE_ID, BE, ATTR_ID, ATTR_TITLE, TYP_ID, TYPE_ID, TYPE_NAME, VIEW_VISIBLE, MULTI_CONTEXT, VIEW_SEQUENCE, SYS_ATTRIBUTE, DEFAULT_SEARCH_ATTRIBUTE, LANG_ID, LANG_CODE, ADDED_WHEN, + ADDED_WHO, CHANGED_WHEN, CHANGED_WHO +FROM VWIDB_BE_ATTRIBUTE +WHERE (ATTR_ID = @ATTRIBUTE_ID) AND (LANG_ID = @LANGUAGE_ID) - - + + @@ -710,7 +714,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -749,7 +753,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -761,16 +765,16 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + - - - + + + @@ -787,7 +791,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -804,10 +808,11 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH + - + @@ -864,7 +869,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -905,7 +910,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -971,7 +976,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1024,7 +1029,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1061,7 +1066,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1075,7 +1080,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1113,7 +1118,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1126,7 +1131,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1171,6 +1176,10 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH + + + + @@ -1206,9 +1215,9 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - - - + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index f34a1ab6..9a9e366c 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/GUIs.ZooFlow/My Project/AssemblyInfo.vb b/GUIs.ZooFlow/My Project/AssemblyInfo.vb index ee676140..2d8bc66c 100644 --- a/GUIs.ZooFlow/My Project/AssemblyInfo.vb +++ b/GUIs.ZooFlow/My Project/AssemblyInfo.vb @@ -33,4 +33,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' [assembly: AssemblyVersion("1.0.*")] - + diff --git a/GUIs.ZooFlow/Queries/ClassTables.vb b/GUIs.ZooFlow/Queries/ClassTables.vb index 20ddb249..93d3e2f4 100644 --- a/GUIs.ZooFlow/Queries/ClassTables.vb +++ b/GUIs.ZooFlow/Queries/ClassTables.vb @@ -1,5 +1,6 @@ Public Class ClassTables Property DTIDB_ATTRIBUTE As DataTable + Property DTIDB_CATALOG_USER As DataTable Property DTIDB_COMMON_SQL As DataTable Property DTIDB_FILESTORE As DataTable Property DTIDB_DOC_DATA As DataTable diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index f3f06353..9246e157 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -30,57 +30,57 @@ Partial Class frmFlowSearch1 Me.bsiStatus = New DevExpress.XtraBars.BarStaticItem() Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() + Me.BarToggleSwitchItemTerm = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.BarToggleSwitchItemFulltext = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.DateEditTill = New DevExpress.XtraEditors.DateEdit() Me.ToggleSwitchMonth_Last = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchDateto = New DevExpress.XtraEditors.ToggleSwitch() + Me.lblDatefrom = New DevExpress.XtraEditors.LabelControl() + Me.DateEditFrom = New DevExpress.XtraEditors.DateEdit() Me.ToggleSwitchMonth = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchTomorrow = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchToday = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchLastWeek = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchYesterday = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchYear_Last = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchYear = New DevExpress.XtraEditors.ToggleSwitch() - Me.ToggleSwitchYesterday = New DevExpress.XtraEditors.ToggleSwitch() - Me.ToggleSwitchToday = New DevExpress.XtraEditors.ToggleSwitch() - Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.Label1 = New System.Windows.Forms.Label() + Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.txtSearchInput = New System.Windows.Forms.TextBox() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarToggleSwitchItemTerm = New DevExpress.XtraBars.BarToggleSwitchItem() - Me.BarToggleSwitchItemFulltext = New DevExpress.XtraBars.BarToggleSwitchItem() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() - Me.ToggleSwitch1 = New DevExpress.XtraEditors.ToggleSwitch() - Me.DateEdit1 = New DevExpress.XtraEditors.DateEdit() - Me.DateEditBis = New DevExpress.XtraEditors.DateEdit() - Me.lblDatefrom = New DevExpress.XtraEditors.LabelControl() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() Me.DockPanel1_Container.SuspendLayout() - CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() - CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DateEditBis.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DateEditBis.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditTill.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditTill.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchDateto.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -128,6 +128,21 @@ Partial Class frmFlowSearch1 Me.BarListItem1.Id = 5 Me.BarListItem1.Name = "BarListItem1" ' + 'BarToggleSwitchItemTerm + ' + Me.BarToggleSwitchItemTerm.BindableChecked = True + Me.BarToggleSwitchItemTerm.Caption = "Suche nach Term" + Me.BarToggleSwitchItemTerm.Checked = True + Me.BarToggleSwitchItemTerm.Id = 6 + Me.BarToggleSwitchItemTerm.Name = "BarToggleSwitchItemTerm" + ' + 'BarToggleSwitchItemFulltext + ' + Me.BarToggleSwitchItemFulltext.Caption = "Volltext inkludieren" + Me.BarToggleSwitchItemFulltext.Enabled = False + Me.BarToggleSwitchItemFulltext.Id = 7 + Me.BarToggleSwitchItemFulltext.Name = "BarToggleSwitchItemFulltext" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1}) @@ -141,6 +156,14 @@ Partial Class frmFlowSearch1 Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Suchfunktionen" ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.AllowTextClipping = False + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemTerm) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemFulltext) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Suchvarianten" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiStatus) @@ -184,6 +207,49 @@ Partial Class frmFlowSearch1 Me.DockPanel1_Container.Size = New System.Drawing.Size(218, 536) Me.DockPanel1_Container.TabIndex = 0 ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom + Me.XtraTabControl1.Location = New System.Drawing.Point(6, 43) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] + Me.XtraTabControl1.Size = New System.Drawing.Size(203, 490) + Me.XtraTabControl1.TabIndex = 10 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.DateEditTill) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth_Last) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchDateto) + Me.XtraTabPage1.Controls.Add(Me.lblDatefrom) + Me.XtraTabPage1.Controls.Add(Me.DateEditFrom) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchTomorrow) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchToday) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchLastWeek) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYesterday) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear_Last) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(201, 467) + Me.XtraTabPage1.Text = "Standard" + ' + 'DateEditTill + ' + Me.DateEditTill.EditValue = Nothing + Me.DateEditTill.Location = New System.Drawing.Point(3, 281) + Me.DateEditTill.MenuManager = Me.RibbonControl1 + Me.DateEditTill.Name = "DateEditTill" + Me.DateEditTill.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditTill.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditTill.Size = New System.Drawing.Size(117, 20) + Me.DateEditTill.TabIndex = 2 + ' 'ToggleSwitchMonth_Last ' Me.ToggleSwitchMonth_Last.Location = New System.Drawing.Point(3, 155) @@ -194,6 +260,37 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(132, 19) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' + 'ToggleSwitchDateto + ' + Me.ToggleSwitchDateto.Location = New System.Drawing.Point(3, 256) + Me.ToggleSwitchDateto.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" + Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" + Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) + Me.ToggleSwitchDateto.TabIndex = 0 + ' + 'lblDatefrom + ' + Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) + Me.lblDatefrom.Name = "lblDatefrom" + Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) + Me.lblDatefrom.TabIndex = 3 + Me.lblDatefrom.Text = "Datum" + ' + 'DateEditFrom + ' + Me.DateEditFrom.EditValue = Nothing + Me.DateEditFrom.Location = New System.Drawing.Point(3, 230) + Me.DateEditFrom.MenuManager = Me.RibbonControl1 + Me.DateEditFrom.Name = "DateEditFrom" + Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditFrom.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.ClassicNew + Me.DateEditFrom.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.[False] + Me.DateEditFrom.Size = New System.Drawing.Size(117, 20) + Me.DateEditFrom.TabIndex = 1 + ' 'ToggleSwitchMonth ' Me.ToggleSwitchMonth.Location = New System.Drawing.Point(3, 130) @@ -215,6 +312,16 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' + 'ToggleSwitchToday + ' + Me.ToggleSwitchToday.Location = New System.Drawing.Point(3, 3) + Me.ToggleSwitchToday.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchToday.Name = "ToggleSwitchToday" + Me.ToggleSwitchToday.Properties.OffText = "Heute" + Me.ToggleSwitchToday.Properties.OnText = "On" + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchToday.TabIndex = 2 + ' 'ToggleSwitchLastWeek ' Me.ToggleSwitchLastWeek.Location = New System.Drawing.Point(3, 53) @@ -225,6 +332,16 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(132, 19) Me.ToggleSwitchLastWeek.TabIndex = 6 ' + 'ToggleSwitchYesterday + ' + Me.ToggleSwitchYesterday.Location = New System.Drawing.Point(3, 28) + Me.ToggleSwitchYesterday.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" + Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" + Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchYesterday.TabIndex = 3 + ' 'ToggleSwitchYear_Last ' Me.ToggleSwitchYear_Last.Location = New System.Drawing.Point(3, 105) @@ -245,33 +362,11 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Size = New System.Drawing.Size(132, 19) Me.ToggleSwitchYear.TabIndex = 4 ' - 'ToggleSwitchYesterday + 'XtraTabPage2 ' - Me.ToggleSwitchYesterday.Location = New System.Drawing.Point(3, 28) - Me.ToggleSwitchYesterday.MenuManager = Me.RibbonControl1 - Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" - Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" - Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) - Me.ToggleSwitchYesterday.TabIndex = 3 - ' - 'ToggleSwitchToday - ' - Me.ToggleSwitchToday.Location = New System.Drawing.Point(3, 3) - Me.ToggleSwitchToday.MenuManager = Me.RibbonControl1 - Me.ToggleSwitchToday.Name = "ToggleSwitchToday" - Me.ToggleSwitchToday.Properties.OffText = "Heute" - Me.ToggleSwitchToday.Properties.OnText = "On" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) - Me.ToggleSwitchToday.TabIndex = 2 - ' - 'cmbLimitationDateAttr - ' - Me.cmbLimitationDateAttr.FormattingEnabled = True - Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(6, 16) - Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" - Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) - Me.cmbLimitationDateAttr.TabIndex = 1 + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(201, 467) + Me.XtraTabPage2.Text = "...tbd" ' 'Label1 ' @@ -282,6 +377,14 @@ Partial Class frmFlowSearch1 Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' + 'cmbLimitationDateAttr + ' + Me.cmbLimitationDateAttr.FormattingEnabled = True + Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(6, 16) + Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" + Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) + Me.cmbLimitationDateAttr.TabIndex = 1 + ' 'LabelControl1 ' Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -309,115 +412,13 @@ Partial Class frmFlowSearch1 Me.PictureEdit1.Location = New System.Drawing.Point(231, 224) Me.PictureEdit1.MenuManager = Me.RibbonControl1 Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder Me.PictureEdit1.Properties.PictureAlignment = System.Drawing.ContentAlignment.BottomRight Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.ZoomPercent = 300.0R Me.PictureEdit1.Size = New System.Drawing.Size(693, 517) Me.PictureEdit1.TabIndex = 8 ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.AllowTextClipping = False - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemTerm) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemFulltext) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "Suchvarianten" - ' - 'BarToggleSwitchItemTerm - ' - Me.BarToggleSwitchItemTerm.BindableChecked = True - Me.BarToggleSwitchItemTerm.Caption = "Suche nach Term" - Me.BarToggleSwitchItemTerm.Checked = True - Me.BarToggleSwitchItemTerm.Id = 6 - Me.BarToggleSwitchItemTerm.Name = "BarToggleSwitchItemTerm" - ' - 'BarToggleSwitchItemFulltext - ' - Me.BarToggleSwitchItemFulltext.Caption = "Volltext" - Me.BarToggleSwitchItemFulltext.Id = 7 - Me.BarToggleSwitchItemFulltext.Name = "BarToggleSwitchItemFulltext" - ' - 'XtraTabControl1 - ' - Me.XtraTabControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom - Me.XtraTabControl1.Location = New System.Drawing.Point(6, 43) - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl1.Size = New System.Drawing.Size(203, 490) - Me.XtraTabControl1.TabIndex = 10 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) - ' - 'XtraTabPage1 - ' - Me.XtraTabPage1.Controls.Add(Me.DateEditBis) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth_Last) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitch1) - Me.XtraTabPage1.Controls.Add(Me.lblDatefrom) - Me.XtraTabPage1.Controls.Add(Me.DateEdit1) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchTomorrow) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchToday) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchLastWeek) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYesterday) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear_Last) - Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear) - Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(201, 467) - Me.XtraTabPage1.Text = "Standard" - ' - 'XtraTabPage2 - ' - Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(201, 467) - Me.XtraTabPage2.Text = "Explizit" - ' - 'ToggleSwitch1 - ' - Me.ToggleSwitch1.Location = New System.Drawing.Point(3, 256) - Me.ToggleSwitch1.MenuManager = Me.RibbonControl1 - Me.ToggleSwitch1.Name = "ToggleSwitch1" - Me.ToggleSwitch1.Properties.OffText = "Datum bis" - Me.ToggleSwitch1.Properties.OnText = "Datum bis" - Me.ToggleSwitch1.Size = New System.Drawing.Size(122, 19) - Me.ToggleSwitch1.TabIndex = 0 - ' - 'DateEdit1 - ' - Me.DateEdit1.EditValue = Nothing - Me.DateEdit1.Location = New System.Drawing.Point(3, 230) - Me.DateEdit1.MenuManager = Me.RibbonControl1 - Me.DateEdit1.Name = "DateEdit1" - Me.DateEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEdit1.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.ClassicNew - Me.DateEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard - Me.DateEdit1.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.[False] - Me.DateEdit1.Size = New System.Drawing.Size(117, 20) - Me.DateEdit1.TabIndex = 1 - ' - 'DateEditBis - ' - Me.DateEditBis.EditValue = Nothing - Me.DateEditBis.Location = New System.Drawing.Point(3, 281) - Me.DateEditBis.MenuManager = Me.RibbonControl1 - Me.DateEditBis.Name = "DateEditBis" - Me.DateEditBis.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEditBis.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEditBis.Size = New System.Drawing.Size(117, 20) - Me.DateEditBis.TabIndex = 2 - ' - 'lblDatefrom - ' - Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) - Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) - Me.lblDatefrom.TabIndex = 3 - Me.lblDatefrom.Text = "Datum" - ' 'frmFlowSearch1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -439,24 +440,24 @@ Partial Class frmFlowSearch1 Me.DockPanel1.ResumeLayout(False) Me.DockPanel1_Container.ResumeLayout(False) Me.DockPanel1_Container.PerformLayout() - CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.PerformLayout() - CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DateEditBis.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DateEditBis.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditTill.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditTill.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchDateto.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -495,7 +496,7 @@ Partial Class frmFlowSearch1 Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents lblDatefrom As DevExpress.XtraEditors.LabelControl - Friend WithEvents DateEditBis As DevExpress.XtraEditors.DateEdit - Friend WithEvents DateEdit1 As DevExpress.XtraEditors.DateEdit - Friend WithEvents ToggleSwitch1 As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents DateEditTill As DevExpress.XtraEditors.DateEdit + Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit + Friend WithEvents ToggleSwitchDateto As DevExpress.XtraEditors.ToggleSwitch End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 3bf4ee45..0ea1f458 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -24,8 +24,21 @@ Public Class frmFlowSearch1 Private CONST_DATE_TOMORROW As String = "TOMORROW" Private SEARCH_PARAM3 - Dim oBASESEARCH As String + Private ExplizitDate As Boolean = False + Dim oBASESEARCH As String + Sub ResetTogglesDate() + TOGGLE_Change = True + ToggleSwitchToday.IsOn = False + ToggleSwitchYesterday.IsOn = False + ToggleSwitchTomorrow.IsOn = False + ToggleSwitchLastWeek.IsOn = False + ToggleSwitchYear_Last.IsOn = False + ToggleSwitchYear.IsOn = False + ToggleSwitchMonth.IsOn = False + ToggleSwitchMonth_Last.IsOn = False + TOGGLE_Change = False + End Sub Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchYear.Toggled, ToggleSwitchYear_Last.Toggled, ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled, ToggleSwitchLastWeek.Toggled, ToggleSwitchTomorrow.Toggled @@ -111,6 +124,7 @@ Public Class frmFlowSearch1 Case "ToggleSwitchLastWeek" ToggleSwitchToday.IsOn = False ToggleSwitchTomorrow.IsOn = False + ToggleSwitchYesterday.IsOn = False ToggleSwitchYear.IsOn = False ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False @@ -218,17 +232,29 @@ Public Class frmFlowSearch1 .WindowGuid = "FlowSearch", .WindowTitle = GetResultWindowString(oSearchTerm), .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - .ProfileGuid = 123456789 + .ProfileGuid = 354522 } Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}" - Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" + If ExplizitDate Then + Dim oDate2 As Date + If Not IsNothing(DateEditTill.EditValue) Then + oDate2 = CDate(DateEditTill.EditValue) + Else + oDate2 = CDate(DateEditFrom.EditValue) + End If + Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" + If My.DatabaseIDB.ExecuteNonQuery(oProc) = True Then + oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~DATEPART" + End If + End If + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then Dim oDTDocResult = My.DatabaseIDB.GetDatatable(oBASESEARCH) If oDTDocResult.Rows.Count > 0 Then oParams.Results.Add(New DocumentResultList.DocumentResult() With { - .Title = "MySearchTitle", + .Title = "FlowSearchXYZ", .Datatable = oDTDocResult}) Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) 'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed @@ -241,7 +267,8 @@ Public Class frmFlowSearch1 End If - + Else + bsiStatus.Caption = "Error oin FlowSearch - Check Your log" End If ' @@ -276,22 +303,36 @@ Public Class frmFlowSearch1 Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick Me.txtSearchInput.Text = "" - ToggleSwitchToday.IsOn = False + ResetTogglesDate() + ToggleSwitchDateto.IsOn = False + ExplizitDate = False End Sub - Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitch1.Toggled + Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchDateto.Toggled Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) If oToggle.IsOn Then - DateEditBis.Enabled = True + DateEditTill.Enabled = True lblDatefrom.Text = "Datum von" Else - DateEditBis.Enabled = False + DateEditTill.Enabled = False lblDatefrom.Text = "Datum" End If End Sub - Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEdit1.DateTimeChanged - ToggleSwitchToday.IsOn = False + Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEditFrom.DateTimeChanged + Dim oobj = DateEditFrom.EditValue + If Not IsNothing(oobj) Then + ResetTogglesDate() + End If + + End Sub + + Private Sub DateEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles DateEditFrom.EditValueChanged + Dim oobj = DateEditFrom.EditValue + If Not IsNothing(oobj) Then + ExplizitDate = True + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb index fcc72b53..d0e6dab7 100644 --- a/GUIs.ZooFlow/frmConfigBasic.Designer.vb +++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb @@ -22,50 +22,49 @@ Partial Class frmConfigBasic 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfigBasic)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.cmbScreens = New DevExpress.XtraEditors.ComboBoxEdit() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.CheckButtonDEBUG = New DevExpress.XtraEditors.CheckButton() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbScreens.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 3 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.Size = New System.Drawing.Size(800, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup1.Text = "Schnellzugriffe" ' 'RibbonStatusBar1 ' @@ -81,7 +80,7 @@ Partial Class frmConfigBasic ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.cmbScreens) + Me.LayoutControl1.Controls.Add(Me.CheckButtonDEBUG) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Location = New System.Drawing.Point(0, 160) Me.LayoutControl1.Name = "LayoutControl1" @@ -95,28 +94,43 @@ Partial Class frmConfigBasic ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(800, 268) Me.Root.TextVisible = False ' - 'cmbScreens + 'BarButtonItem1 ' - Me.cmbScreens.Location = New System.Drawing.Point(125, 12) - Me.cmbScreens.MenuManager = Me.RibbonControl1 - Me.cmbScreens.Name = "cmbScreens" - Me.cmbScreens.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbScreens.Size = New System.Drawing.Size(663, 20) - Me.cmbScreens.StyleController = Me.LayoutControl1 - Me.cmbScreens.TabIndex = 4 + Me.BarButtonItem1.Caption = "Appdata Folder" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" ' - 'LayoutControlItem1 + 'BarButtonItem2 ' - Me.LayoutControlItem1.Control = Me.cmbScreens - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 248) - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(101, 13) + Me.BarButtonItem2.Caption = "Log Folder" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'CheckButtonDEBUG + ' + Me.CheckButtonDEBUG.Location = New System.Drawing.Point(12, 12) + Me.CheckButtonDEBUG.Name = "CheckButtonDEBUG" + Me.CheckButtonDEBUG.Padding = New System.Windows.Forms.Padding(10) + Me.CheckButtonDEBUG.Size = New System.Drawing.Size(776, 42) + Me.CheckButtonDEBUG.StyleController = Me.LayoutControl1 + Me.CheckButtonDEBUG.TabIndex = 5 + Me.CheckButtonDEBUG.Text = "DEBUG not active" + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.CheckButtonDEBUG + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 248) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False ' 'frmConfigBasic ' @@ -129,13 +143,12 @@ Partial Class frmConfigBasic Me.Name = "frmConfigBasic" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmConfigBasic" + Me.Text = "User Basic Configuration" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbScreens.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -144,11 +157,12 @@ Partial Class frmConfigBasic Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents cmbScreens As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents CheckButtonDEBUG As DevExpress.XtraEditors.CheckButton + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.ZooFlow/frmConfigBasic.resx b/GUIs.ZooFlow/frmConfigBasic.resx index 1af7de15..d1cd86ef 100644 --- a/GUIs.ZooFlow/frmConfigBasic.resx +++ b/GUIs.ZooFlow/frmConfigBasic.resx @@ -117,4 +117,45 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iT3BlbjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy + IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLlll + bGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFz + cz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwxMEgxMlY3YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw2 + LDIsNi41LDIsN3YxOGMwLDAuMiwwLDAuMywwLjEsMC40YzAsMCwwLjEtMC4xLDAuMS0wLjJsNS41LTEw + ICAgQzgsMTQuNSw4LjcsMTQsOS41LDE0aDEzLjdMMTkuMiwxMHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog + IDwvZz4NCiAgPHBhdGggZD0iTTI5LjMsMTZIOS42TDQsMjZoMTkuOGMwLjUsMCwxLjEtMC4yLDEuMy0w + LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg + PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs + MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iT3BlbjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy + IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLlll + bGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFz + cz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwxMEgxMlY3YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw2 + LDIsNi41LDIsN3YxOGMwLDAuMiwwLDAuMywwLjEsMC40YzAsMCwwLjEtMC4xLDAuMS0wLjJsNS41LTEw + ICAgQzgsMTQuNSw4LjcsMTQsOS41LDE0aDEzLjdMMTkuMiwxMHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog + IDwvZz4NCiAgPHBhdGggZD0iTTI5LjMsMTZIOS42TDQsMjZoMTkuOGMwLjUsMCwxLjEtMC4yLDEuMy0w + LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg + PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs + MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== + + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmConfigBasic.vb b/GUIs.ZooFlow/frmConfigBasic.vb index f7039885..513b0e74 100644 --- a/GUIs.ZooFlow/frmConfigBasic.vb +++ b/GUIs.ZooFlow/frmConfigBasic.vb @@ -1,17 +1,41 @@ Public Class frmConfigBasic Private Sub frmConfigBasic_Load(sender As Object, e As EventArgs) Handles MyBase.Load LoadScreens() + CheckButtonDEBUG.Checked = My.LogConfig.Debug End Sub Private Sub LoadScreens() - cmbScreens.Properties.Items.Clear() - For Each oScreen In Screen.AllScreens - cmbScreens.Properties.Items.Add(oScreen.DeviceName) - Next + 'cmbScreens.Properties.Items.Clear() + 'For Each oScreen In Screen.AllScreens + ' cmbScreens.Properties.Items.Add(oScreen.DeviceName) + 'Next End Sub - Private Sub cmbScreens_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbScreens.SelectedValueChanged - My.UIConfig.SidebarScreen = cmbScreens.EditValue + Private Sub cmbScreens_SelectedValueChanged(sender As Object, e As EventArgs) + 'My.UIConfig.SidebarScreen = cmbScreens.EditValue + My.UIConfigManager.Save() + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Process.Start(My.LogConfig.LogDirectory) + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Process.Start(Windows.Forms.Application.LocalUserAppDataPath) + End Sub + + Private Sub CheckButtonDEBUG_Click(sender As Object, e As EventArgs) Handles CheckButtonDEBUG.Click + + End Sub + + Private Sub CheckButtonDEBUG_CheckedChanged(sender As Object, e As EventArgs) Handles CheckButtonDEBUG.CheckedChanged + If CheckButtonDEBUG.Checked Then + CheckButtonDEBUG.Text = "DEBUG is active" + My.LogConfig.Debug = True + Else + CheckButtonDEBUG.Text = "DEBUG not active" + My.LogConfig.Debug = False + End If My.UIConfigManager.Save() End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 05e95c11..6f73e74f 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -39,8 +39,6 @@ Partial Class frmFlowForm Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.SucheTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TestFlowSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -56,10 +54,10 @@ Partial Class frmFlowForm Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() @@ -68,9 +66,9 @@ Partial Class frmFlowForm CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel1.SuspendLayout() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlQuicksearch1.SuspendLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager @@ -86,9 +84,9 @@ Partial Class frmFlowForm ' 'ContextMenuSystray ' - Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheTestToolStripMenuItem, Me.TestFlowSearchToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) + Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 176) + Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 132) ' 'GlobixToolStripMenuItem ' @@ -141,18 +139,6 @@ Partial Class frmFlowForm Me.ToolStripSeparator3.Name = "ToolStripSeparator3" Me.ToolStripSeparator3.Size = New System.Drawing.Size(170, 6) ' - 'SucheTestToolStripMenuItem - ' - Me.SucheTestToolStripMenuItem.Name = "SucheTestToolStripMenuItem" - Me.SucheTestToolStripMenuItem.Size = New System.Drawing.Size(173, 22) - Me.SucheTestToolStripMenuItem.Text = "Suche (Test)" - ' - 'TestFlowSearchToolStripMenuItem - ' - Me.TestFlowSearchToolStripMenuItem.Name = "TestFlowSearchToolStripMenuItem" - Me.TestFlowSearchToolStripMenuItem.Size = New System.Drawing.Size(173, 22) - Me.TestFlowSearchToolStripMenuItem.Text = "Test_FlowSearch" - ' 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" @@ -176,7 +162,7 @@ Partial Class frmFlowForm Me.PictureBoxPM1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxPM1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxPM1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxPM1.Location = New System.Drawing.Point(38, 377) + Me.PictureBoxPM1.Location = New System.Drawing.Point(53, 376) Me.PictureBoxPM1.Name = "PictureBoxPM1" Me.PictureBoxPM1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxPM1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -189,12 +175,13 @@ Partial Class frmFlowForm ' Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo - Me.PictureBoxAbo.Location = New System.Drawing.Point(88, 224) + Me.PictureBoxAbo.Location = New System.Drawing.Point(103, 223) Me.PictureBoxAbo.Name = "PictureBoxAbo" Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) Me.PictureBoxAbo.TabIndex = 11 Me.PictureBoxAbo.TabStop = False Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen") + Me.PictureBoxAbo.Visible = False ' 'PictureBoxDragDrop ' @@ -233,7 +220,7 @@ Partial Class frmFlowForm Me.PictureBoxGlobix1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxGlobix1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxGlobix1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxGlobix1.Location = New System.Drawing.Point(38, 485) + Me.PictureBoxGlobix1.Location = New System.Drawing.Point(53, 484) Me.PictureBoxGlobix1.Name = "PictureBoxGlobix1" Me.PictureBoxGlobix1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxGlobix1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -247,7 +234,7 @@ Partial Class frmFlowForm Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch1.Location = New System.Drawing.Point(38, 266) + Me.PictureBoxSearch1.Location = New System.Drawing.Point(53, 265) Me.PictureBoxSearch1.Name = "PictureBoxSearch1" Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch @@ -255,37 +242,18 @@ Partial Class frmFlowForm Me.PictureBoxSearch1.TabIndex = 13 Me.PictureBoxSearch1.Text = "SvgImageBox1" ' - 'Panel1 + 'pnlQuicksearch1 ' - Me.Panel1.Controls.Add(Me.PictureEdit1) - Me.Panel1.Controls.Add(Me.TextEdit1) - Me.Panel1.Controls.Add(Me.lblQuicksearch1) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(0, 150) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(202, 60) - Me.Panel1.TabIndex = 16 - ' - 'lblQuicksearch1 - ' - Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblQuicksearch1.Appearance.Options.UseFont = True - Me.lblQuicksearch1.Location = New System.Drawing.Point(3, 3) - Me.lblQuicksearch1.Name = "lblQuicksearch1" - Me.lblQuicksearch1.Size = New System.Drawing.Size(91, 21) - Me.lblQuicksearch1.TabIndex = 0 - Me.lblQuicksearch1.Text = "Alle Attribute" - ' - 'TextEdit1 - ' - Me.TextEdit1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextEdit1.Location = New System.Drawing.Point(3, 29) - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextEdit1.Properties.Appearance.Options.UseFont = True - Me.TextEdit1.Size = New System.Drawing.Size(196, 28) - Me.TextEdit1.TabIndex = 1 + Me.pnlQuicksearch1.BackColor = System.Drawing.Color.CornflowerBlue + Me.pnlQuicksearch1.Controls.Add(Me.PictureEdit1) + Me.pnlQuicksearch1.Controls.Add(Me.TextEdit1) + Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) + Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Top + Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 150) + Me.pnlQuicksearch1.Name = "pnlQuicksearch1" + Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 60) + Me.pnlQuicksearch1.TabIndex = 16 + Me.pnlQuicksearch1.Visible = False ' 'PictureEdit1 ' @@ -298,6 +266,29 @@ Partial Class frmFlowForm Me.PictureEdit1.Size = New System.Drawing.Size(29, 28) Me.PictureEdit1.TabIndex = 17 ' + 'TextEdit1 + ' + Me.TextEdit1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextEdit1.Location = New System.Drawing.Point(3, 29) + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.TextEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextEdit1.Properties.Appearance.Options.UseBackColor = True + Me.TextEdit1.Properties.Appearance.Options.UseFont = True + Me.TextEdit1.Size = New System.Drawing.Size(196, 28) + Me.TextEdit1.TabIndex = 1 + ' + 'lblQuicksearch1 + ' + Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblQuicksearch1.Appearance.Options.UseFont = True + Me.lblQuicksearch1.Location = New System.Drawing.Point(3, 3) + Me.lblQuicksearch1.Name = "lblQuicksearch1" + Me.lblQuicksearch1.Size = New System.Drawing.Size(90, 21) + Me.lblQuicksearch1.TabIndex = 0 + Me.lblQuicksearch1.Text = "Schnellsuche" + ' 'frmFlowForm ' Me.AllowDrop = True @@ -310,7 +301,7 @@ Partial Class frmFlowForm Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BehaviorManager1.SetBehaviors(Me, New DevExpress.Utils.Behaviors.Behavior() {CType(DevExpress.Utils.Behaviors.Common.SnapWindowBehavior.Create(GetType(DevExpress.Utils.BehaviorSource.SnapWindowBehaviorSourceForForm), SnapOptions1), DevExpress.Utils.Behaviors.Behavior)}) Me.ClientSize = New System.Drawing.Size(202, 638) - Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.pnlQuicksearch1) Me.Controls.Add(Me.PictureBoxAbo) Me.Controls.Add(Me.PictureBoxGlobix1) Me.Controls.Add(Me.PictureBoxPM1) @@ -330,10 +321,10 @@ Partial Class frmFlowForm CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlQuicksearch1.ResumeLayout(False) + Me.pnlQuicksearch1.PerformLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -360,11 +351,9 @@ Partial Class frmFlowForm Friend WithEvents PictureBoxGlobix1 As DevExpress.XtraEditors.SvgImageBox Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents ToolStripSeparator3 As ToolStripSeparator - Friend WithEvents SucheTestToolStripMenuItem As ToolStripMenuItem Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager Friend WithEvents BasisKonfigurationToolStripMenuItem As ToolStripMenuItem - Friend WithEvents TestFlowSearchToolStripMenuItem As ToolStripMenuItem - Friend WithEvents Panel1 As Panel + Friend WithEvents pnlQuicksearch1 As Panel Friend WithEvents PictureEdit1 As PictureEdit Friend WithEvents TextEdit1 As TextEdit Friend WithEvents lblQuicksearch1 As LabelControl diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 44228dad..cc1aca11 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -11,7 +11,9 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Windows +Imports DigitalData.Modules.ZooFlow Imports DigitalData.GUIs.Common.Base +Imports DigitalData.GUIs.Common Public Class frmFlowForm #Region "Sidebar DllImport" @@ -163,6 +165,7 @@ Public Class frmFlowForm Private ClassWindow As Window Private ProfileFilter As ProfileFilter Private ProfileLoader As ClassProfileLoader + Private _Environment As Environment ' Runtime Flags Private ApplicationLoading As Boolean = True @@ -186,9 +189,13 @@ Public Class frmFlowForm Init = New ClassInit(My.LogConfig, Me) AddHandler Init.Completed, AddressOf Init_Completed Init.InitializeApplication() + _Environment = My.Application.GetEnvironment ' === Register Sidebar === RegisterBar(ABEdge.ABE_RIGHT) + + + End Sub Private Sub frmFlowForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -303,8 +310,24 @@ Public Class frmFlowForm End If - 'oSQL = "SELECT * FROM TBIDB_ATTRIBUTE" - My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("TBIDB_ATTRIBUTE", "SELECT * FROM TBIDB_ATTRIBUTE", EDMI.API.Constants.DatabaseType.IDB) + + If IsNothing(My.Tables.DTIDB_CATALOG_USER) Then + Exit Sub + End If + For Each oRow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows + If oRow.Item("CAT_TITLE") = "QUICKSEARCH1_TITLE" Then + pnlQuicksearch1.Visible = True + lblQuicksearch1.Text = oRow.Item("CAT_STRING") + ElseIf oRow.Item("CAT_TITLE") = "QUICKSEARCH1_POS" Then + If oRow.Item("CAT_STRING") = "Top" Then + pnlQuicksearch1.Dock = DockStyle.Top + ElseIf oRow.Item("CAT_STRING") = "Bottom" Then + pnlQuicksearch1.Dock = DockStyle.Bottom + End If + + + End If + Next Me.Cursor = Cursors.Default End Sub @@ -590,7 +613,7 @@ Public Class frmFlowForm End If 'Erstmal alles löschen - My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") + My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '" & My.Application.User.UserName & "'") If FileDrop.Drop_File(e) = True Then TimerCheckDroppedFiles.Start() @@ -613,7 +636,7 @@ Public Class frmFlowForm End Sub Private Async Function Globix_Check_Dropped_Files() As Threading.Tasks.Task Try - Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')") + Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND USER@WORK = '{My.Application.User.UserName}'") Dim i As Integer For Each pFile As String In FileDrop.files_dropped @@ -628,7 +651,7 @@ Public Class frmFlowForm End If Next - Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" + Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND USER@WORK = '" & My.Application.User.UserName & "'" My.Application.Globix.DTACTUAL_FILES = Nothing My.Application.Globix.DTACTUAL_FILES = Await My.Database.GetDatatableECMAsync(sql) My.Application.Globix.ABORT_INDEXING = False @@ -816,7 +839,7 @@ Public Class frmFlowForm If My.Application.Globix.Folderwatchstarted = True Or My.UIConfig.Globix.FolderWatchScanStarted = True Then 'Prüfen ob alle Files abgearbeitet wurden - Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" + Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND USER@WORK = '" & My.Application.User.UserName & "'" My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatableECM(sql) If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then @@ -929,7 +952,7 @@ Public Class frmFlowForm oState.UserProfiles, oState.ProfileProcesses, oState.ProfileWindows, oState.ProfileControls, oState.MatchTreeView) Catch ex As Exception Logger.Error(ex) - MsgBox("Fehler beim Laden der Profile. Möglicherweise liegt ein Konfigurationsfehler vor. Fehlermeldung: " & ex.Message, MsgBoxStyle.Critical, Text) + End Try Try @@ -1033,22 +1056,85 @@ Public Class frmFlowForm End Sub - Private Sub SucheTestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SucheTestToolStripMenuItem.Click - frmSearchNeu.Show() - End Sub + Private Sub BasisKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BasisKonfigurationToolStripMenuItem.Click frmConfigBasic.ShowDialog() End Sub - Private Sub TestFlowSearchToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestFlowSearchToolStripMenuItem.Click - Open_FlowSearch() - End Sub + Private Sub ShowErrorMessage(pEx As Exception) Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) ErrorHandler.ShowErrorMessage(pEx, oCallingClass) End Sub + Private Function GetResultWindowString(SearchContent As String) As String + If SearchContent <> String.Empty Then + If My.Application.User.Language = DigitalData.Modules.ZooFlow.State.UserState.LANG_DE_DE Then + + Return $"Suche Nach '{SearchContent}'" + Else + Return $"Search For '{SearchContent}'" + End If + End If + + + End Function + Sub RunQuickSearch1() + Try + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{TextEdit1.Text}',''" + + Dim oParams = New DocumentResultList.Params() With { + .WindowGuid = "QuickFlowSearch1", + .WindowTitle = GetResultWindowString(TextEdit1.Text), + .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 354521 + } + + + If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then + Dim oDTDocResult = My.DatabaseIDB.GetDatatable(DocResultBaseSearch) + If oDTDocResult.Rows.Count > 0 Then + oParams.Results.Add(New DocumentResultList.DocumentResult() With { + .Title = GetResultWindowString(TextEdit1.Text), + .Datatable = oDTDocResult}) + Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) + 'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed + 'AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh + + 'OpenForms.Add(oForm) + oForm.Show() + Else + MsgBox("No Results") + End If + End If + + Catch ex As Exception + Logger.Error(ex) + MsgBox("Unhandled exception in RunQuickSearch1: " & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub + + Private Sub TextEdit1_KeyUp(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyUp + If e.KeyCode = Keys.Return Then + CheckRunSearch1() + End If + End Sub + + + Sub CheckRunSearch1() + If TextEdit1.Text <> String.Empty Then + RunQuickSearch1() + End If + End Sub + Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click + CheckRunSearch1() + End Sub + + Private Sub frmFlowForm_Shown(sender As Object, e As EventArgs) Handles Me.Shown + + End Sub End Class diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index 7f8b8cf9..521e9dc3 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -13,4 +13,6 @@ Module modCurrent Public Property NI_MESSAGE As String = "" Public Property NI_TYPE As String = "INFO" Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer + + Public Property DocResultBaseSearch As String End Module