From 11f092e577f3b6c400c49de0f00c0bd948d7fefb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 4 Jul 2019 16:09:34 +0200 Subject: [PATCH] rename Workflow to ModuleWorkflow --- GUIs.ClientSuite/ClientSuite.vbproj | 29 ++++++++++--------- .../GridOverview.Designer.vb | 0 .../GridOverview.resx | 0 .../GridOverview.vb | 0 .../NavControlOverview.Designer.vb | 0 .../NavControlOverview.resx | 0 .../NavControlOverview.vb | 0 .../WorkflowDetail.vb | 0 .../WorkflowItem.vb | 23 ++++++++++----- .../frmWorkflowOverview.Designer.vb | 0 .../frmWorkflowOverview.resx | 0 .../frmWorkflowOverview.vb | 7 ++++- .../frmWorkflowStep.Designer.vb | 0 .../frmWorkflowStep.resx | 0 .../frmWorkflowStep.vb | 0 15 files changed, 36 insertions(+), 23 deletions(-) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/GridOverview.Designer.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/GridOverview.resx (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/GridOverview.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/NavControlOverview.Designer.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/NavControlOverview.resx (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/NavControlOverview.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/WorkflowDetail.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/WorkflowItem.vb (53%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowOverview.Designer.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowOverview.resx (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowOverview.vb (86%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowStep.Designer.vb (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowStep.resx (100%) rename GUIs.ClientSuite/{Workflow => ModuleWorkflow}/frmWorkflowStep.vb (100%) diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index 1f8f53dd..4232a45d 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -170,16 +170,16 @@ Form - + frmWorkflowOverview.vb - + Form - + frmWorkflowStep.vb - + Form @@ -205,20 +205,20 @@ - + GridOverview.vb - + UserControl - + NavControlOverview.vb - + UserControl - - + + DockManagerTest.vb @@ -352,10 +352,10 @@ frmFormDesigner.vb - + frmWorkflowOverview.vb - + frmWorkflowStep.vb @@ -364,10 +364,10 @@ DocumentPanel.vb - + GridOverview.vb - + NavControlOverview.vb @@ -522,6 +522,7 @@ + diff --git a/GUIs.ClientSuite/Workflow/GridOverview.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/GridOverview.Designer.vb rename to GUIs.ClientSuite/ModuleWorkflow/GridOverview.Designer.vb diff --git a/GUIs.ClientSuite/Workflow/GridOverview.resx b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx similarity index 100% rename from GUIs.ClientSuite/Workflow/GridOverview.resx rename to GUIs.ClientSuite/ModuleWorkflow/GridOverview.resx diff --git a/GUIs.ClientSuite/Workflow/GridOverview.vb b/GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/GridOverview.vb rename to GUIs.ClientSuite/ModuleWorkflow/GridOverview.vb diff --git a/GUIs.ClientSuite/Workflow/NavControlOverview.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.Designer.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/NavControlOverview.Designer.vb rename to GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.Designer.vb diff --git a/GUIs.ClientSuite/Workflow/NavControlOverview.resx b/GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.resx similarity index 100% rename from GUIs.ClientSuite/Workflow/NavControlOverview.resx rename to GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.resx diff --git a/GUIs.ClientSuite/Workflow/NavControlOverview.vb b/GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/NavControlOverview.vb rename to GUIs.ClientSuite/ModuleWorkflow/NavControlOverview.vb diff --git a/GUIs.ClientSuite/Workflow/WorkflowDetail.vb b/GUIs.ClientSuite/ModuleWorkflow/WorkflowDetail.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/WorkflowDetail.vb rename to GUIs.ClientSuite/ModuleWorkflow/WorkflowDetail.vb diff --git a/GUIs.ClientSuite/Workflow/WorkflowItem.vb b/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb similarity index 53% rename from GUIs.ClientSuite/Workflow/WorkflowItem.vb rename to GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb index 250e874f..5b34c9b2 100644 --- a/GUIs.ClientSuite/Workflow/WorkflowItem.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/WorkflowItem.vb @@ -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 diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.Designer.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/frmWorkflowOverview.Designer.vb rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.Designer.vb diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.resx b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.resx similarity index 100% rename from GUIs.ClientSuite/Workflow/frmWorkflowOverview.resx rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.resx diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb similarity index 86% rename from GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb index 5f05e7ba..e23d0981 100644 --- a/GUIs.ClientSuite/Workflow/frmWorkflowOverview.vb +++ b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowOverview.vb @@ -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") diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowStep.Designer.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/frmWorkflowStep.Designer.vb rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.Designer.vb diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowStep.resx b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.resx similarity index 100% rename from GUIs.ClientSuite/Workflow/frmWorkflowStep.resx rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.resx diff --git a/GUIs.ClientSuite/Workflow/frmWorkflowStep.vb b/GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb similarity index 100% rename from GUIs.ClientSuite/Workflow/frmWorkflowStep.vb rename to GUIs.ClientSuite/ModuleWorkflow/frmWorkflowStep.vb