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

actually respect sql suggestion setting for lookupgrid

Browse Source
This commit is contained in:
Jonathan Jenne 2020-05-20 16:12:20 +02:00
parent d1950b0949
commit d3b7934988
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Global_Indexer/ClassControls.vb
View File

@ -59,7 +59,7 @@ Public Class ClassControls
PrepareDependingControl(sender) PrepareDependingControl(sender)
End Sub End Sub
Public Function AddVorschlag_ComboBox(indexname As String, y As Integer, conid As Integer, sql_Vorschlag As String, Multiselect As Boolean, DataType As String, Optional Vorgabe As String = "", Optional AddNewValues As Boolean = False, Optional PreventDuplicateValues As Boolean = False) As Control Public Function AddVorschlag_ComboBox(indexname As String, y As Integer, conid As Integer, sql_Vorschlag As String, Multiselect As Boolean, DataType As String, Optional Vorgabe As String = "", Optional AddNewValues As Boolean = False, Optional PreventDuplicateValues As Boolean = False, Optional SQLSuggestion As Boolean = False) As Control
Try Try
Dim oSql As String = sql_Vorschlag Dim oSql As String = sql_Vorschlag
Dim oConnectionString As String Dim oConnectionString As String
@ -97,7 +97,7 @@ Public Class ClassControls
oConnectionString = ClassFormFunctions.GetConnectionString(conid) oConnectionString = ClassFormFunctions.GetConnectionString(conid)
If oConnectionString IsNot Nothing And oSql.Length > 0 Then If oConnectionString IsNot Nothing And oSql.Length > 0 And SQLSu ggestion = True Then
LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30)) LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))
If ClassPatterns.HasComplexPatterns(oSql) Then If ClassPatterns.HasComplexPatterns(oSql) Then

9
Global_Indexer/frmIndex.vb
View File

@ -1620,6 +1620,7 @@ Public Class frmIndex
Dim PreventDuplicates As Boolean = oRow.Item("VKT_PREVENT_MULTIPLE_VALUES") Dim PreventDuplicates As Boolean = oRow.Item("VKT_PREVENT_MULTIPLE_VALUES")
Dim oControlName As String = oRow.Item("NAME") Dim oControlName As String = oRow.Item("NAME")
Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), 0) Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), 0)
Dim oSQLSuggestion = oRow.Item("SUGGESTION")
If oDataType <> "BOOLEAN" Then If oDataType <> "BOOLEAN" Then
addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount) addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount)
@ -1636,8 +1637,8 @@ Public Class frmIndex
pnlIndex.Controls.Add(chk) pnlIndex.Controls.Add(chk)
End If End If
Case "INTEGER" Case "INTEGER"
If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then If (oSQLSuggestion = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates) Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates, oSQLSuggestion)
If Not IsNothing(oControl) Then If Not IsNothing(oControl) Then
pnlIndex.Controls.Add(oControl) pnlIndex.Controls.Add(oControl)
End If End If
@ -1649,8 +1650,8 @@ Public Class frmIndex
End If End If
End If End If
Case "VARCHAR" Case "VARCHAR"
If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then If (oSQLSuggestion = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates) Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates, oSQLSuggestion)
If Not IsNothing(oControl) Then If Not IsNothing(oControl) Then
pnlIndex.Controls.Add(oControl) pnlIndex.Controls.Add(oControl)
End If End If