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

merge

Browse Source
This commit is contained in:
Jonathan Jenne 2022-05-19 12:19:08 +02:00
commit 7006d38584
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GUIs.ZooFlow/ClassInit.vb
View File

@ -261,6 +261,7 @@ Public Class ClassInit
My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSql, EDMI.API.Constants.DatabaseType.IDB)
For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows
Dim oTITLE = oRow.Item("TITLE").ToString
Dim oBaseSQL = oRow.Item("SQL_COMMAND").ToString
oBaseSQL = oBaseSQL.Replace("@USER_ID", My.Application.User.UserId)
oBaseSQL = oBaseSQL.Replace("@USERID", My.Application.User.UserId)
@ -270,13 +271,13 @@ Public Class ClassInit
oBaseSQL = oBaseSQL.Replace("@LANG_CODE", My.Application.User.Language)
oBaseSQL = oBaseSQL.Replace("{#INT#USERNAME}", My.Application.User.UserName)
If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then
SQL_DocResultBase = oBaseSQL
ElseIf oRow.Item("TITLE") = SQLCMD_AHW_LAYOUT_SELECT Then
If oTITLE = SQLCMD_FLOW_SEARCH_BASE Then
SQL_FLOW_SEARCH_BASE = oBaseSQL
ElseIf oTITLE = SQLCMD_AHW_LAYOUT_SELECT Then
SQL_AHW_LAYOUT_SELECT = oBaseSQL
ElseIf oRow.Item("TITLE") = SQLCMD_AHW_USR_SELECT Then
ElseIf oTITLE = SQLCMD_AHW_USR_SELECT Then
SQL_AHW_USR_SELECT = oBaseSQL
ElseIf oRow.Item("TITLE") = SQLCMD_RECENT_FILES_USER Then
ElseIf oTITLE = SQLCMD_RECENT_FILES_USER Then
SQL_RECENT_FILES_USER = oBaseSQL
End If
Next
@ -307,7 +308,7 @@ Public Class ClassInit
My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSql, EDMI.API.Constants.DatabaseType.IDB, $"LANG_CODE = '{MyApplication.User.Language}'")
If SQL_DocResultBase = "" Then
If SQL_FLOW_SEARCH_BASE = "" Then
Logger.Warn($"ATTENTION: NO DocResultBaseSearch - Check if entry {SQLCMD_FLOW_SEARCH_BASE} exists in TBIDB_COMMON_SQL")
End If

2
GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.vb
View File

@ -19,7 +19,7 @@ Public Class frmFileflow_Duplicate
Environment = My.Application.GetEnvironment()
Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With {
.BaseSearchSQL = SQL_DocResultBase
.BaseSearchSQL = SQL_FLOW_SEARCH_BASE
}
End Sub

2
GUIs.ZooFlow/frmFlowForm.vb
View File

@ -232,7 +232,7 @@ Public Class frmFlowForm
Modules = New ClassModules(My.LogConfig, My.SystemConfig)
FileEx = New Filesystem.File(My.LogConfig)
Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With {
.BaseSearchSQL = SQL_DocResultBase
.BaseSearchSQL = SQL_FLOW_SEARCH_BASE
}
' === Initialize Theming ===

2
GUIs.ZooFlow/modCurrent.vb
View File

@ -13,7 +13,7 @@ Module modCurrent
Public Property AHWF_CMD_USR_SELECT As String
Public Property AHWF_CMD_LAYOUT_SELECT As String
Public Property SQL_DocResultBase As String
Public Property SQL_FLOW_SEARCH_BASE As String
Public Property SQL_AHW_LAYOUT_SELECT As String
Public Property SQL_AHW_USR_SELECT As String
Public Property SQL_RECENT_FILES_USER As String