diff --git a/GUIs.ClientSuite/Common/ClassCommonViews.vb b/GUIs.ClientSuite/Common/ClassCommonViews.vb
index d7d583c2..9cb0a812 100644
--- a/GUIs.ClientSuite/Common/ClassCommonViews.vb
+++ b/GUIs.ClientSuite/Common/ClassCommonViews.vb
@@ -31,11 +31,10 @@ Public Class ClassCommonViews
End Try
End Function
- Public Async Function VWIDB_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable)
+ Public Async Function VWIDB_CONTROL_DATA(ProcessRequestID As Int64) As Task(Of DataTable)
Try
My.Channel.CreateDatabaseRequest("Load Control Data", True)
-
- Dim oSQL As String = $"SELECT * FROM VWIDB_WF_REQU_CTRL_DATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}"
+ Dim oSQL As String = $"SELECT * FROM VWIDB_CONTROL_DATA WHERE PROCESS_REQUESTID = {ProcessRequestID}"
Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
Dim oTable = oResult.Table
diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb
index 8a3d6768..329a35d6 100644
--- a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb
+++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb
@@ -28,9 +28,15 @@ Partial Class frmWorkflowStep
Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
Me.LayoutControlGroupMain = New DevExpress.XtraLayout.LayoutControlGroup()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.cmbJobState = New DevExpress.XtraEditors.ComboBoxEdit()
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.GroupBox1.SuspendLayout()
+ CType(Me.cmbJobState.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'RibbonControl
@@ -64,12 +70,12 @@ Partial Class frmWorkflowStep
'
'LayoutControl1
'
- Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.LayoutControl1.BackColor = System.Drawing.Color.Gray
Me.LayoutControl1.Location = New System.Drawing.Point(0, 146)
Me.LayoutControl1.Name = "LayoutControl1"
Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1039, 241, 650, 400)
Me.LayoutControl1.Root = Me.LayoutControlGroupMain
- Me.LayoutControl1.Size = New System.Drawing.Size(991, 348)
+ Me.LayoutControl1.Size = New System.Drawing.Size(991, 251)
Me.LayoutControl1.TabIndex = 2
Me.LayoutControl1.Text = "LayoutControl1"
'
@@ -78,14 +84,60 @@ Partial Class frmWorkflowStep
Me.LayoutControlGroupMain.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
Me.LayoutControlGroupMain.GroupBordersVisible = False
Me.LayoutControlGroupMain.Name = "Root"
- Me.LayoutControlGroupMain.Size = New System.Drawing.Size(991, 348)
+ Me.LayoutControlGroupMain.Size = New System.Drawing.Size(991, 251)
Me.LayoutControlGroupMain.TextVisible = False
'
+ 'GroupBox1
+ '
+ Me.GroupBox1.Controls.Add(Me.Button1)
+ Me.GroupBox1.Controls.Add(Me.Label1)
+ Me.GroupBox1.Controls.Add(Me.cmbJobState)
+ Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Bottom
+ Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox1.Location = New System.Drawing.Point(0, 403)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(991, 91)
+ Me.GroupBox1.TabIndex = 5
+ Me.GroupBox1.TabStop = False
+ Me.GroupBox1.Text = "Job - Aktualisierung"
+ '
+ 'Button1
+ '
+ Me.Button1.Dock = System.Windows.Forms.DockStyle.Right
+ Me.Button1.Image = Global.DigitalData.GUIs.ClientSuite.My.Resources.Resources.StatusAnnotations_Complete_and_ok_32xLG
+ Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.Button1.Location = New System.Drawing.Point(830, 19)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(158, 69)
+ Me.Button1.TabIndex = 2
+ Me.Button1.Text = "Job abschliessen"
+ Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.Button1.UseVisualStyleBackColor = True
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(12, 28)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(43, 16)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = "State:"
+ '
+ 'cmbJobState
+ '
+ Me.cmbJobState.Location = New System.Drawing.Point(15, 47)
+ Me.cmbJobState.MenuManager = Me.RibbonControl
+ Me.cmbJobState.Name = "cmbJobState"
+ Me.cmbJobState.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+ Me.cmbJobState.Size = New System.Drawing.Size(210, 20)
+ Me.cmbJobState.TabIndex = 0
+ '
'frmWorkflowStep
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(991, 515)
+ Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.LayoutControl1)
Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl)
@@ -96,6 +148,9 @@ Partial Class frmWorkflowStep
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.GroupBox1.ResumeLayout(False)
+ Me.GroupBox1.PerformLayout()
+ CType(Me.cmbJobState.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -107,4 +162,8 @@ Partial Class frmWorkflowStep
Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
Friend WithEvents LayoutControlGroupMain As DevExpress.XtraLayout.LayoutControlGroup
+ Friend WithEvents GroupBox1 As GroupBox
+ Friend WithEvents Label1 As Label
+ Friend WithEvents cmbJobState As DevExpress.XtraEditors.ComboBoxEdit
+ Friend WithEvents Button1 As Button
End Class
diff --git a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb
index d76fd577..afe6c3cc 100644
--- a/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb
+++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb
@@ -6,24 +6,24 @@ Public Class frmWorkflowStep
Private _ControlData As ControlData
Private _FormId As Int64
- Private _RequestId As Int64
+ Private _ProcessRequestId As Int64
Private _ProcessName As String
Private _RequestName As String
Private _HeaderGroup As LayoutControlGroup
Private _BodyGroup As LayoutControlGroup
- Public Sub New(RequestId As Int64)
+ Public Sub New(ProcessRequestId As Int64)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
- _RequestId = RequestId
+ _ProcessRequestId = ProcessRequestId
End Sub
Private Async Function GetRequestData(RequestId) As Task
Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True)
- Dim oSQL = $"SELECT RECORD_ID,PROCESS_NAME, REQUESTTITLE, FORM_ID FROM VWIDB_PROCESS_REQUEST WHERE REQUESTID = {RequestId}"
+ Dim oSQL = $"SELECT RECORD_ID,PROCESS_NAME, REQUEST_TITLE, FORMID FROM VWIDB_PROCESS_REQUEST WHERE RECORD_ID = {RequestId}"
If My.Application.Service.Online = False Then
End If
@@ -39,9 +39,9 @@ Public Class frmWorkflowStep
Dim oRows = oResult.Table.Rows
If oRows.Count = 1 Then
- _FormId = oRows.Item(0).Item("FORM_ID")
+ _FormId = oRows.Item(0).Item("FORMID")
_ProcessName = oRows.Item(0).Item("PROCESS_NAME")
- _RequestName = oRows.Item(0).Item("TITLE")
+ _RequestName = oRows.Item(0).Item("REQUEST_TITLE")
Else
Throw New ApplicationException("Request data could not be fetched!")
End If
@@ -49,10 +49,10 @@ Public Class frmWorkflowStep
Private Async Sub frmWorkflowStep_Load(sender As Object, e As EventArgs) Handles MyBase.Load
- Await GetRequestData(_RequestId)
+ Await GetRequestData(_ProcessRequestId)
Dim oControlTable = Await My.Common.Views.VWIDB_FORM_CONTROL(_FormId)
- Dim oControlData = Await My.Common.Views.VWIDB_WF_REQUESTCONTROLDATA(_FormId, _RequestId)
+ Dim oControlData = Await My.Common.Views.VWIDB_CONTROL_DATA(_ProcessRequestId)
_HeaderGroup = LayoutControlGroupMain.AddGroup("Request Header")
_BodyGroup = LayoutControlGroupMain.AddGroup("Control Body")
@@ -70,4 +70,8 @@ Public Class frmWorkflowStep
_ControlLoader.AddControl("Process Name", _ProcessName, _HeaderGroup)
_ControlLoader.AddControl("Request Name", _RequestName, _HeaderGroup)
End Sub
+
+ Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
+
+ End Sub
End Class
\ No newline at end of file
diff --git a/GUIs.ClientSuite/My Project/Resources.Designer.vb b/GUIs.ClientSuite/My Project/Resources.Designer.vb
index a2e68ac4..a23044d4 100644
--- a/GUIs.ClientSuite/My Project/Resources.Designer.vb
+++ b/GUIs.ClientSuite/My Project/Resources.Designer.vb
@@ -130,6 +130,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property StatusAnnotations_Complete_and_ok_32xLG() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("StatusAnnotations_Complete_and_ok_32xLG", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/GUIs.ClientSuite/Resources/StatusAnnotations_Complete_and_ok_32xLG.png b/GUIs.ClientSuite/Resources/StatusAnnotations_Complete_and_ok_32xLG.png
new file mode 100644
index 00000000..2d79cef4
Binary files /dev/null and b/GUIs.ClientSuite/Resources/StatusAnnotations_Complete_and_ok_32xLG.png differ
diff --git a/GUIs.ClientSuite/frmMain.vb b/GUIs.ClientSuite/frmMain.vb
index c68d8803..8a664370 100644
--- a/GUIs.ClientSuite/frmMain.vb
+++ b/GUIs.ClientSuite/frmMain.vb
@@ -217,7 +217,7 @@ Public Class frmMain
End Sub
Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
- Dim oForm As New frmWorkflowStep(142) With {
+ Dim oForm As New frmWorkflowStep(172) With {
.MdiParent = DocumentManager.MdiParent
}
oForm.Show()