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

dont close viewer on missing input, show lookup control when multiselect is true

Browse Source
This commit is contained in:
Jonathan Jenne 2020-04-30 14:43:13 +02:00
parent d8bb4e3caa
commit e5d3d37005
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Global_Indexer/ClassControls.vb
View File

@ -96,7 +96,7 @@ Public Class ClassControls
oConnectionString = ClassFormFunctions.GetConnectionString(conid) oConnectionString = ClassFormFunctions.GetConnectionString(conid)
If oConnectionString IsNot Nothing Then If oConnectionString IsNot Nothing And oSql.Length > 0 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

18
Global_Indexer/frmIndex.vb
View File

@ -1625,6 +1625,7 @@ Public Class frmIndex
Dim AddNewItems As Boolean = oRow.Item("VKT_ADD_ITEM") Dim AddNewItems As Boolean = oRow.Item("VKT_ADD_ITEM")
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)
If oDataType <> "BOOLEAN" Then If oDataType <> "BOOLEAN" Then
addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount) addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount)
@ -1641,8 +1642,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 Then If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oRow.Item("CONNECTION_ID"), 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)
If Not IsNothing(oControl) Then If Not IsNothing(oControl) Then
pnlIndex.Controls.Add(oControl) pnlIndex.Controls.Add(oControl)
End If End If
@ -1654,8 +1655,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 Then If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oRow.Item("CONNECTION_ID"), 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)
If Not IsNothing(oControl) Then If Not IsNothing(oControl) Then
pnlIndex.Controls.Add(oControl) pnlIndex.Controls.Add(oControl)
End If End If
@ -2560,8 +2561,7 @@ Public Class frmIndex
ClearError() ClearError()
ClearNotice() ClearNotice()
DocumentViewer1.CloseDocument()
DocumentViewer1.Done()
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
ClassHelper.Refresh_RegexTable() ClassHelper.Refresh_RegexTable()
@ -2597,6 +2597,9 @@ Public Class frmIndex
'DTACTUAL_FILES.Clear() 'DTACTUAL_FILES.Clear()
DocumentViewer1.CloseDocument()
DocumentViewer1.Done()
CancelAttempts = 2 CancelAttempts = 2
Me.Close() Me.Close()
End If End If
@ -2613,6 +2616,9 @@ Public Class frmIndex
End If End If
End If End If
DocumentViewer1.CloseDocument()
DocumentViewer1.Done()
CancelAttempts = 2 CancelAttempts = 2
Me.Close() Me.Close()
End If End If