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

MS Merge

Browse Source
This commit is contained in:
SchreiberM 2021-03-25 15:47:42 +01:00
commit abf485d5d1
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -397,20 +397,10 @@ Public Class frmValidator
My.Settings.frmValidatorSize = Me.Size My.Settings.frmValidatorSize = Me.Size
My.Settings.Save() My.Settings.Save()
If INACTIVITY_DURATION <> 0 Then frmMain.Timer_Inactivity_Reset_Disable() 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 Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
End Try End Try
Try Try
Dim oDel = $"DELETE FROM TBPM_FILES_USER_NOT_INDEXED WHERE UPPER(USR_NAME) = UPPER('{USER_USERNAME}')" Dim oDel = $"DELETE FROM TBPM_FILES_USER_NOT_INDEXED WHERE UPPER(USR_NAME) = UPPER('{USER_USERNAME}')"
ClassDatabase.Execute_non_Query(oDel) ClassDatabase.Execute_non_Query(oDel)
@ -435,7 +425,11 @@ Public Class frmValidator
LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}") LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}")
End Try End Try
Try
_frmValidatorSearch.Close()
Catch ex As Exception
LOGGER.Error(ex)
End Try
End Sub End Sub
Public Sub Load_Additional_Searches() Public Sub Load_Additional_Searches()
Try Try
@ -490,38 +484,43 @@ Public Class frmValidator
Else Else
RibbonPageCust.Visible = False RibbonPageCust.Visible = False
End If 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")) Try
End If _frmValidatorSearch.Show()
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")) Dim oPnl1Collapsed As Boolean = True
End If 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 Else
LOGGER.Info("Not loading AdditionalSearches 1...!") LOGGER.Info("Not loading AdditionalSearches 1...!")
bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
@ -3622,7 +3621,7 @@ Public Class frmValidator
Controls2beDisabled() Controls2beDisabled()
BringToFront() BringToFront()
If bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Then If bbtniRefreshSearches.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Then
_frmValidatorSearch.BringToFront() _frmValidatorSearch?.BringToFront()
End If End If
FormLoaded = True FormLoaded = True
@ -5375,10 +5374,10 @@ Public Class frmValidator
End Sub End Sub
Sub Click_Additional_Searches() Sub Click_Additional_Searches()
Try Try
_frmValidatorSearch.Close() _frmValidatorSearch?.Close()
_frmValidatorSearch = New frmValidatorSearch _frmValidatorSearch = New frmValidatorSearch
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex)
End Try End Try
Load_Additional_Searches() Load_Additional_Searches()
End Sub End Sub