diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index a42d5f4f..298c1ec8 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index 0330697a..21be17c5 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,9 +1,10 @@ -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/frmDialog.vb b/GUIs.Common/frmDialog.vb index 10a8a424..515821bf 100644 --- a/GUIs.Common/frmDialog.vb +++ b/GUIs.Common/frmDialog.vb @@ -41,6 +41,7 @@ Public Class frmDialog Case DialogType.Info pnlContent.BackColor = Color.LightBlue SvgImageBox1.SvgImage = SvgImageCollection1.Item("info") + btnNegative.Visible = False SetOkCancelButtons() Case DialogType.Error @@ -57,6 +58,7 @@ Public Class frmDialog Case DialogType.Question pnlContent.BackColor = Color.LightYellow SvgImageBox1.SvgImage = SvgImageCollection1.Item("question") + btnNegative.Visible = True SetYesNoButtons() diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb index cfe122f5..28ac7fb0 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.Designer.vb @@ -24,6 +24,13 @@ Partial Class frmWorkflow_Adhoc_start Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWorkflow_Adhoc_start)) + Dim TableColumnDefinition5 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableColumnDefinition6 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() + Dim TableRowDefinition5 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TableRowDefinition6 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() + Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() 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 TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() @@ -31,13 +38,6 @@ Partial Class frmWorkflow_Adhoc_start Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TableColumnDefinition3 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableColumnDefinition4 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition() - Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TableRowDefinition4 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition() - Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Me.ColTitle = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.TileViewColumn2 = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.TileViewColumn4 = New DevExpress.XtraGrid.Columns.TileViewColumn() @@ -66,6 +66,9 @@ Partial Class frmWorkflow_Adhoc_start Me.colCount = New DevExpress.XtraGrid.Columns.TileViewColumn() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + Me.GroupControl4 = New DevExpress.XtraEditors.GroupControl() + Me.txtWORK_INSTRUCTION = New System.Windows.Forms.TextBox() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -81,6 +84,8 @@ Partial Class frmWorkflow_Adhoc_start CType(Me.TileViewUser, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GroupControl4, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupControl4.SuspendLayout() Me.SuspendLayout() ' 'ColTitle @@ -136,14 +141,14 @@ Partial Class frmWorkflow_Adhoc_start Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(35, 39, 35, 39) Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.OptionsMenuMinWidth = 385 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(1061, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1061, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -188,11 +193,12 @@ Partial Class frmWorkflow_Adhoc_start ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 706) + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 723) Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1061, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1061, 22) ' 'RibbonPage2 ' @@ -243,7 +249,7 @@ Partial Class frmWorkflow_Adhoc_start Me.GridControlWorkflows.MainView = Me.TileViewWorkflows Me.GridControlWorkflows.MenuManager = Me.RibbonControl1 Me.GridControlWorkflows.Name = "GridControlWorkflows" - Me.GridControlWorkflows.Size = New System.Drawing.Size(1027, 111) + Me.GridControlWorkflows.Size = New System.Drawing.Size(1027, 146) Me.GridControlWorkflows.TabIndex = 3 Me.GridControlWorkflows.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileViewWorkflows, Me.GridView2}) ' @@ -253,43 +259,43 @@ Partial Class frmWorkflow_Adhoc_start Me.TileViewWorkflows.GridControl = Me.GridControlWorkflows Me.TileViewWorkflows.Name = "TileViewWorkflows" Me.TileViewWorkflows.OptionsTiles.AllowItemHover = True - Me.TileViewWorkflows.OptionsTiles.ItemSize = New System.Drawing.Size(190, 80) + Me.TileViewWorkflows.OptionsTiles.ItemSize = New System.Drawing.Size(276, 80) Me.TileViewWorkflows.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical Me.TileViewWorkflows.OptionsTiles.RowCount = 2 Me.TileViewWorkflows.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center - TableColumnDefinition1.Length.Value = 35.0R - TableColumnDefinition1.PaddingRight = 5 - TableColumnDefinition2.Length.Value = 129.0R - Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition1) - Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition2) - TableRowDefinition1.Length.Value = 21.0R - TableRowDefinition2.Length.Value = 43.0R - Me.TileViewWorkflows.TileRows.Add(TableRowDefinition1) - Me.TileViewWorkflows.TileRows.Add(TableRowDefinition2) - TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - TileViewItemElement1.Appearance.Normal.Options.UseFont = True - TileViewItemElement1.Column = Me.ColTitle - TileViewItemElement1.ColumnIndex = 1 - TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement1.Text = "colName" - TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement2.Column = Me.TileViewColumn2 - TileViewItemElement2.ColumnIndex = 1 - TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement2.RowIndex = 1 - TileViewItemElement2.Text = "colDescription" - TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement3.Column = Me.TileViewColumn4 - TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement3.RowIndex = 1 - TileViewItemElement3.Text = "colImage" - TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement1) - Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement2) - Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement3) + TableColumnDefinition5.Length.Value = 35.0R + TableColumnDefinition5.PaddingRight = 5 + TableColumnDefinition6.Length.Value = 129.0R + Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition5) + Me.TileViewWorkflows.TileColumns.Add(TableColumnDefinition6) + TableRowDefinition5.Length.Value = 21.0R + TableRowDefinition6.Length.Value = 43.0R + Me.TileViewWorkflows.TileRows.Add(TableRowDefinition5) + Me.TileViewWorkflows.TileRows.Add(TableRowDefinition6) + TileViewItemElement7.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement7.Appearance.Normal.Options.UseFont = True + TileViewItemElement7.Column = Me.ColTitle + TileViewItemElement7.ColumnIndex = 1 + TileViewItemElement7.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement7.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement7.Text = "ColTitle" + TileViewItemElement7.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement8.Column = Me.TileViewColumn2 + TileViewItemElement8.ColumnIndex = 1 + TileViewItemElement8.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement8.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement8.RowIndex = 1 + TileViewItemElement8.Text = "TileViewColumn2" + TileViewItemElement8.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement9.Column = Me.TileViewColumn4 + TileViewItemElement9.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement9.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement9.RowIndex = 1 + TileViewItemElement9.Text = "TileViewColumn4" + TileViewItemElement9.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement7) + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement8) + Me.TileViewWorkflows.TileTemplate.Add(TileViewItemElement9) ' 'TileViewColumn3 ' @@ -331,43 +337,43 @@ Partial Class frmWorkflow_Adhoc_start Me.TileViewUser.GridControl = Me.GridSelectedUsers Me.TileViewUser.Name = "TileViewUser" Me.TileViewUser.OptionsTiles.AllowItemHover = True - Me.TileViewUser.OptionsTiles.ItemSize = New System.Drawing.Size(190, 80) + Me.TileViewUser.OptionsTiles.ItemSize = New System.Drawing.Size(240, 80) Me.TileViewUser.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical Me.TileViewUser.OptionsTiles.RowCount = 2 Me.TileViewUser.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Center - TableColumnDefinition3.Length.Value = 35.0R - TableColumnDefinition3.PaddingRight = 5 - TableColumnDefinition4.Length.Value = 129.0R - Me.TileViewUser.TileColumns.Add(TableColumnDefinition3) - Me.TileViewUser.TileColumns.Add(TableColumnDefinition4) - TableRowDefinition3.Length.Value = 21.0R - TableRowDefinition4.Length.Value = 43.0R - Me.TileViewUser.TileRows.Add(TableRowDefinition3) - Me.TileViewUser.TileRows.Add(TableRowDefinition4) - TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - TileViewItemElement4.Appearance.Normal.Options.UseFont = True - TileViewItemElement4.Column = Me.colEmail - TileViewItemElement4.ColumnIndex = 1 - TileViewItemElement4.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement4.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement4.Text = "colName" - TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement5.Column = Me.colFullName - TileViewItemElement5.ColumnIndex = 1 - TileViewItemElement5.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement5.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement5.RowIndex = 1 - TileViewItemElement5.Text = "colDescription" - TileViewItemElement5.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement6.Column = Me.colImage - TileViewItemElement6.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - TileViewItemElement6.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze - TileViewItemElement6.RowIndex = 1 - TileViewItemElement6.Text = "colImage" - TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter - Me.TileViewUser.TileTemplate.Add(TileViewItemElement4) - Me.TileViewUser.TileTemplate.Add(TileViewItemElement5) - Me.TileViewUser.TileTemplate.Add(TileViewItemElement6) + TableColumnDefinition1.Length.Value = 35.0R + TableColumnDefinition1.PaddingRight = 5 + TableColumnDefinition2.Length.Value = 129.0R + Me.TileViewUser.TileColumns.Add(TableColumnDefinition1) + Me.TileViewUser.TileColumns.Add(TableColumnDefinition2) + TableRowDefinition1.Length.Value = 21.0R + TableRowDefinition2.Length.Value = 43.0R + Me.TileViewUser.TileRows.Add(TableRowDefinition1) + Me.TileViewUser.TileRows.Add(TableRowDefinition2) + TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement1.Appearance.Normal.Options.UseFont = True + TileViewItemElement1.Column = Me.colEmail + TileViewItemElement1.ColumnIndex = 1 + TileViewItemElement1.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement1.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement1.Text = "colEmail" + TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement2.Column = Me.colFullName + TileViewItemElement2.ColumnIndex = 1 + TileViewItemElement2.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement2.RowIndex = 1 + TileViewItemElement2.Text = "colFullName" + TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement3.Column = Me.colImage + TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze + TileViewItemElement3.RowIndex = 1 + TileViewItemElement3.Text = "colImage" + TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter + Me.TileViewUser.TileTemplate.Add(TileViewItemElement1) + Me.TileViewUser.TileTemplate.Add(TileViewItemElement2) + Me.TileViewUser.TileTemplate.Add(TileViewItemElement3) ' 'colCount ' @@ -387,12 +393,39 @@ Partial Class frmWorkflow_Adhoc_start Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg") Me.SvgImageCollection1.Add("Workflow", "image://svgimages/diagramicons/relayoutparts.svg") ' + 'GroupControl4 + ' + Me.GroupControl4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupControl4.Appearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.GroupControl4.Appearance.Options.UseBorderColor = True + Me.GroupControl4.Controls.Add(Me.txtWORK_INSTRUCTION) + Me.GroupControl4.Location = New System.Drawing.Point(12, 648) + Me.GroupControl4.Name = "GroupControl4" + Me.GroupControl4.Size = New System.Drawing.Size(1037, 70) + Me.GroupControl4.TabIndex = 18 + Me.GroupControl4.Text = "Anweisungstext" + ' + 'txtWORK_INSTRUCTION + ' + Me.txtWORK_INSTRUCTION.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtWORK_INSTRUCTION.Location = New System.Drawing.Point(25, 31) + Me.txtWORK_INSTRUCTION.Name = "txtWORK_INSTRUCTION" + Me.txtWORK_INSTRUCTION.Size = New System.Drawing.Size(1007, 25) + Me.txtWORK_INSTRUCTION.TabIndex = 0 + ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Id = 4 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' 'frmWorkflow_Adhoc_start ' Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1061, 730) + Me.ClientSize = New System.Drawing.Size(1061, 745) + Me.Controls.Add(Me.GroupControl4) Me.Controls.Add(Me.GroupControl3) Me.Controls.Add(Me.GroupControl2) Me.Controls.Add(Me.GroupControl1) @@ -419,6 +452,9 @@ Partial Class frmWorkflow_Adhoc_start CType(Me.TileViewUser, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GroupControl4, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupControl4.ResumeLayout(False) + Me.GroupControl4.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -452,4 +488,7 @@ Partial Class frmWorkflow_Adhoc_start Friend WithEvents TileViewColumn3 As DevExpress.XtraGrid.Columns.TileViewColumn Friend WithEvents TileViewColumn4 As DevExpress.XtraGrid.Columns.TileViewColumn Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GroupControl4 As DevExpress.XtraEditors.GroupControl + Friend WithEvents txtWORK_INSTRUCTION As Windows.Forms.TextBox + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.vb b/GUIs.Common/frmWorkflow_Adhoc_start.vb index 7c56efac..0896434e 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.vb @@ -8,6 +8,8 @@ Imports System.Drawing Imports DigitalData.Modules.EDMI.API.EDMIServiceReference Imports DevExpress.Utils.Svg Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo +Imports System.Windows.Forms Public Class frmWorkflow_Adhoc_start Private ReadOnly Property LogConfig As LogConfig @@ -19,6 +21,9 @@ Public Class frmWorkflow_Adhoc_start Private IsLoading As Boolean = True Private WFUserList As List(Of User2Workflow) Private WorkflowList As List(Of Workflows) + Private GridCursorLocation As Point + Private oSelectedProfilID As Integer + Private Property FormHelper As FormHelper Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pAdhocWorkflow As AdHocWorkflow) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -176,14 +181,7 @@ Public Class frmWorkflow_Adhoc_start GridSelectedUsers.DataSource = WFUserList TileViewUser.FocusedRowHandle = GridControl.InvalidRowHandle - 'Else - ' Dim omsg = "Bitte wählen Sie zuerst einen Workflow" - ' If Environment.User.Language <> "de-DE" Then - ' omsg = "Please choose a workflow first" - ' End If - ' Dim oMsgBox As New frmDialog(omsg, "Error", False) - ' oMsgBox.ShowDialog() - 'End If + End Sub @@ -198,4 +196,91 @@ Public Class frmWorkflow_Adhoc_start End If End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Try + Dim oErrorOcurred As Boolean = False + + If oSelectedProfilID = 0 Then + BarStaticItem1.Caption = "Please choose a workflow via clickin on it..." + BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Orange + Exit Sub + End If + Dim oInsert = $"DECLARE @OUT_ID + BIGINT EXEC PRPM_AH_WF_ADD_OBJ_REL {AdHocWorkflow.OBJECT_ID}, {oSelectedProfilID}, '{txtWORK_INSTRUCTION.Text}','{Environment.User.UserName}',@OUT_ID OUTPUT + SELECT @OUT_ID" + Dim oAdhocWF_ID + If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then + Dim oResponse = Client.GetScalarValueFromECM(oInsert) + If oResponse.OK Then + oAdhocWF_ID = oResponse.Scalar + Else + MsgBox("Unexpected error in WF-Party-Creator. Check your log and inform Admin-Team", MsgBoxStyle.Critical) + oErrorOcurred = True + Exit Sub + End If + Else + oAdhocWF_ID = Environment.Database.GetScalarValue(oInsert) + End If + + If Not IsNothing(oAdhocWF_ID) Then + For index = 0 To TileViewUser.RowCount + Dim oRow As User2Workflow = TileViewUser.GetRow(index) + + If oRow Is Nothing Then + Continue For + End If + + oInsert = $"DECLARE @OUT_ID + BIGINT EXEC PRPM_AH_WF_PARTY {oAdhocWF_ID}, {oRow.UserID}, '{Environment.User.UserName}',@OUT_ID OUTPUT + SELECT @OUT_ID" + Dim oID + If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then + Dim oResponse = Client.GetScalarValueFromECM(oInsert) + If oResponse.OK Then + oID = oResponse.Scalar + Else + MsgBox("Unexpected error in WF-Party-Creator. Check your log and inform Admin-Team", MsgBoxStyle.Critical) + oErrorOcurred = True + Exit For + End If + Else + oID = Environment.Database.GetScalarValue(oInsert) + End If + Next + End If + If oErrorOcurred = False Then + Me.Close() + End If + Catch ex As Exception + Logger.Error(ex) + BarStaticItem1.Caption = ex.Message + BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Red + FormHelper.ShowErrorMessage(ex, "Error in AHWF Save and Close") + End Try + + + End Sub + + + Private Sub TileViewWorkflows_MouseDown(sender As Object, e As MouseEventArgs) Handles TileViewWorkflows.MouseDown + GridCursorLocation = e.Location + End Sub + + Private Sub TileViewWorkflows_ItemClick(sender As Object, e As Views.Tile.TileViewItemClickEventArgs) Handles TileViewWorkflows.ItemClick + Try + Dim oWorkflowID As Workflows = TileViewWorkflows.GetRow(TileViewWorkflows.FocusedRowHandle) + Try + If CInt(oWorkflowID.ID) > 0 Then + oSelectedProfilID = oWorkflowID.ID + End If + Catch ex As Exception + oSelectedProfilID = 0 + End Try + Catch ex As Exception + oSelectedProfilID = 0 + End Try + + + End Sub End Class \ No newline at end of file