AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ZooFlow: clean up

Browse Source
This commit is contained in:
Jonathan Jenne 2021-01-19 16:30:05 +01:00
parent eb59a4e13d
commit 91a0ccc0d1
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GUIs.ZooFlow/ClassDataASorDB.vb
View File

@ -9,7 +9,7 @@ Public Class ClassDataASorDB
Public Function GetDatatable(pDB As String, pSQL As String, pAppServDT As String, pAppServFilter As String, Optional pAppServSort As String = "", Optional pForce As String = "") As DataTable
Try
Dim oReturnDT As DataTable = Nothing
If EDMI_SERVICE_ACTIVE = True And pForce = String.Empty Then
If My.Application.Service.IsActive = True And pForce = String.Empty Then
Try
Dim oTableResult As TableResult = _Client.GetDatatableByName(pAppServDT, pAppServFilter, pAppServSort)
oReturnDT = oTableResult.Table
@ -59,10 +59,7 @@ Public Class ClassDataASorDB
My.Application.User.DateFormat = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
My.Application.User.IsAdmin = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE")
If ADDITIONAL_TITLE = String.Empty Then
ADDITIONAL_TITLE = My.Application.Info.ProductName
End If
ADDITIONAL_TITLE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), My.Application.Info.ProductName)
Return True
Else

1
GUIs.ZooFlow/ClassInit.vb
View File

@ -176,7 +176,6 @@ Public Class ClassInit
If Not IsNothing(_Client) Then
If _Client.Connect() Then
MyApplication.Service.IsActive = True
EDMI_SERVICE_ACTIVE = True
End If
End If

21
GUIs.ZooFlow/modCurrent.vb
View File

@ -1,15 +1,14 @@
Imports DigitalData.Modules.EDMI.API
Module modCurrent
Public _Client As Client
Public ADDITIONAL_TITLE As String
Public DT_CONNECTIONS As DataTable
Public EDMI_SERVICE_ACTIVE As Boolean = False
Public CURR_MISSING_PATTERN_NAME = "Email To"
Public CURR_MISSING_SEARCH_STRING = String.Empty
Public CURR_MISSING_MANUAL_VALUE = String.Empty
Public NI_TITLE As String = ""
Public NI_MESSAGE As String = ""
Public NI_TYPE As String = "INFO"
Public clsDataASorDB As ClassDataASorDB
Public Property _Client As Client
Public Property ADDITIONAL_TITLE As String
Public Property DT_CONNECTIONS As DataTable
Public Property CURR_MISSING_PATTERN_NAME = "Email To"
Public Property CURR_MISSING_SEARCH_STRING = String.Empty
Public Property CURR_MISSING_MANUAL_VALUE = String.Empty
Public Property NI_TITLE As String = ""
Public Property NI_MESSAGE As String = ""
Public Property NI_TYPE As String = "INFO"
Public Property clsDataASorDB As ClassDataASorDB
End Module