diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 42eba17..83e9793 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -397,20 +397,10 @@ Public Class frmValidator My.Settings.frmValidatorSize = Me.Size My.Settings.Save() If INACTIVITY_DURATION <> 0 Then frmMain.Timer_Inactivity_Reset_Disable() - - Try - If Not IsNothing(_frmValidatorSearch) Then - _frmValidatorSearch.Close() - End If - - Catch ex As Exception - - End Try Catch ex As Exception LOGGER.Error(ex) - - End Try + Try Dim oDel = $"DELETE FROM TBPM_FILES_USER_NOT_INDEXED WHERE UPPER(USR_NAME) = UPPER('{USER_USERNAME}')" ClassDatabase.Execute_non_Query(oDel) @@ -435,7 +425,11 @@ Public Class frmValidator LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}") End Try - + Try + _frmValidatorSearch.Close() + Catch ex As Exception + LOGGER.Error(ex) + End Try End Sub Public Sub Load_Additional_Searches() Try @@ -490,38 +484,43 @@ Public Class frmValidator Else RibbonPageCust.Visible = False End If - _frmValidatorSearch.Show() - Dim oPnl1Collapsed As Boolean = True - Dim oPnl2Collapsed As Boolean = True - If oDataResultsExist = True Then - oPnl1Collapsed = False - Else - oPnl1Collapsed = True - End If - If oDocResultsExist = True Then - oPnl2Collapsed = False - Else - oPnl2Collapsed = True - End If - _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count, - BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC) - If oDataResultsExist Then - _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) - _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) - End If - If oDocResultsExist Then - _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + Try + _frmValidatorSearch.Show() - _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) - End If + Dim oPnl1Collapsed As Boolean = True + Dim oPnl2Collapsed As Boolean = True + If oDataResultsExist = True Then + oPnl1Collapsed = False + Else + oPnl1Collapsed = True + End If + If oDocResultsExist = True Then + oPnl2Collapsed = False + Else + oPnl2Collapsed = True + End If + _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count, + BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC) + If oDataResultsExist Then + _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL + Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") + Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) + End If + If oDocResultsExist Then + _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC + Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") + Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + oCommand = clsPatterns.ReplaceAllValues(oCommand, pnldesigner, True) + + _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) + End If + Catch ex As Exception + LOGGER.Error(ex) + End Try Else LOGGER.Info("Not loading AdditionalSearches 1...!") bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never @@ -3622,7 +3621,7 @@ Public Class frmValidator Controls2beDisabled() BringToFront() If bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Then - _frmValidatorSearch.BringToFront() + _frmValidatorSearch?.BringToFront() End If FormLoaded = True @@ -5375,10 +5374,10 @@ Public Class frmValidator End Sub Sub Click_Additional_Searches() Try - _frmValidatorSearch.Close() + _frmValidatorSearch?.Close() _frmValidatorSearch = New frmValidatorSearch Catch ex As Exception - + LOGGER.Error(ex) End Try Load_Additional_Searches() End Sub