diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index 4232a45d..50f24ede 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -176,6 +176,12 @@ Form + + frmWorkflowRawData.vb + + + Form + frmWorkflowStep.vb @@ -355,6 +361,9 @@ frmWorkflowOverview.vb + + frmWorkflowRawData.vb + frmWorkflowStep.vb diff --git a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb index 15a1c6bd..26ff8515 100644 --- a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb @@ -22,16 +22,21 @@ Partial Class GridOverview 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.GridControl = New DevExpress.XtraGrid.GridControl() + Me.ContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ShowRawDataToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.gvOverview = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.GridControl, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenu.SuspendLayout() CType(Me.gvOverview, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GridControl ' + Me.GridControl.ContextMenuStrip = Me.ContextMenu Me.GridControl.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControl.Location = New System.Drawing.Point(0, 0) Me.GridControl.MainView = Me.gvOverview @@ -40,6 +45,18 @@ Partial Class GridOverview Me.GridControl.TabIndex = 1 Me.GridControl.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.gvOverview, Me.GridView1}) ' + 'ContextMenu + ' + Me.ContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowRawDataToolStripMenuItem}) + Me.ContextMenu.Name = "ContextMenu" + Me.ContextMenu.Size = New System.Drawing.Size(181, 48) + ' + 'ShowRawDataToolStripMenuItem + ' + Me.ShowRawDataToolStripMenuItem.Name = "ShowRawDataToolStripMenuItem" + Me.ShowRawDataToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ShowRawDataToolStripMenuItem.Text = "Show Raw Data" + ' 'gvOverview ' Me.gvOverview.GridControl = Me.GridControl @@ -62,6 +79,7 @@ Partial Class GridOverview Me.Name = "GridOverview" Me.Size = New System.Drawing.Size(626, 461) CType(Me.GridControl, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenu.ResumeLayout(False) CType(Me.gvOverview, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -71,4 +89,6 @@ Partial Class GridOverview Friend WithEvents GridControl As DevExpress.XtraGrid.GridControl Friend WithEvents gvOverview As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ContextMenu As ContextMenuStrip + Friend WithEvents ShowRawDataToolStripMenuItem As ToolStripMenuItem End Class diff --git a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx index 1af7de15..69b2acbc 100644 --- a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx +++ b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb index 9020cd81..70ac4ee5 100644 --- a/GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb @@ -24,4 +24,14 @@ gvOverview.Columns.Item("Process").VisibleIndex = 1 gvOverview.Columns.Item("State").Visible = False End Sub + + Private Sub ShowRawDataToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowRawDataToolStripMenuItem.Click + Dim oItem As WorkflowItem = gvOverview.GetFocusedRow() + + If oItem IsNot Nothing Then + Dim oForm As New frmWorkflowRawData(oItem.Raw) + oForm.ShowDialog() + End If + + End Sub End Class diff --git a/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb b/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb index 5b34c9b2..2e60147a 100644 --- a/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb @@ -11,6 +11,7 @@ Public Class WorkflowItem Public Property Title As String Public Property CreatedAt As DateTime Public Property Process As String + Public Property Raw As DataRow Public Property IconMap As Dictionary(Of String, String) Public Property StateImage As Image @@ -28,6 +29,8 @@ Public Class WorkflowItem Me.IconMap = IconMap End Sub + + Private Function GetIcon(StateName As String, IconMap As Dictionary(Of String, String)) As Image If IconMap.ContainsKey(StateName) Then Dim IconName = IconMap.Item(StateName) diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb index e23d0981..a15c9e02 100644 --- a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb @@ -21,7 +21,8 @@ Public Class frmWorkflowOverview oWorkflows.Add(New WorkflowItem(oIconMap) With { .Title = oRow.Item("REQUEST_TITLE"), .State = oRow.Item("STATETITLE"), - .Process = oRow.Item("PROCESS_NAME") + .Process = oRow.Item("PROCESS_NAME"), + .Raw = oRow }) Next Catch ex As Exception diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.Designer.vb new file mode 100644 index 00000000..47af0902 --- /dev/null +++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.Designer.vb @@ -0,0 +1,52 @@ + _ +Partial Class frmWorkflowRawData + Inherits DevExpress.XtraEditors.XtraForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.VGridControl1 = New DevExpress.XtraVerticalGrid.VGridControl() + CType(Me.VGridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'VGridControl1 + ' + Me.VGridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.VGridControl1.LayoutStyle = DevExpress.XtraVerticalGrid.LayoutViewStyle.SingleRecordView + Me.VGridControl1.Location = New System.Drawing.Point(0, 0) + Me.VGridControl1.Name = "VGridControl1" + Me.VGridControl1.Size = New System.Drawing.Size(800, 450) + Me.VGridControl1.TabIndex = 1 + ' + 'frmWorkflowRawData + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.VGridControl1) + Me.Name = "frmWorkflowRawData" + Me.Text = "Rohdaten" + CType(Me.VGridControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents VGridControl1 As DevExpress.XtraVerticalGrid.VGridControl +End Class diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.resx b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.vb new file mode 100644 index 00000000..a37f25c6 --- /dev/null +++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowRawData.vb @@ -0,0 +1,19 @@ +Public Class frmWorkflowRawData + Private _Data As DataRow + + Public Sub New(Data As DataRow) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + _Data = Data + End Sub + + Private Sub frmWorkflowRawData_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oDataTable As New DataTable() + oDataTable.Merge(_Data.Table) + oDataTable.Clear() + oDataTable.LoadDataRow(_Data.ItemArray, True) + VGridControl1.DataSource = oDataTable + End Sub +End Class \ No newline at end of file diff --git a/GUIs.ClientSuite/My Project/licenses.licx b/GUIs.ClientSuite/My Project/licenses.licx index 89071046..8b6db701 100644 --- a/GUIs.ClientSuite/My Project/licenses.licx +++ b/GUIs.ClientSuite/My Project/licenses.licx @@ -1,16 +1,17 @@ +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.Utils.MVVM.MVVMContext, DevExpress.Utils.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a