diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj index 61088e0f..07cac5ef 100644 --- a/GUIs.ClientSuite/ClientSuite.vbproj +++ b/GUIs.ClientSuite/ClientSuite.vbproj @@ -196,7 +196,7 @@ - + DockManagerTest.vb diff --git a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb index 00da484b..92bb6297 100644 --- a/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb +++ b/GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb @@ -24,8 +24,10 @@ Public Class frmWorkflowStep Private Async Function GetRequestData(RequestId) As Task Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True) - Dim oSQL = $"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWIDB_WF_REQUEST WHERE RECORD_ID = {RequestId}" + Dim oSQL = $"SELECT RECORD_ID,PROCESS_NAME, REQUESTTITLE, FORM_ID FROM VWIDB_PROCESS_REQUEST WHERE REQUESTID = {RequestId}" + If My.Application.Service.Online = False Then + End If Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) If Not oResult.OK Then diff --git a/GUIs.ClientSuite/Workers/WorkerManager.vb b/GUIs.ClientSuite/Workers/WorkerManager.vb index f228d535..e48e1fa9 100644 --- a/GUIs.ClientSuite/Workers/WorkerManager.vb +++ b/GUIs.ClientSuite/Workers/WorkerManager.vb @@ -10,7 +10,8 @@ Namespace Workers ''' List of workers that will be started. ''' Private WorkerTypes As New List(Of Type) From { - GetType(HeartbeatWorker) + GetType(HeartbeatWorker), + GetType(WorkflowOverviewWorker) } Private Workers As New List(Of IWorker) Private TimerList As New List(Of Timer) diff --git a/GUIs.ClientSuite/Workers/WorkflowWorker.vb b/GUIs.ClientSuite/Workers/WorkflowOverviewWorker.vb similarity index 72% rename from GUIs.ClientSuite/Workers/WorkflowWorker.vb rename to GUIs.ClientSuite/Workers/WorkflowOverviewWorker.vb index dc2a9fc1..e7578624 100644 --- a/GUIs.ClientSuite/Workers/WorkflowWorker.vb +++ b/GUIs.ClientSuite/Workers/WorkflowOverviewWorker.vb @@ -3,7 +3,7 @@ Imports DigitalData.GUIs.ClientSuite.Base Imports DigitalData.Modules.Logging Namespace Workers - Public Class WorkflowWorker + Public Class WorkflowOverviewWorker Inherits BaseClass Implements IWorker @@ -21,7 +21,10 @@ Namespace Workers Throw New NotImplementedException() End Sub - Public Sub Callback(manager As WorkerManager, e As ElapsedEventArgs) Implements IWorker.Callback + Public Async Sub Callback(manager As WorkerManager, e As ElapsedEventArgs) Implements IWorker.Callback + Dim oSQL = $"" + Await My.Channel.CreateDatabaseRequestAsync("Get WFOverview", True) + Throw New NotImplementedException() End Sub End Class diff --git a/GUIs.ClientSuite/frmMain.vb b/GUIs.ClientSuite/frmMain.vb index a175c282..72e3aa99 100644 --- a/GUIs.ClientSuite/frmMain.vb +++ b/GUIs.ClientSuite/frmMain.vb @@ -9,7 +9,6 @@ Imports DigitalData.Modules.License Public Class frmMain Private _PanelManager As PanelManager - Private _Timer As ClassTimer Private _WorkerManager As WorkerManager Private _Loading As Boolean = True @@ -38,6 +37,10 @@ Public Class frmMain End Sub Private Sub HandleOnlineChanged(sender As Object, Online As Boolean) + If Online = False Then + + Application.Exit() + End If SetOnlineLabel(Online) End Sub diff --git a/Variables/CurrentApplication.vb b/Variables/CurrentApplication.vb index 9b9d3e9f..897b50ec 100644 --- a/Variables/CurrentApplication.vb +++ b/Variables/CurrentApplication.vb @@ -1,3 +1,3 @@ Public Class CurrentApplication - + Public IDBServiceOnline As Boolean = False End Class