rename Workflow to ModuleWorkflow

This commit is contained in:
Jonathan Jenne 2019-07-04 16:09:34 +02:00
parent eacf8e2743
commit 11f092e577
15 changed files with 36 additions and 23 deletions

View File

@ -170,16 +170,16 @@
<Compile Include="FormDesigner\frmFormDesigner.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Workflow\frmWorkflowOverview.Designer.vb">
<Compile Include="ModuleWorkflow\frmWorkflowOverview.Designer.vb">
<DependentUpon>frmWorkflowOverview.vb</DependentUpon>
</Compile>
<Compile Include="Workflow\frmWorkflowOverview.vb">
<Compile Include="ModuleWorkflow\frmWorkflowOverview.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Workflow\frmWorkflowStep.Designer.vb">
<Compile Include="ModuleWorkflow\frmWorkflowStep.Designer.vb">
<DependentUpon>frmWorkflowStep.vb</DependentUpon>
</Compile>
<Compile Include="Workflow\frmWorkflowStep.vb">
<Compile Include="ModuleWorkflow\frmWorkflowStep.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSearch.Designer.vb">
@ -205,20 +205,20 @@
<Compile Include="Workers\IWorker.vb" />
<Compile Include="Workers\WorkerManager.vb" />
<Compile Include="Workers\WorkflowOverviewWorker.vb" />
<Compile Include="Workflow\GridOverview.Designer.vb">
<Compile Include="ModuleWorkflow\GridOverview.Designer.vb">
<DependentUpon>GridOverview.vb</DependentUpon>
</Compile>
<Compile Include="Workflow\GridOverview.vb">
<Compile Include="ModuleWorkflow\GridOverview.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Workflow\NavControlOverview.Designer.vb">
<Compile Include="ModuleWorkflow\NavControlOverview.Designer.vb">
<DependentUpon>NavControlOverview.vb</DependentUpon>
</Compile>
<Compile Include="Workflow\NavControlOverview.vb">
<Compile Include="ModuleWorkflow\NavControlOverview.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Workflow\WorkflowDetail.vb" />
<Compile Include="Workflow\WorkflowItem.vb" />
<Compile Include="ModuleWorkflow\WorkflowDetail.vb" />
<Compile Include="ModuleWorkflow\WorkflowItem.vb" />
<Compile Include="_TEST\DockManagerTest.Designer.vb">
<DependentUpon>DockManagerTest.vb</DependentUpon>
</Compile>
@ -352,10 +352,10 @@
<EmbeddedResource Include="FormDesigner\frmFormDesigner.resx">
<DependentUpon>frmFormDesigner.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Workflow\frmWorkflowOverview.resx">
<EmbeddedResource Include="ModuleWorkflow\frmWorkflowOverview.resx">
<DependentUpon>frmWorkflowOverview.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Workflow\frmWorkflowStep.resx">
<EmbeddedResource Include="ModuleWorkflow\frmWorkflowStep.resx">
<DependentUpon>frmWorkflowStep.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmSearch.resx">
@ -364,10 +364,10 @@
<EmbeddedResource Include="Panels\DocumentPanel.resx">
<DependentUpon>DocumentPanel.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Workflow\GridOverview.resx">
<EmbeddedResource Include="ModuleWorkflow\GridOverview.resx">
<DependentUpon>GridOverview.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Workflow\NavControlOverview.resx">
<EmbeddedResource Include="ModuleWorkflow\NavControlOverview.resx">
<DependentUpon>NavControlOverview.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="_TEST\DockManagerTest.resx">
@ -522,6 +522,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="My Project\DataSources\" />
<Folder Include="Resources\Icons\" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ampel-gelb.png" />

View File

@ -12,6 +12,7 @@ Public Class WorkflowItem
Public Property CreatedAt As DateTime
Public Property Process As String
Public Property IconMap As Dictionary(Of String, String)
Public Property StateImage As Image
Public Property State As String
Get
@ -19,14 +20,20 @@ Public Class WorkflowItem
End Get
Set(value As String)
_state = value
Select Case value
Case "Start"
StateImage = My.Resources.
Case "Not started"
StateImage = My.Resources.ampel_gelb
Case Else
StateImage = Nothing
End Select
StateImage = GetIcon(value, IconMap)
End Set
End Property
Public Sub New(IconMap As Dictionary(Of String, String))
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)
Return My.Resources.ResourceManager.GetObject(IconName)
Else
Return Nothing
End If
End Function
End Class

View File

@ -9,11 +9,16 @@ Public Class frmWorkflowOverview
Dim oDatatable As DataTable
Dim oWorkflows As New List(Of WorkflowItem)
Dim oIconMap As New Dictionary(Of String, String) From {
{"Start", "ampel_gruen"},
{"not started", "ampel_rot"}
}
Try
oDatatable = Await My.Common.Views.VWIDB_GUI_WF_OVERVIEW(70, 104)
For Each oRow As DataRow In oDatatable.Rows
oWorkflows.Add(New WorkflowItem() With {
oWorkflows.Add(New WorkflowItem(oIconMap) With {
.Title = oRow.Item("REQUEST_TITLE"),
.State = oRow.Item("STATETITLE"),
.Process = oRow.Item("PROCESS_NAME")