Fix Additional search ui, fix fallback sql for data searches

app/DD_PM_WINDREAM/frmMain.vb

@@ -599,7 +599,9 @@ Public Class frmMain
 
                 If IDB_ACTIVE = True Then
                     Try
+                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
                             GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        End If
                     Catch ex As Exception
                         LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION")
                     End Try
@@ -1847,7 +1849,10 @@ Public Class frmMain
                     End If
 
                     Try
+                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
                             GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+
+                        End If
                     Catch ex As Exception
                         LOGGER.Info("LoadGridOverview - Check wether Column CONV_YN is part of select/view")
                     End Try
@@ -2130,7 +2135,7 @@ Public Class frmMain
                 BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
             End If
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
-            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
+            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
             'BASEDATA_DT_PROFILES_SEARCHES_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'SQL'", "PROFILE_ID,TAB_INDEX")
             BASEDATA_DT_PROFILES_SEARCHES_SQL = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                 .FilterExpression = "TYPE = 'SQL'",

app/DD_PM_WINDREAM/frmValidator.vb

@@ -475,13 +475,12 @@ Public Class frmValidator
             LOGGER.Error(ex)
         End Try
     End Sub
-    Public Sub Load_Additional_Searches()
+
-        Try
+    Public Function Test_Additional_Data_Searches_Exist() As Boolean
-            If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+        If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
-                Dim oDocResultCommand As String
-                Dim oDatatableDocResult As DataTable
             Dim oDataResultCommand As String
-                Dim oDatatableDataResult As DataTable
+            Dim oDatatableDataResult As DataTable = Nothing
+
             If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
                 'Check whether DocData is there
                 Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
@@ -492,6 +491,28 @@ Public Class frmValidator
                     .ConnectionId = oConID
                 })
             End If
+
+            Dim oDataResultsExist As Boolean = False
+
+            If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+                If Not IsNothing(oDatatableDataResult) Then
+                    If oDatatableDataResult.Rows.Count > 0 Then
+                        oDataResultsExist = True
+                    End If
+                End If
+
+            End If
+
+            Return oDataResultsExist
+        Else
+            Return False
+        End If
+    End Function
+    Public Function Test_Additional_Doc_Searches_Exist() As Boolean
+        If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+            Dim oDocResultCommand As String
+            Dim oDatatableDocResult As DataTable = Nothing
+
             If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
                 'Check whether DocData is there
                 Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
@@ -503,17 +524,8 @@ Public Class frmValidator
                 })
             End If
 
-                Dim oDataResultsExist As Boolean = False
             Dim oDocResultsExist As Boolean = False
 
-                If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
-                    If Not IsNothing(oDatatableDataResult) Then
-                        If oDatatableDataResult.Rows.Count > 0 Then
-                            oDataResultsExist = True
-                        End If
-                    End If
-
-                End If
             If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
                 If Not IsNothing(oDatatableDocResult) Then
                     If oDatatableDocResult.Rows.Count > 0 Then
@@ -523,22 +535,30 @@ Public Class frmValidator
                 End If
             End If
 
-
+            Return oDocResultsExist
-
+        Else
-                If oDataResultsExist = True Or oDocResultsExist = True Then
+            Return False
-                    bbtniRefreshSearches.Visibility = BarItemVisibility.Always
-
-                    If RibbonPageCustItm1 <> "" Then
-                        BarButtonItemAttmt.Caption = RibbonPageCustItm1
-                        BarButtonItemAttmt.Visibility = BarItemVisibility.Always
-                        Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
-                        toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
-                        ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
         End If
+    End Function
+
+    Public Sub Load_Additional_Searches()
         Try
-                        If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
+            Dim oDocResultsExist = Test_Additional_Doc_Searches_Exist()
-                            _frmValidatorSearch.Show()
+            Dim oDataResultsExist = Test_Additional_Data_Searches_Exist()
-                        End If
+
+            'If Test_Additional_Searches_Exist() Then
+            If oDataResultsExist = True Or oDocResultsExist = True Then
+                'If RibbonPageCustItm1 <> "" Then
+                '    BarButtonItemAttmt.Caption = RibbonPageCustItm1
+                '    BarButtonItemAttmt.Visibility = BarItemVisibility.Always
+                '    Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
+                '    toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
+                '    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                'End If
+                Try
+                    'If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
+                    '_frmValidatorSearch.Show()
+                    'End If
 
                     Dim oPnl1Collapsed As Boolean = True
                     Dim oPnl2Collapsed As Boolean = True
@@ -573,14 +593,17 @@ Public Class frmValidator
                 Catch ex As Exception
                     LOGGER.Error(ex)
                 End Try
+
+                bbtniRefreshSearches.Visibility = BarItemVisibility.Always
             Else
+                bbtniRefreshSearches.Visibility = BarItemVisibility.Never
                 LOGGER.Debug("Not loading AdditionalSearches 1...!")
-                    bbtniRefreshSearches.Visibility = BarItemVisibility.Never
-                End If
-            Else
-                LOGGER.Debug("Not loading AdditionalSearches 2...!")
-                bbtniRefreshSearches.Visibility = BarItemVisibility.Never
             End If
+
+            'Else
+            '    LOGGER.Debug("Not loading AdditionalSearches 2...!")
+            '    bbtniRefreshSearches.Visibility = BarItemVisibility.Never
+            'End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE)
         End Try
@@ -3602,11 +3625,27 @@ Public Class frmValidator
                     RibbonPageGroup2.Visible = False
                 End If
 
-
-
                 'Flag setzen das Indexe geladen sind
                 _Indexe_Loaded = True
+
+                ' Should the custom Ribbon group be displayed at all?
+                ' Will be hidden later if not search results are found
+                If RibbonPageCustItm1 <> "" Then
+                    BarButtonItemAttmt.Caption = RibbonPageCustItm1
+                    BarButtonItemAttmt.Visibility = BarItemVisibility.Always
+                    Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
+                    toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
+                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                Else
+                    BarButtonItemAttmt.Visibility = BarItemVisibility.Never
+                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Never
+                End If
+
+                ' If Searches should be loaded automatically, not only on click
+                If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
+                    _frmValidatorSearch?.Show()
                     Load_Additional_Searches()
+                End If
             Else
                 MsgBox("Für dieses Profil wurde noch keine Eingabemaske definiert!" & vbNewLine & "Informieren Sie Ihren PM-Administrator!" & vbNewLine & "Das Fenster wird geschlossen!", MsgBoxStyle.Exclamation, "Achtung:")
                 Me.Close()
@@ -5472,6 +5511,7 @@ Public Class frmValidator
         Try
             _frmValidatorSearch?.Close()
             _frmValidatorSearch = New frmValidatorSearch
+            _frmValidatorSearch.Show()
         Catch ex As Exception
             LOGGER.Error(ex)
         End Try