diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index 355eee6f..69cdd064 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -205,6 +205,7 @@ + DockManagerTest.vb diff --git a/GUIs.ClientSuite/Workflow/WorkflowDetail.vb b/GUIs.ClientSuite/Workflow/WorkflowDetail.vb new file mode 100644 index 00000000..089ffd99 --- /dev/null +++ b/GUIs.ClientSuite/Workflow/WorkflowDetail.vb @@ -0,0 +1,3 @@ +Public Class WorkflowDetail + Public Property Title +End Class diff --git a/GUIs.ClientSuite/Workflow/WorkflowItem.vb b/GUIs.ClientSuite/Workflow/WorkflowItem.vb index 2d34b8f3..cdab45cf 100644 --- a/GUIs.ClientSuite/Workflow/WorkflowItem.vb +++ b/GUIs.ClientSuite/Workflow/WorkflowItem.vb @@ -14,9 +14,8 @@ Public Class WorkflowItem End Enum Public Property StateImage As Image - Public Property Title As String - + Public Property CreatedAt As DateTime Public Property WorkflowName As String Private _state As ItemState diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb b/GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb index af720a62..ab97be22 100644 --- a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb +++ b/GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb @@ -22,7 +22,16 @@ Partial Class frmWorkflowOverview 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWorkflowOverview)) + Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition2 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableSpan1 As DevExpress.XtraEditors.TableLayout.TableSpan = New DevExpress.XtraEditors.TableLayout.TableSpan() + Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim WindowsUIButtonImageOptions3 As DevExpress.XtraBars.Docking2010.WindowsUIButtonImageOptions = New DevExpress.XtraBars.Docking2010.WindowsUIButtonImageOptions() Dim WindowsUIButtonImageOptions4 As DevExpress.XtraBars.Docking2010.WindowsUIButtonImageOptions = New DevExpress.XtraBars.Docking2010.WindowsUIButtonImageOptions() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() @@ -42,6 +51,7 @@ Partial Class frmWorkflowOverview Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridWorkflowOverview = New DevExpress.XtraGrid.GridControl() Me.gvOverview = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridWorkflowDetails = New DevExpress.XtraGrid.GridControl() Me.tvDetails = New DevExpress.XtraGrid.Views.Tile.TileView() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() @@ -57,6 +67,7 @@ Partial Class frmWorkflowOverview Me.SplitContainerControl1.SuspendLayout() CType(Me.GridWorkflowOverview, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gvOverview, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridWorkflowDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.tvDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -76,7 +87,7 @@ Partial Class frmWorkflowOverview Me.RibbonControl1.MaxItemId = 7 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) - Me.RibbonControl1.Size = New System.Drawing.Size(1134, 143) + Me.RibbonControl1.Size = New System.Drawing.Size(1134, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarCheckItem1 @@ -128,10 +139,10 @@ Partial Class frmWorkflowOverview ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 692) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 702) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1134, 31) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1134, 21) ' 'RibbonPage2 ' @@ -144,11 +155,11 @@ Partial Class frmWorkflowOverview Me.NavBarControl1.Dock = System.Windows.Forms.DockStyle.Left Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroup1}) Me.NavBarControl1.Items.AddRange(New DevExpress.XtraNavBar.NavBarItem() {Me.NavBarItem1, Me.NavBarItem2, Me.NavBarItem3}) - Me.NavBarControl1.Location = New System.Drawing.Point(0, 143) + Me.NavBarControl1.Location = New System.Drawing.Point(0, 146) Me.NavBarControl1.Name = "NavBarControl1" Me.NavBarControl1.OptionsNavPane.ExpandedWidth = 200 Me.NavBarControl1.OptionsNavPane.GroupImageShowMode = DevExpress.XtraNavBar.GroupImageShowMode.InCollapsedState - Me.NavBarControl1.Size = New System.Drawing.Size(200, 549) + Me.NavBarControl1.Size = New System.Drawing.Size(200, 556) Me.NavBarControl1.TabIndex = 2 Me.NavBarControl1.Text = "NavBarControl1" Me.NavBarControl1.View = New DevExpress.XtraNavBar.ViewInfo.SkinNavigationPaneViewInfoRegistrator() @@ -182,14 +193,14 @@ Partial Class frmWorkflowOverview 'SplitContainerControl1 ' Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(200, 143) + Me.SplitContainerControl1.Location = New System.Drawing.Point(200, 146) Me.SplitContainerControl1.Name = "SplitContainerControl1" Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridWorkflowOverview) Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.GridWorkflowDetails) Me.SplitContainerControl1.Panel2.Controls.Add(Me.LayoutControl1) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(934, 549) + Me.SplitContainerControl1.Size = New System.Drawing.Size(934, 556) Me.SplitContainerControl1.SplitterPosition = 471 Me.SplitContainerControl1.TabIndex = 5 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -201,14 +212,23 @@ Partial Class frmWorkflowOverview Me.GridWorkflowOverview.MainView = Me.gvOverview Me.GridWorkflowOverview.MenuManager = Me.RibbonControl1 Me.GridWorkflowOverview.Name = "GridWorkflowOverview" - Me.GridWorkflowOverview.Size = New System.Drawing.Size(471, 549) + Me.GridWorkflowOverview.Size = New System.Drawing.Size(471, 556) Me.GridWorkflowOverview.TabIndex = 0 - Me.GridWorkflowOverview.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gvOverview}) + Me.GridWorkflowOverview.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gvOverview, Me.GridView1}) ' 'gvOverview ' Me.gvOverview.GridControl = Me.GridWorkflowOverview Me.gvOverview.Name = "gvOverview" + Me.gvOverview.OptionsFind.AlwaysVisible = True + Me.gvOverview.OptionsView.GroupDrawMode = DevExpress.XtraGrid.Views.Grid.GroupDrawMode.Office + Me.gvOverview.OptionsView.ShowGroupedColumns = True + Me.gvOverview.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[True] + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridWorkflowOverview + Me.GridView1.Name = "GridView1" ' 'GridWorkflowDetails ' @@ -217,7 +237,7 @@ Partial Class frmWorkflowOverview Me.GridWorkflowDetails.MainView = Me.tvDetails Me.GridWorkflowDetails.MenuManager = Me.RibbonControl1 Me.GridWorkflowDetails.Name = "GridWorkflowDetails" - Me.GridWorkflowDetails.Size = New System.Drawing.Size(458, 383) + Me.GridWorkflowDetails.Size = New System.Drawing.Size(451, 390) Me.GridWorkflowDetails.TabIndex = 1 Me.GridWorkflowDetails.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.tvDetails}) ' @@ -225,6 +245,25 @@ Partial Class frmWorkflowOverview ' Me.tvDetails.GridControl = Me.GridWorkflowDetails Me.tvDetails.Name = "tvDetails" + Me.tvDetails.OptionsTiles.ItemSize = New System.Drawing.Size(248, 123) + Me.tvDetails.OptionsTiles.LayoutMode = DevExpress.XtraGrid.Views.Tile.TileViewLayoutMode.List + Me.tvDetails.TileColumns.Add(TableColumnDefinition1) + Me.tvDetails.TileColumns.Add(TableColumnDefinition2) + Me.tvDetails.TileColumns.Add(TableColumnDefinition3) + TableRowDefinition1.Length.Value = 15.0R + TableRowDefinition2.Length.Value = 13.0R + TableRowDefinition3.Length.Value = 13.0R + Me.tvDetails.TileRows.Add(TableRowDefinition1) + Me.tvDetails.TileRows.Add(TableRowDefinition2) + Me.tvDetails.TileRows.Add(TableRowDefinition3) + TableSpan1.ColumnSpan = 2 + TableSpan1.RowSpan = 2 + Me.tvDetails.TileSpans.Add(TableSpan1) + TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement1.Text = "element1" + TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.tvDetails.TileTemplate.Add(TileViewItemElement1) ' 'LayoutControl1 ' @@ -234,7 +273,7 @@ Partial Class frmWorkflowOverview Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1186, 56, 650, 400) Me.LayoutControl1.Root = Me.LayoutControlGroup1 - Me.LayoutControl1.Size = New System.Drawing.Size(458, 166) + Me.LayoutControl1.Size = New System.Drawing.Size(451, 166) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -246,8 +285,8 @@ Partial Class frmWorkflowOverview Me.WindowsUIButtonPanel1.ContentAlignment = System.Drawing.ContentAlignment.MiddleLeft Me.WindowsUIButtonPanel1.Location = New System.Drawing.Point(12, 96) Me.WindowsUIButtonPanel1.Name = "WindowsUIButtonPanel1" - Me.WindowsUIButtonPanel1.Size = New System.Drawing.Size(434, 55) - Me.WindowsUIButtonPanel1.TabIndex = 5 + Me.WindowsUIButtonPanel1.Size = New System.Drawing.Size(427, 55) + Me.WindowsUIButtonPanel1.TabIndex = 0 Me.WindowsUIButtonPanel1.Text = "WindowsUIButtonPanel1" ' 'LayoutControlGroup1 @@ -256,7 +295,7 @@ Partial Class frmWorkflowOverview Me.LayoutControlGroup1.GroupBordersVisible = False Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.SimpleLabelItem1, Me.LayoutControlItem2, Me.SimpleLabelItem2, Me.SimpleLabelItem3}) Me.LayoutControlGroup1.Name = "Root" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(458, 166) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(451, 166) Me.LayoutControlGroup1.TextVisible = False ' 'SimpleLabelItem1 @@ -268,7 +307,7 @@ Partial Class frmWorkflowOverview Me.SimpleLabelItem1.AppearanceItemCaption.Options.UseForeColor = True Me.SimpleLabelItem1.Location = New System.Drawing.Point(0, 0) Me.SimpleLabelItem1.Name = "SimpleLabelItem1" - Me.SimpleLabelItem1.Size = New System.Drawing.Size(438, 34) + Me.SimpleLabelItem1.Size = New System.Drawing.Size(431, 34) Me.SimpleLabelItem1.Text = "Vertragsnr. 4711" Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(151, 30) ' @@ -277,7 +316,7 @@ Partial Class frmWorkflowOverview Me.LayoutControlItem2.Control = Me.WindowsUIButtonPanel1 Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 84) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(438, 62) + Me.LayoutControlItem2.Size = New System.Drawing.Size(431, 62) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -288,7 +327,7 @@ Partial Class frmWorkflowOverview Me.SimpleLabelItem2.AppearanceItemCaption.Options.UseFont = True Me.SimpleLabelItem2.Location = New System.Drawing.Point(0, 59) Me.SimpleLabelItem2.Name = "SimpleLabelItem2" - Me.SimpleLabelItem2.Size = New System.Drawing.Size(438, 25) + Me.SimpleLabelItem2.Size = New System.Drawing.Size(431, 25) Me.SimpleLabelItem2.Text = "Sunshine GmbH" Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(151, 21) ' @@ -299,7 +338,7 @@ Partial Class frmWorkflowOverview Me.SimpleLabelItem3.AppearanceItemCaption.Options.UseFont = True Me.SimpleLabelItem3.Location = New System.Drawing.Point(0, 34) Me.SimpleLabelItem3.Name = "SimpleLabelItem3" - Me.SimpleLabelItem3.Size = New System.Drawing.Size(438, 25) + Me.SimpleLabelItem3.Size = New System.Drawing.Size(431, 25) Me.SimpleLabelItem3.Text = "Objekt: Haus Nr. 9" Me.SimpleLabelItem3.TextSize = New System.Drawing.Size(151, 21) ' @@ -322,6 +361,7 @@ Partial Class frmWorkflowOverview Me.SplitContainerControl1.ResumeLayout(False) CType(Me.GridWorkflowOverview, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gvOverview, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridWorkflowDetails, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.tvDetails, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -348,8 +388,6 @@ Partial Class frmWorkflowOverview Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents GridWorkflowOverview As DevExpress.XtraGrid.GridControl - Friend WithEvents gvOverview As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridWorkflowDetails As DevExpress.XtraGrid.GridControl Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup @@ -362,4 +400,7 @@ Partial Class frmWorkflowOverview Friend WithEvents SimpleLabelItem2 As DevExpress.XtraLayout.SimpleLabelItem Friend WithEvents SimpleLabelItem3 As DevExpress.XtraLayout.SimpleLabelItem Friend WithEvents tvDetails As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents GridWorkflowOverview As DevExpress.XtraGrid.GridControl + Friend WithEvents gvOverview As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb b/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb index 55823875..5eca8adf 100644 --- a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb +++ b/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb @@ -1,18 +1,49 @@ Imports System.ComponentModel +Imports DevExpress.Utils Public Class frmWorkflowOverview Private WorkflowItems As BindingList(Of WorkflowItem) + Private WorkflowDetails As BindingList(Of WorkflowDetail) Private Sub frmWorkflowOverview_Load(sender As Object, e As EventArgs) Handles MyBase.Load WorkflowItems = New BindingList(Of WorkflowItem) From { - New WorkflowItem() With {.Title = "Eingangsrechnung XYZ", .State = WorkflowItem.ItemState.Danger, .WorkflowName = "Rechnungseingang"}, - New WorkflowItem() With {.Title = "Eingangsrechnung ABC", .State = WorkflowItem.ItemState.Normal, .WorkflowName = "Rechnungseingang"}, - New WorkflowItem() With {.Title = "Mietvertrag XYZ läuft aus", .State = WorkflowItem.ItemState.Warning, .WorkflowName = "Vertragsprüfung"} + New WorkflowItem() With { + .Title = "Eingangsrechnung XYZ", + .State = WorkflowItem.ItemState.Danger, + .WorkflowName = "Rechnungseingang", + .CreatedAt = DateTime.Now.AddDays(-3) + }, + New WorkflowItem() With { + .Title = "Eingangsrechnung ABC", + .State = WorkflowItem.ItemState.Normal, + .WorkflowName = "Rechnungseingang", + .CreatedAt = DateTime.Now + }, + New WorkflowItem() With { + .Title = "Mietvertrag XYZ läuft aus", + .State = WorkflowItem.ItemState.Warning, + .WorkflowName = "Vertragsprüfung", + .CreatedAt = DateTime.Now.AddDays(-1) + } + } + + WorkflowDetails = New BindingList(Of WorkflowDetail) From { + New WorkflowDetail() With { + .Title = "foooo!" + } } GridWorkflowOverview.DataSource = WorkflowItems + GridWorkflowDetails.DataSource = WorkflowDetails + gvOverview.GroupFormat = "[#image]{1} {2}" + With gvOverview.Columns.Item("CreatedAt") + .OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.DateAlt + .GroupInterval = DevExpress.XtraGrid.ColumnGroupInterval.DateRange + .SortOrder = DevExpress.Data.ColumnSortOrder.Descending + .Group() + End With End Sub End Class \ No newline at end of file