diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index 9b288c84..26421b26 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -250,5 +250,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GUIs.Common/DataResultList/frmDataResultList.Designer.vb b/GUIs.Common/DataResultList/frmDataResultList.Designer.vb
index 55b2378d..a0f9330f 100644
--- a/GUIs.Common/DataResultList/frmDataResultList.Designer.vb
+++ b/GUIs.Common/DataResultList/frmDataResultList.Designer.vb
@@ -65,13 +65,13 @@ Partial Class frmDataResultList
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
- Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.labelResultCount, Me.BarButtonItem1, Me.BarButtonItem2})
+ Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.labelResultCount, Me.BarButtonItem1, Me.BarButtonItem2, Me.RibbonControl1.SearchEditItem})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 6
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(995, 143)
+ Me.RibbonControl1.Size = New System.Drawing.Size(995, 159)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
'
'SwitchMainContainerHorizontal
@@ -137,10 +137,10 @@ Partial Class frmDataResultList
'RibbonStatusBar1
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.labelResultCount)
- Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 633)
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 642)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
- Me.RibbonStatusBar1.Size = New System.Drawing.Size(995, 31)
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(995, 22)
'
'RibbonPage2
'
@@ -151,13 +151,13 @@ Partial Class frmDataResultList
'
Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 143)
+ Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 159)
Me.SplitContainerControl1.Name = "SplitContainerControl1"
Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1)
Me.SplitContainerControl1.Panel1.Text = "Panel1"
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
Me.SplitContainerControl1.Panel2.Text = "Panel2"
- Me.SplitContainerControl1.Size = New System.Drawing.Size(995, 490)
+ Me.SplitContainerControl1.Size = New System.Drawing.Size(995, 483)
Me.SplitContainerControl1.SplitterPosition = 401
Me.SplitContainerControl1.TabIndex = 2
Me.SplitContainerControl1.Text = "SplitContainerControl1"
@@ -169,7 +169,7 @@ Partial Class frmDataResultList
Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.MenuManager = Me.RibbonControl1
Me.GridControl1.Name = "GridControl1"
- Me.GridControl1.Size = New System.Drawing.Size(401, 490)
+ Me.GridControl1.Size = New System.Drawing.Size(401, 483)
Me.GridControl1.TabIndex = 0
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
'
@@ -182,7 +182,7 @@ Partial Class frmDataResultList
'
'GridBand1
'
- Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold)
Me.GridBand1.AppearanceHeader.Options.UseFont = True
Me.GridBand1.Caption = "GridBand1"
Me.GridBand1.Name = "GridBand1"
@@ -199,7 +199,7 @@ Partial Class frmDataResultList
Me.SplitContainerControl2.Panel1.Text = "Panel1"
Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3)
Me.SplitContainerControl2.Panel2.Text = "Panel2"
- Me.SplitContainerControl2.Size = New System.Drawing.Size(589, 490)
+ Me.SplitContainerControl2.Size = New System.Drawing.Size(584, 483)
Me.SplitContainerControl2.SplitterPosition = 264
Me.SplitContainerControl2.TabIndex = 0
Me.SplitContainerControl2.Text = "SplitContainerControl2"
@@ -211,7 +211,7 @@ Partial Class frmDataResultList
Me.GridControl2.MainView = Me.GridView2
Me.GridControl2.MenuManager = Me.RibbonControl1
Me.GridControl2.Name = "GridControl2"
- Me.GridControl2.Size = New System.Drawing.Size(589, 264)
+ Me.GridControl2.Size = New System.Drawing.Size(584, 264)
Me.GridControl2.TabIndex = 0
Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
'
@@ -224,7 +224,7 @@ Partial Class frmDataResultList
'
'GridBand2
'
- Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold)
Me.GridBand2.AppearanceHeader.Options.UseFont = True
Me.GridBand2.Caption = "GridBand2"
Me.GridBand2.Name = "GridBand2"
@@ -237,7 +237,7 @@ Partial Class frmDataResultList
Me.GridControl3.MainView = Me.GridView3
Me.GridControl3.MenuManager = Me.RibbonControl1
Me.GridControl3.Name = "GridControl3"
- Me.GridControl3.Size = New System.Drawing.Size(589, 221)
+ Me.GridControl3.Size = New System.Drawing.Size(584, 209)
Me.GridControl3.TabIndex = 0
Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
'
@@ -250,7 +250,7 @@ Partial Class frmDataResultList
'
'GridBand3
'
- Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold)
Me.GridBand3.AppearanceHeader.Options.UseFont = True
Me.GridBand3.Caption = "GridBand3"
Me.GridBand3.Name = "GridBand3"
@@ -273,9 +273,9 @@ Partial Class frmDataResultList
Me.Controls.Add(Me.SplitContainerControl1)
Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.RibbonControl1)
+ Me.IconOptions.ShowIcon = False
Me.Name = "frmDataResultList"
Me.Ribbon = Me.RibbonControl1
- Me.ShowIcon = False
Me.StatusBar = Me.RibbonStatusBar1
Me.Text = "Daten Suche"
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/GUIs.Common/DataResultList/frmDataResultList.vb b/GUIs.Common/DataResultList/frmDataResultList.vb
index 699ce839..1f5ecdc0 100644
--- a/GUIs.Common/DataResultList/frmDataResultList.vb
+++ b/GUIs.Common/DataResultList/frmDataResultList.vb
@@ -11,6 +11,7 @@ Imports DigitalData.Modules.Language
Imports DevExpress.XtraPrinting
Imports DigitalData.GUIs.Common
Imports System.ComponentModel
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
Public Class frmDataResultList
Implements IResultForm
@@ -282,4 +283,6 @@ Public Class frmDataResultList
Public Function RefreshResults(pResults As IEnumerable(Of BaseResult)) As Boolean Implements IResultForm.RefreshResults
'TODO: Implement
End Function
+
+
End Class
\ No newline at end of file
diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
index bcb0ab58..311c2a15 100644
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
@@ -84,7 +84,7 @@ Partial Class frmDocumentResultList
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2})
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
- Me.RibbonControl.Size = New System.Drawing.Size(1189, 158)
+ Me.RibbonControl.Size = New System.Drawing.Size(1189, 159)
Me.RibbonControl.StatusBar = Me.RibbonStatusBar
'
'SwitchMainContainerHorizontal
@@ -107,6 +107,7 @@ Partial Class frmDocumentResultList
Me.BarButtonItemExportGrid1.Id = 3
Me.BarButtonItemExportGrid1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemExportGrid1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItemExportGrid1.Name = "BarButtonItemExportGrid1"
+ Me.BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
'
'BarButtonItem1
'
@@ -159,6 +160,7 @@ Partial Class frmDocumentResultList
Me.BarButtonItem5.Id = 10
Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem5.Name = "BarButtonItem5"
+ Me.BarButtonItem5.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
'
'BarEditItem1
'
@@ -206,6 +208,7 @@ Partial Class frmDocumentResultList
Me.labelWarning.ItemAppearance.Normal.BackColor = System.Drawing.Color.White
Me.labelWarning.ItemAppearance.Normal.Options.UseBackColor = True
Me.labelWarning.Name = "labelWarning"
+ Me.labelWarning.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
Me.labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
'
'RibbonPage1
@@ -242,10 +245,10 @@ Partial Class frmDocumentResultList
Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount)
Me.RibbonStatusBar.ItemLinks.Add(Me.labelCriticalError)
Me.RibbonStatusBar.ItemLinks.Add(Me.labelWarning)
- Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647)
+ Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649)
Me.RibbonStatusBar.Name = "RibbonStatusBar"
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
- Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24)
+ Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22)
'
'SplitContainerControl1
'
@@ -257,7 +260,7 @@ Partial Class frmDocumentResultList
Me.SplitContainerControl1.Panel1.Text = "Panel1"
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
Me.SplitContainerControl1.Panel2.Text = "Panel2"
- Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 489)
+ Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 490)
Me.SplitContainerControl1.SplitterPosition = 382
Me.SplitContainerControl1.TabIndex = 2
Me.SplitContainerControl1.Text = "SplitContainerControl1"
@@ -269,13 +272,13 @@ Partial Class frmDocumentResultList
Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.MenuManager = Me.RibbonControl
Me.GridControl1.Name = "GridControl1"
- Me.GridControl1.Size = New System.Drawing.Size(382, 489)
+ Me.GridControl1.Size = New System.Drawing.Size(382, 490)
Me.GridControl1.TabIndex = 0
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
'
'GridView1
'
- Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke
+ Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
@@ -309,7 +312,7 @@ Partial Class frmDocumentResultList
Me.SplitContainerControl2.Panel1.Text = "Panel1"
Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3)
Me.SplitContainerControl2.Panel2.Text = "Panel2"
- Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 489)
+ Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 490)
Me.SplitContainerControl2.SplitterPosition = 223
Me.SplitContainerControl2.TabIndex = 0
Me.SplitContainerControl2.Text = "SplitContainerControl2"
@@ -327,7 +330,7 @@ Partial Class frmDocumentResultList
'
'GridView2
'
- Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke
+ Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2})
Me.GridView2.GridControl = Me.GridControl2
@@ -354,13 +357,13 @@ Partial Class frmDocumentResultList
Me.GridControl3.MainView = Me.GridView3
Me.GridControl3.MenuManager = Me.RibbonControl
Me.GridControl3.Name = "GridControl3"
- Me.GridControl3.Size = New System.Drawing.Size(370, 256)
+ Me.GridControl3.Size = New System.Drawing.Size(370, 257)
Me.GridControl3.TabIndex = 0
Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
'
'GridView3
'
- Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.WhiteSmoke
+ Me.GridView3.Appearance.EvenRow.BackColor = System.Drawing.Color.Gainsboro
Me.GridView3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridView3.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand3})
Me.GridView3.GridControl = Me.GridControl3
@@ -383,13 +386,13 @@ Partial Class frmDocumentResultList
'SplitContainerControl3
'
Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill
- Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158)
+ Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 159)
Me.SplitContainerControl3.Name = "SplitContainerControl3"
Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1)
Me.SplitContainerControl3.Panel1.Text = "Panel1"
Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1)
Me.SplitContainerControl3.Panel2.Text = "Panel2"
- Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 489)
+ Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 490)
Me.SplitContainerControl3.SplitterPosition = 762
Me.SplitContainerControl3.TabIndex = 5
Me.SplitContainerControl3.Text = "SplitContainerControl3"
@@ -400,7 +403,7 @@ Partial Class frmDocumentResultList
Me.DocumentViewer1.FileLoaded = False
Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
Me.DocumentViewer1.Name = "DocumentViewer1"
- Me.DocumentViewer1.Size = New System.Drawing.Size(417, 489)
+ Me.DocumentViewer1.Size = New System.Drawing.Size(417, 490)
Me.DocumentViewer1.TabIndex = 0
'
'XtraSaveFileDialog
@@ -417,6 +420,7 @@ Partial Class frmDocumentResultList
Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl)
Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon)
+ Me.IconOptions.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.zoom_less
Me.IconOptions.ShowIcon = False
Me.Name = "frmDocumentResultList"
Me.Ribbon = Me.RibbonControl
diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
index 801af409..f42d37af 100644
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
@@ -15,6 +15,8 @@ Imports DigitalData.Modules.EDMI.API.Client
Imports DevExpress.XtraGrid.Views.Base
Imports DevExpress.XtraGrid.Views.BandedGrid
Imports System.ComponentModel
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+Imports DevExpress.XtraEditors.ViewInfo
Public Class frmDocumentResultList
Implements IResultForm
@@ -220,15 +222,18 @@ Public Class frmDocumentResultList
Case 0
Dim oResult As DocumentResult = _ResultLists.Item(0)
CreateDocumentGrid(GridView1, oResult)
+ RestoreLayout(GridView1)
UpdateGridHeader(_ResultLists, index, oResult.Datatable.Rows.Count)
Case 1
Dim oResult As DocumentResult = _ResultLists.Item(1)
CreateDocumentGrid(GridView2, oResult)
+ RestoreLayout(GridView1)
UpdateGridHeader(_ResultLists, index, oResult.Datatable.Rows.Count)
Case 2
Dim oResult As DocumentResult = _ResultLists.Item(2)
CreateDocumentGrid(GridView3, oResult)
+ RestoreLayout(GridView1)
UpdateGridHeader(_ResultLists, index, oResult.Datatable.Rows.Count)
Case Else
@@ -425,7 +430,26 @@ Public Class frmDocumentResultList
_Logger.Error(ex)
End Try
End Sub
-
+ Private Sub GridView1_CustomDrawCell(sender As Object, e As RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell
+ Dim view As GridView = TryCast(sender, GridView)
+ If e.Column.FieldName = "Name" Then
+ Dim cellInfo As GridCellInfo = TryCast(e.Cell, GridCellInfo)
+ Dim info As TextEditViewInfo = TryCast(cellInfo.ViewInfo, TextEditViewInfo)
+ If info IsNot Nothing Then
+ If OperationMode = IResultForm.Mode.NoAppServer Then
+ ' oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFullpath)
+ ' oNewRow.Item(COLUMN_FILEPATH) = oFullpath
+ ' oNewRow.Item(COLUMN_FILENAME) = oFilename
+ Else
+ 'info.ContextImage = _Helpers.GetIconByExtension(oFilename)
+ ' oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFilename)
+ ' oNewRow.Item(COLUMN_FILEPATH) = String.Empty
+ ' oNewRow.Item(COLUMN_FILENAME) = oFilename
+ End If
+ info.CalcViewInfo()
+ End If
+ End If
+ End Sub
Private Function TryGetItem(DataRow As DataRow, ColumnName As String, Optional DefaultValue As String = "") As String
Try
Return DataRow.Item(ColumnName)
@@ -499,7 +523,10 @@ Public Class frmDocumentResultList
Return Nothing
End If
End Function
-
+ Private Function GetDevexpressGrid_LayoutName(pGridView As GridView)
+ Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml"
+ Return System.IO.Path.Combine(_Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
+ End Function
Private Function GetActiveGridControl() As GridControl
If _ActiveGrid Is Nothing Then
Return Nothing
@@ -508,10 +535,30 @@ Public Class frmDocumentResultList
Return _ActiveGrid
End Function
+ Private Sub GridViewSave_Layout(pGridView As GridView)
+ Try
+ Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView)
+ pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout)
+ Catch ex As Exception
+ _Logger.Error(ex)
+ _Logger.Info("Error while saving GridLayout: " & ex.Message)
+ End Try
+ End Sub
+ Private Sub RestoreLayout(pGridView As GridView)
+ Try
+ Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView)
+ pGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
+ Catch ex As Exception
+ _Logger.Error(ex)
+ _Logger.Info("Error while restoring layout: " & ex.Message)
+ End Try
+ End Sub
Private Sub GridControl_Enter(sender As GridControl, e As EventArgs) Handles GridControl1.Enter, GridControl2.Enter, GridControl3.Enter
_ActiveGrid = sender
+ BarButtonItem5.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+ BarButtonItemExportGrid1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
SetActiveGridBand()
End Sub
@@ -665,4 +712,26 @@ Public Class frmDocumentResultList
labelCriticalError.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End Sub
+
+ Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick
+ If Not IsNothing(_ActiveGrid) Then
+ Try
+ Dim oFile = GetDevexpressGrid_LayoutName(_ActiveGrid.MainView)
+ If File.Exists(oFile) Then
+ File.Delete(oFile)
+ UpdateGridData()
+ End If
+ Catch ex As Exception
+
+ End Try
+ End If
+
+
+ End Sub
+
+ Private Sub frmDocumentResultList_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+ GridViewSave_Layout(_ActiveGrid.MainView)
+ End Sub
+
+
End Class
\ No newline at end of file
diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb
index fd85f6b7..8cf1092f 100644
--- a/GUIs.Common/My Project/Resources.Designer.vb
+++ b/GUIs.Common/My Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
'''
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
'''
- _
@@ -209,5 +209,35 @@ Namespace My.Resources
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property ZooFlow_Vergroessern() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("ZooFlow-Vergroessern", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property zoom_less() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("zoom_less", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property zoom_more() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("zoom_more", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
End Module
End Namespace
diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx
index 4415f268..ef093278 100644
--- a/GUIs.Common/My Project/Resources.resx
+++ b/GUIs.Common/My Project/Resources.resx
@@ -142,25 +142,34 @@
..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ ..\Resources\zoom_less.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/GUIs.Common/Resources/ZooFlow-Vergroessern.svg b/GUIs.Common/Resources/ZooFlow-Vergroessern.svg
new file mode 100644
index 00000000..9214156e
--- /dev/null
+++ b/GUIs.Common/Resources/ZooFlow-Vergroessern.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/GUIs.Common/Resources/zoom_less.png b/GUIs.Common/Resources/zoom_less.png
new file mode 100644
index 00000000..effe24b5
Binary files /dev/null and b/GUIs.Common/Resources/zoom_less.png differ
diff --git a/GUIs.Common/Resources/zoom_more.png b/GUIs.Common/Resources/zoom_more.png
new file mode 100644
index 00000000..92905fa0
Binary files /dev/null and b/GUIs.Common/Resources/zoom_more.png differ
diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb
index 57a9dc34..f39cafac 100644
--- a/GUIs.ZooFlow/My Project/Resources.Designer.vb
+++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb
@@ -280,6 +280,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property Flow() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("Flow", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx
index 40fc5c2d..2c0b271e 100644
--- a/GUIs.ZooFlow/My Project/Resources.resx
+++ b/GUIs.ZooFlow/My Project/Resources.resx
@@ -124,12 +124,12 @@
..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -172,8 +172,8 @@
..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -181,6 +181,9 @@
..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -202,7 +205,7 @@
..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/Flow.PNG b/GUIs.ZooFlow/Resources/Flow.PNG
new file mode 100644
index 00000000..fec62598
Binary files /dev/null and b/GUIs.ZooFlow/Resources/Flow.PNG differ
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
index 248f1ce0..7ab96e6e 100644
--- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
@@ -1,6 +1,6 @@
Partial Class frmFlowSearch
- Inherits DevExpress.XtraEditors.XtraForm
+ Inherits DevExpress.XtraBars.Ribbon.RibbonForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -22,39 +22,70 @@ Partial Class frmFlowSearch
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch))
Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch))
Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton()
Me.txtSearch = New System.Windows.Forms.TextBox()
Me.lblFoundResult = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.TileControlMatch = New DevExpress.XtraEditors.TileControl()
Me.TileGroup2 = New DevExpress.XtraEditors.TileGroup()
- Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup()
Me.TileItem1 = New DevExpress.XtraEditors.TileItem()
Me.TileItem2 = New DevExpress.XtraEditors.TileItem()
+ Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup()
+ Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+ Me.BarToggleSwitchItemDateALL = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItemCURRENTYEAR = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItemLASTYEAR = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItemCURRENTMONTH = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItemLASTMONTH = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarButtonGroup1 = New DevExpress.XtraBars.BarButtonGroup()
+ Me.BarToggleSwitchItemTODAY = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItemYESTERDAY = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
+ Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
+ Me.BarToggleSwitchItem2 = New DevExpress.XtraBars.BarToggleSwitchItem()
+ 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.Panel1.SuspendLayout()
+ CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.DimGray
+ Me.Panel1.Controls.Add(Me.CheckButton1)
Me.Panel1.Controls.Add(Me.txtSearch)
Me.Panel1.Controls.Add(Me.lblFoundResult)
Me.Panel1.Controls.Add(Me.Label1)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
- Me.Panel1.Location = New System.Drawing.Point(0, 0)
+ Me.Panel1.Location = New System.Drawing.Point(0, 159)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(1245, 61)
Me.Panel1.TabIndex = 0
'
+ 'CheckButton1
+ '
+ Me.CheckButton1.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer))
+ Me.CheckButton1.Appearance.Options.UseBackColor = True
+ Me.CheckButton1.ImageOptions.SvgImage = CType(resources.GetObject("CheckButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+ Me.CheckButton1.Location = New System.Drawing.Point(7, 11)
+ Me.CheckButton1.Name = "CheckButton1"
+ Me.CheckButton1.Size = New System.Drawing.Size(110, 45)
+ Me.CheckButton1.TabIndex = 5
+ Me.CheckButton1.Text = "Zeige Alles"
+ '
'txtSearch
'
Me.txtSearch.BackColor = System.Drawing.Color.White
Me.txtSearch.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.txtSearch.Location = New System.Drawing.Point(16, 12)
+ Me.txtSearch.Location = New System.Drawing.Point(148, 11)
Me.txtSearch.Name = "txtSearch"
Me.txtSearch.Size = New System.Drawing.Size(167, 23)
Me.txtSearch.TabIndex = 0
@@ -65,7 +96,7 @@ Partial Class frmFlowSearch
Me.lblFoundResult.BackColor = System.Drawing.Color.Transparent
Me.lblFoundResult.Font = New System.Drawing.Font("Tahoma", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblFoundResult.ForeColor = System.Drawing.Color.White
- Me.lblFoundResult.Location = New System.Drawing.Point(12, 38)
+ Me.lblFoundResult.Location = New System.Drawing.Point(144, 37)
Me.lblFoundResult.Name = "lblFoundResult"
Me.lblFoundResult.Size = New System.Drawing.Size(53, 19)
Me.lblFoundResult.TabIndex = 3
@@ -77,7 +108,7 @@ Partial Class frmFlowSearch
Me.Label1.AutoSize = True
Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label1.ForeColor = System.Drawing.Color.White
- Me.Label1.Location = New System.Drawing.Point(185, 15)
+ Me.Label1.Location = New System.Drawing.Point(321, 14)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(43, 16)
Me.Label1.TabIndex = 0
@@ -86,7 +117,7 @@ Partial Class frmFlowSearch
'Panel2
'
Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
- Me.Panel2.Location = New System.Drawing.Point(0, 474)
+ Me.Panel2.Location = New System.Drawing.Point(0, 452)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(1245, 18)
Me.Panel2.TabIndex = 1
@@ -97,11 +128,11 @@ Partial Class frmFlowSearch
Me.TileControlMatch.Dock = System.Windows.Forms.DockStyle.Fill
Me.TileControlMatch.Groups.Add(Me.TileGroup2)
Me.TileControlMatch.Groups.Add(Me.TileGroup3)
- Me.TileControlMatch.Location = New System.Drawing.Point(0, 61)
+ Me.TileControlMatch.Location = New System.Drawing.Point(0, 220)
Me.TileControlMatch.MaxId = 2
Me.TileControlMatch.Name = "TileControlMatch"
Me.TileControlMatch.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar
- Me.TileControlMatch.Size = New System.Drawing.Size(1245, 413)
+ Me.TileControlMatch.Size = New System.Drawing.Size(1245, 232)
Me.TileControlMatch.TabIndex = 2
Me.TileControlMatch.Text = "TileControl1"
'
@@ -112,10 +143,6 @@ Partial Class frmFlowSearch
Me.TileGroup2.Name = "TileGroup2"
Me.TileGroup2.Text = "Attribut1"
'
- 'TileGroup3
- '
- Me.TileGroup3.Name = "TileGroup3"
- '
'TileItem1
'
Me.TileItem1.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
@@ -136,6 +163,129 @@ Partial Class frmFlowSearch
Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium
Me.TileItem2.Name = "TileItem2"
'
+ 'TileGroup3
+ '
+ Me.TileGroup3.Name = "TileGroup3"
+ '
+ 'RibbonControl1
+ '
+ Me.RibbonControl1.ExpandCollapseItem.Id = 0
+ Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarToggleSwitchItemDateALL, Me.BarToggleSwitchItemCURRENTYEAR, Me.BarToggleSwitchItemLASTYEAR, Me.BarToggleSwitchItemCURRENTMONTH, Me.BarToggleSwitchItemLASTMONTH, Me.BarButtonGroup1, Me.BarToggleSwitchItemTODAY, Me.BarToggleSwitchItemYESTERDAY, Me.BarCheckItem1, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2})
+ Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+ Me.RibbonControl1.MaxItemId = 12
+ Me.RibbonControl1.Name = "RibbonControl1"
+ Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+ Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+ Me.RibbonControl1.ShowToolbarCustomizeItem = False
+ Me.RibbonControl1.Size = New System.Drawing.Size(1245, 159)
+ Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+ Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
+ '
+ 'BarToggleSwitchItemDateALL
+ '
+ Me.BarToggleSwitchItemDateALL.BindableChecked = True
+ Me.BarToggleSwitchItemDateALL.Caption = "keine Eingrenzung"
+ Me.BarToggleSwitchItemDateALL.Checked = True
+ Me.BarToggleSwitchItemDateALL.Id = 1
+ Me.BarToggleSwitchItemDateALL.Name = "BarToggleSwitchItemDateALL"
+ '
+ 'BarToggleSwitchItemCURRENTYEAR
+ '
+ Me.BarToggleSwitchItemCURRENTYEAR.Caption = "Aktuelles Jahr"
+ Me.BarToggleSwitchItemCURRENTYEAR.Id = 2
+ Me.BarToggleSwitchItemCURRENTYEAR.Name = "BarToggleSwitchItemCURRENTYEAR"
+ '
+ 'BarToggleSwitchItemLASTYEAR
+ '
+ Me.BarToggleSwitchItemLASTYEAR.Caption = "Letztes Jahr"
+ Me.BarToggleSwitchItemLASTYEAR.Id = 3
+ Me.BarToggleSwitchItemLASTYEAR.Name = "BarToggleSwitchItemLASTYEAR"
+ '
+ 'BarToggleSwitchItemCURRENTMONTH
+ '
+ Me.BarToggleSwitchItemCURRENTMONTH.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
+ Me.BarToggleSwitchItemCURRENTMONTH.Caption = "Aktueller Monat"
+ Me.BarToggleSwitchItemCURRENTMONTH.Id = 4
+ Me.BarToggleSwitchItemCURRENTMONTH.Name = "BarToggleSwitchItemCURRENTMONTH"
+ '
+ 'BarToggleSwitchItemLASTMONTH
+ '
+ Me.BarToggleSwitchItemLASTMONTH.Caption = "LetzterMonat"
+ Me.BarToggleSwitchItemLASTMONTH.Id = 5
+ Me.BarToggleSwitchItemLASTMONTH.Name = "BarToggleSwitchItemLASTMONTH"
+ '
+ 'BarButtonGroup1
+ '
+ Me.BarButtonGroup1.Caption = "BarButtonGroup1"
+ Me.BarButtonGroup1.Id = 6
+ Me.BarButtonGroup1.Name = "BarButtonGroup1"
+ '
+ 'BarToggleSwitchItemTODAY
+ '
+ Me.BarToggleSwitchItemTODAY.Caption = "Heute"
+ Me.BarToggleSwitchItemTODAY.Id = 7
+ Me.BarToggleSwitchItemTODAY.Name = "BarToggleSwitchItemTODAY"
+ '
+ 'BarToggleSwitchItemYESTERDAY
+ '
+ Me.BarToggleSwitchItemYESTERDAY.Caption = "Gestern"
+ Me.BarToggleSwitchItemYESTERDAY.Id = 8
+ Me.BarToggleSwitchItemYESTERDAY.Name = "BarToggleSwitchItemYESTERDAY"
+ '
+ 'BarCheckItem1
+ '
+ Me.BarCheckItem1.Caption = "BarCheckItem1"
+ Me.BarCheckItem1.Id = 9
+ Me.BarCheckItem1.Name = "BarCheckItem1"
+ '
+ 'BarToggleSwitchItem1
+ '
+ Me.BarToggleSwitchItem1.Caption = "BarToggleSwitchItem1"
+ Me.BarToggleSwitchItem1.Id = 10
+ Me.BarToggleSwitchItem1.Name = "BarToggleSwitchItem1"
+ '
+ 'BarToggleSwitchItem2
+ '
+ Me.BarToggleSwitchItem2.Caption = "BarToggleSwitchItem2"
+ Me.BarToggleSwitchItem2.Id = 11
+ Me.BarToggleSwitchItem2.Name = "BarToggleSwitchItem2"
+ '
+ 'RibbonPage1
+ '
+ Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
+ Me.RibbonPage1.Name = "RibbonPage1"
+ Me.RibbonPage1.Text = "Start"
+ '
+ 'RibbonPageGroup1
+ '
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemDateALL)
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonGroup1)
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemCURRENTMONTH)
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemLASTMONTH)
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemTODAY)
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemYESTERDAY)
+ Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+ Me.RibbonPageGroup1.Text = "Datumeingränzung"
+ '
+ 'RibbonPageGroup2
+ '
+ Me.RibbonPageGroup2.ItemLinks.Add(Me.BarToggleSwitchItemCURRENTYEAR)
+ Me.RibbonPageGroup2.ItemLinks.Add(Me.BarToggleSwitchItemLASTYEAR)
+ Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+ Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
+ '
+ 'RibbonStatusBar1
+ '
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 470)
+ Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+ Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(1245, 22)
+ '
+ 'RibbonPage2
+ '
+ Me.RibbonPage2.Name = "RibbonPage2"
+ Me.RibbonPage2.Text = "RibbonPage2"
+ '
'frmFlowSearch
'
Me.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
@@ -146,12 +296,18 @@ Partial Class frmFlowSearch
Me.Controls.Add(Me.TileControlMatch)
Me.Controls.Add(Me.Panel2)
Me.Controls.Add(Me.Panel1)
+ Me.Controls.Add(Me.RibbonStatusBar1)
+ Me.Controls.Add(Me.RibbonControl1)
Me.IconOptions.SvgImage = CType(resources.GetObject("frmFlowSearch.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.Name = "frmFlowSearch"
+ Me.Ribbon = Me.RibbonControl1
+ Me.StatusBar = Me.RibbonStatusBar1
Me.Text = "FlowSearch"
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
+ CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
+ Me.PerformLayout()
End Sub
@@ -165,4 +321,22 @@ Partial Class frmFlowSearch
Friend WithEvents TileItem1 As DevExpress.XtraEditors.TileItem
Friend WithEvents TileItem2 As DevExpress.XtraEditors.TileItem
Friend WithEvents TileGroup3 As DevExpress.XtraEditors.TileGroup
+ 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 BarToggleSwitchItemDateALL As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItemCURRENTYEAR As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItemLASTYEAR As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItemCURRENTMONTH As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItemLASTMONTH As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarButtonGroup1 As DevExpress.XtraBars.BarButtonGroup
+ Friend WithEvents BarToggleSwitchItemTODAY As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItemYESTERDAY As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
+ Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents BarToggleSwitchItem2 As DevExpress.XtraBars.BarToggleSwitchItem
+ Friend WithEvents CheckButton1 As DevExpress.XtraEditors.CheckButton
End Class
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx
index f3af65ef..7d5ecb9e 100644
--- a/GUIs.ZooFlow/Search/frmFlowSearch.resx
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx
@@ -118,6 +118,26 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+ WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+ Pg0KICA8ZyBpZD0iQmFyY29kZSI+DQogICAgPHBhdGggZD0iTTI5LDRIMUMwLjUsNCwwLDQuNSwwLDV2
+ MjJjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEtMVY1QzMwLDQuNSwyOS41LDQsMjksNHog
+ TTI4LDI2SDJWNmgyNlYyNnogICAgTTYsMjRINFY4aDJWMjR6IE0xMCwyMEg4VjhoMlYyMHogTTE0LDI0
+ aC0yVjhoMlYyNHogTTE4LDIwaC0yVjhoMlYyMHogTTIyLDIwaC0yVjhoMlYyMHogTTI2LDI0aC0yVjho
+ MlYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+
+
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb
index 2a6ccf98..fa6eb0b4 100644
--- a/GUIs.ZooFlow/Search/frmFlowSearch.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb
@@ -2,6 +2,7 @@
Imports DevExpress.XtraEditors
Imports DigitalData.GUIs.Common
Imports DevExpress.XtraSplashScreen
+Imports DevExpress.XtraBars
Public Class frmFlowSearch
Private Logger As Logger
@@ -14,6 +15,9 @@ Public Class frmFlowSearch
Dim BASE_SEARCHCommand As String
Private LastSearchForm As frmDocumentResultList
Private ASorDB As ClassDataASorDB
+ Private EventtoggleChange As Boolean = False
+
+ Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13"
Public Sub New(pBaseSearchSql As String)
@@ -33,7 +37,7 @@ Public Class frmFlowSearch
Exit Sub
End If
lblFoundResult.Visible = False
- SearchContent(Trim(txtSearch.Text))
+ Start_FlowSearch()
Catch ex As Exception
lblFoundResult.Text = "Unexpected error in FlowSearch - Check Your log"
@@ -49,6 +53,11 @@ Public Class frmFlowSearch
Try
oLastAttribute = ""
Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue)
+
+
+ If BarToggleSwitchItemDateALL.Checked = False Then
+ oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
+ End If
Dim oResultCountAttributes As Integer = 0
TileControlMatch.Groups.Clear()
@@ -100,7 +109,8 @@ Public Class frmFlowSearch
Else
If oResultsfromSearchDT.Rows.Count = 0 Then
Reset_Form()
-
+ lblFoundResult.Text = "No Results"
+ lblFoundResult.Visible = True
End If
End If
@@ -122,9 +132,14 @@ Public Class frmFlowSearch
Try
oHandle = SplashScreenManager.ShowOverlayForm(Me)
- Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}',{My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'"
+ Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'"
Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL)
If Not IsNothing(oDTOBJECT_RESULT) Then
+ If oDTOBJECT_RESULT.Rows.Count = 0 Then
+ lblFoundResult.Text = "No Results"
+ lblFoundResult.Visible = True
+ Return False
+ End If
oItemsFound = True
OpenResultForm(oDTOBJECT_RESULT)
End If
@@ -296,4 +311,115 @@ Public Class frmFlowSearch
Logger.Error(ex)
End Try
End Sub
+
+ Private Sub BarToggleSwitchItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItemCURRENTYEAR.CheckedChanged, BarToggleSwitchItemLASTYEAR.CheckedChanged, BarToggleSwitchItemCURRENTMONTH.CheckedChanged,
+ BarToggleSwitchItemLASTMONTH.CheckedChanged, BarToggleSwitchItemTODAY.CheckedChanged, BarToggleSwitchItemYESTERDAY.CheckedChanged
+ Dim btsi As BarToggleSwitchItem = TryCast(sender, BarToggleSwitchItem)
+ If btsi.Checked = True Then
+ BarToggleSwitchItemDateALL.Checked = False
+ Dim oWHENDATE As String
+ Select Case btsi.Name
+ Case "BarToggleSwitchItemCURRENTYEAR"
+ oWHENDATE = "YEAR(OBJ.ADDED_WHEN) = YEAR(GETDATE())"
+ Case "BarToggleSwitchItemLASTYEAR"
+ oWHENDATE = "YEAR(OBJ.ADDED_WHEN) = (YEAR(GETDATE()) -1)"
+ Case "BarToggleSwitchItemCURRENTMONTH"
+ Case "BarToggleSwitchItemLASTMONTH"
+ Dim currentDate As DateTime = DateTime.Now
+ If currentDate.Month = 1 Then
+ oWHENDATE = "MONTH(OBJ.ADDED_WHEN) = 12 " & vbNewLine & "AND YEAR(OBJ.ADDED_WHEN) = (YEAR(GETDATE()) -1)"
+ Else
+ oWHENDATE = "MONTH(OBJ.ADDED_WHEN) = MONTH(GETDATE())"
+ End If
+
+ Case "BarToggleSwitchItemTODAY"
+ oWHENDATE = "convert(DATE,OBJ.ADDED_WHEN) = convert(DATE,GETDATE())"
+ Case "BarToggleSwitchItemYESTERDAY"
+ oWHENDATE = "convert(DATE,OBJ.ADDED_WHEN) = convert(DATE,GETDATE()-1)"
+ End Select
+ SEARCH_FACT_DATE = oWHENDATE
+ Select Case btsi.Name
+ Case "BarToggleSwitchItemCURRENTYEAR"
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemLASTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ BarToggleSwitchItemYESTERDAY.Checked = False
+ Case "BarToggleSwitchItemLASTYEAR"
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemLASTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ BarToggleSwitchItemYESTERDAY.Checked = False
+ Case "BarToggleSwitchItemCURRENTMONTH"
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemLASTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ BarToggleSwitchItemYESTERDAY.Checked = False
+ Case "BarToggleSwitchItemLASTMONTH"
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ BarToggleSwitchItemYESTERDAY.Checked = False
+ Case "BarToggleSwitchItemTODAY"
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemYESTERDAY.Checked = False
+ Case "BarToggleSwitchItemYESTERDAY"
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ End Select
+ Start_FlowSearch()
+
+ End If
+ End Sub
+
+ Private Sub BarToggleSwitchItemDateALL_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles BarToggleSwitchItemDateALL.CheckedChanged
+ Dim btn As BarToggleSwitchItem = TryCast(sender, BarToggleSwitchItem)
+ If btn.Checked = True Then
+ BarToggleSwitchItemCURRENTYEAR.Checked = False
+ BarToggleSwitchItemLASTYEAR.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemLASTMONTH.Checked = False
+ BarToggleSwitchItemCURRENTMONTH.Checked = False
+ BarToggleSwitchItemTODAY.Checked = False
+ SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13"
+ End If
+ Start_FlowSearch()
+
+ End Sub
+ Sub Start_FlowSearch(Optional AllOver As Boolean = False)
+ If txtSearch.Text <> String.Empty Or AllOver = True Then
+ SearchContent(Trim(txtSearch.Text))
+ End If
+ End Sub
+
+ Private Sub btnFindAll_Click(sender As Object, e As EventArgs)
+
+ End Sub
+
+ Private Sub CheckButton1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckButton1.CheckedChanged
+ If BarToggleSwitchItemDateALL.Checked = True Then
+ Dim result As MsgBoxResult
+ If My.Application.User.Language = "de-DE" Then
+ result = MessageBox.Show("Wollen Sie wirklich eine Suche über alle Objekte starten?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+ Else
+ result = MessageBox.Show("Do You really want to start a search without limitation?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+ End If
+ If result = MsgBoxResult.No Then
+ Exit Sub
+ End If
+ End If
+ StartSearch_Full("")
+ CheckButton1.Checked = True
+ End Sub
+
+ Private Sub btnFindAll_Click_1(sender As Object, e As EventArgs)
+
+ End Sub
End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 67ee13c1..fc47ae1e 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -482,6 +482,9 @@
+
+
+