diff --git a/GUIs.ZooFlow/ApplicationEvents.vb b/GUIs.ZooFlow/ApplicationEvents.vb
index 0bea039f..96a72a5c 100644
--- a/GUIs.ZooFlow/ApplicationEvents.vb
+++ b/GUIs.ZooFlow/ApplicationEvents.vb
@@ -54,16 +54,17 @@ Namespace My
If oConfigManager.Config.AppServerConfig <> String.Empty Then
Try
- Dim oSplit() As String = oConfigManager.Config.AppServerConfig.ToString.Split(":")
+ Dim oSplit() As String = oConfigManager.Config.AppServerConfig.ToString.Split(":"c)
Dim oAppServerAddress As String = oSplit(0)
Dim oAppServerPort As Integer = 9000
If oSplit.Length = 2 Then
oAppServerPort = oSplit(1)
End If
- _Client = New Client(LogConfig, oAppServerAddress, oAppServerPort)
- If Not IsNothing(_Client) Then
- If _Client.Connect() Then
- APPSERVER_ACTIVE = True
+
+ My.Application.Service.Client = New Client(LogConfig, oAppServerAddress, oAppServerPort)
+ If Not IsNothing(My.Application.Service.Client) Then
+ If My.Application.Service.Client.Connect() Then
+ My.Application.Service.IsActive = True
End If
End If
Catch ex As Exception
diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb
index e93436a2..d8de737f 100644
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -281,22 +281,23 @@ Public Class ClassInit
For Each oLine In oLines
_Logger.Debug(oLine.Trim)
If oLine = "NO_BASICCONF" Then
- NOBASIC_CONF = True
+ My.Application.User.HideBasicConfig = True
+
ElseIf oLine.StartsWith("SEARCH_STRING_ATTRID") Then
Try
Dim oResult = oLine.Replace("SEARCH_STRING_ATTRID=", "")
- SEARCH_STRING_ATTRID = oResult
+ My.Application.Search.StringAttributeId = Long.Parse(oResult)
Catch ex As Exception
- SEARCH_STRING_ATTRID = ""
+ My.Application.Search.StringAttributeId = -1
End Try
ElseIf oLine.StartsWith("SEARCH_INT_ATTRID") Then
Try
Dim oResult = oLine.Replace("SEARCH_INT_ATTRID=", "")
- SEARCH_INTEGER_ATTRID = oResult
- Catch ex As Exception
- SEARCH_INTEGER_ATTRID = ""
- End Try
+ My.Application.Search.IntegerAttributeId = Long.Parse(oResult)
+ Catch ex As Exception
+ My.Application.Search.IntegerAttributeId = -1
+ End Try
Else
_Logger.Info($"Wrong WorkingMode: {oLine}")
End If
diff --git a/GUIs.ZooFlow/Globix/State.vb b/GUIs.ZooFlow/Globix/State.vb
index 623880dd..10650d81 100644
--- a/GUIs.ZooFlow/Globix/State.vb
+++ b/GUIs.ZooFlow/Globix/State.vb
@@ -33,9 +33,6 @@
Public Property CURRENT_MESSAGEID As String
Public Property CURRENT_BusinessEntity As String
-
-
-
Public Function FileExistsinDropTable(Filename As String) As Boolean
Dim oSQL As String
Try
diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb
index ad478fef..7e75cd0d 100644
--- a/GUIs.ZooFlow/MyApplication.vb
+++ b/GUIs.ZooFlow/MyApplication.vb
@@ -49,6 +49,7 @@ Namespace My
Public Property ClipboardWatcher As New ClipboardWatcher.State
Public Property IDB_ConnectionString As String
Public Property Globix As New Globix.State
+ Public Property Search As New Search.State
Public Property GDPictureLicense As String
diff --git a/GUIs.ZooFlow/Search/State.vb b/GUIs.ZooFlow/Search/State.vb
new file mode 100644
index 00000000..65ae87a6
--- /dev/null
+++ b/GUIs.ZooFlow/Search/State.vb
@@ -0,0 +1,6 @@
+Namespace Search
+ Public Class State
+ Public Property StringAttributeId As Long = -1
+ Public Property IntegerAttributeId As Long = -1
+ End Class
+End Namespace
diff --git a/GUIs.ZooFlow/FlowSearch/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
similarity index 100%
rename from GUIs.ZooFlow/FlowSearch/frmFlowSearch.Designer.vb
rename to GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
diff --git a/GUIs.ZooFlow/FlowSearch/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx
similarity index 100%
rename from GUIs.ZooFlow/FlowSearch/frmFlowSearch.resx
rename to GUIs.ZooFlow/Search/frmFlowSearch.resx
diff --git a/GUIs.ZooFlow/FlowSearch/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb
similarity index 98%
rename from GUIs.ZooFlow/FlowSearch/frmFlowSearch.vb
rename to GUIs.ZooFlow/Search/frmFlowSearch.vb
index 5225b679..1e5fecec 100644
--- a/GUIs.ZooFlow/FlowSearch/frmFlowSearch.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb
@@ -97,10 +97,12 @@ Public Class frmFlowSearch
Private Function StartSearch_Full(pSearchValue As String) As Boolean
Dim oHandle As IOverlaySplashScreenHandle = Nothing
Dim oItemsFound As Boolean = False
+ Dim oState = My.Application.Search
+
Try
oHandle = SplashScreenManager.ShowOverlayForm(Me)
- Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}',{My.Application.User.UserId},'{SEARCH_STRING_ATTRID}','{SEARCH_INTEGER_ATTRID}'"
+ Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}',{My.Application.User.UserId},'{oState.StringAttributeId}','{oState.IntegerAttributeId}'"
Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL)
If Not IsNothing(oDTOBJECT_RESULT) Then
Dim oEnvironment As New Modules.ZooFlow.Environment() With {
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 89fa70f9..9dab32b8 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -114,10 +114,10 @@
-
+
frmFlowSearch.vb
-
+
Form
@@ -215,7 +215,8 @@
-
+
+
frmFlowSearch.vb
diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb
deleted file mode 100644
index 124c91e5..00000000
--- a/GUIs.ZooFlow/modCurrent.vb
+++ /dev/null
@@ -1,9 +0,0 @@
-Imports DigitalData.Modules.EDMI.API
-
-Module modCurrent
- Public _Client As Client
- Public APPSERVER_ACTIVE As Boolean = False
- Public SEARCH_STRING_ATTRID As String
- Public SEARCH_INTEGER_ATTRID As String
- Public NOBASIC_CONF As Boolean = False
-End Module
diff --git a/Modules.ZooFlow/State/ServiceState.vb b/Modules.ZooFlow/State/ServiceState.vb
index 4d8d2b3b..5b00e66e 100644
--- a/Modules.ZooFlow/State/ServiceState.vb
+++ b/Modules.ZooFlow/State/ServiceState.vb
@@ -1,8 +1,11 @@
-Namespace State
+Imports DigitalData.Modules.EDMI.API
+
+Namespace State
Public Class ServiceState
Public Property IsOnline As Boolean = False
Public Property IsActive As Boolean = False
Public Property LastChecked As Date = Date.Now
Public Property Address As String = String.Empty
+ Public Property Client As Client = Nothing
End Class
End Namespace
\ No newline at end of file
diff --git a/Modules.ZooFlow/State/UserState.vb b/Modules.ZooFlow/State/UserState.vb
index f382a9f2..cd015f3a 100644
--- a/Modules.ZooFlow/State/UserState.vb
+++ b/Modules.ZooFlow/State/UserState.vb
@@ -15,6 +15,8 @@ Namespace State
Public Property DateFormat As String
Public Property Language As String
+ Public Property HideBasicConfig As Boolean = False
+
'''
''' Initialize user object with values that can be read from the environment
'''
diff --git a/Modules.ZooFlow/ZooFlow.vbproj b/Modules.ZooFlow/ZooFlow.vbproj
index b03b4a42..05728d71 100644
--- a/Modules.ZooFlow/ZooFlow.vbproj
+++ b/Modules.ZooFlow/ZooFlow.vbproj
@@ -123,6 +123,10 @@
{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}
Database
+
+ {25017513-0D97-49D3-98D7-BA76D9B251B0}
+ EDMI.API
+
{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}
Language