Prepare for Version 2.0.0.0
This commit is contained in:
@@ -4,14 +4,20 @@ Imports DevExpress.XtraGrid
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DevExpress.XtraGrid.Views.Base
|
||||
Imports DD_LIB_Standards
|
||||
Imports DD_Clipboard_Watcher.ClassProfileFilter
|
||||
|
||||
Public Class frmResultSQL
|
||||
Implements IResultForm
|
||||
|
||||
Private Shared BW_DocPath As String
|
||||
Private Shared BW_DocID As Integer
|
||||
Private Shared CurrSearchID As Integer
|
||||
Private DTDataSearchDefinition As DataTable
|
||||
Private _activeGridView As GridView
|
||||
Private _frmProfileMatch As frmProfileMatch
|
||||
Private Current_MatchingProfiles As List(Of ProfileData)
|
||||
|
||||
Public Property ShouldReturnToMatchForm As Boolean = False Implements IResultForm.ShouldReturnToMatchForm
|
||||
|
||||
Private Class SQLSearch
|
||||
Public DataTable As DataTable
|
||||
@@ -20,6 +26,15 @@ Public Class frmResultSQL
|
||||
Public ProfileId As Integer
|
||||
End Class
|
||||
|
||||
Public Sub New(ProfileMatchForm As frmProfileMatch, MatchingProfiles As List(Of ProfileData))
|
||||
' Dieser Aufruf ist für den Designer erforderlich.
|
||||
InitializeComponent()
|
||||
|
||||
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
|
||||
Current_MatchingProfiles = MatchingProfiles
|
||||
_frmProfileMatch = ProfileMatchForm
|
||||
End Sub
|
||||
|
||||
Private Async Sub frmResultDoc_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If Not ConfigManager.Config.ResultDataWindowSize.IsEmpty Then
|
||||
Size = ConfigManager.Config.ResultDataWindowSize
|
||||
@@ -42,10 +57,6 @@ Public Class frmResultSQL
|
||||
GridViewDataSearch1.HideLoadingPanel()
|
||||
End Sub
|
||||
|
||||
Private Sub frmResultSQL_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
||||
BringToFront()
|
||||
End Sub
|
||||
|
||||
Private Sub frmResultDoc_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||
Try
|
||||
ConfigManager.Config.ResultDataWindowSize = Size
|
||||
@@ -139,11 +150,8 @@ Public Class frmResultSQL
|
||||
End Function
|
||||
|
||||
Private Function DoLoadSearches() As List(Of SQLSearch)
|
||||
If IsNothing(CurrDocSearch2Load) Then
|
||||
Throw New ApplicationException("CurrDataSearch2Load is empty")
|
||||
End If
|
||||
|
||||
Dim oSQL = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({CurrDataSearch2Load}) ORDER BY TAB_INDEX"
|
||||
Dim oMatchingIds = String.Join(",", Current_MatchingProfiles.Select(Function(p) p.Guid).ToArray())
|
||||
Dim oSQL = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
|
||||
Dim oSearchesDataTable = clsDatabase.Return_Datatable(oSQL)
|
||||
Dim oSearches As New List(Of SQLSearch)
|
||||
Dim oCounter As Integer = 0
|
||||
@@ -171,24 +179,6 @@ Public Class frmResultSQL
|
||||
Return oSearches
|
||||
End Function
|
||||
|
||||
'Sub Load_Searches()
|
||||
' If Not IsNothing(CurrDataSearch2Load) Then
|
||||
' Dim oSQL = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({CurrDataSearch2Load}) ORDER BY TAB_INDEX"
|
||||
' DTDataSearchDefinition = clsDatabase.Return_Datatable(oSQL)
|
||||
' Dim ocounter As Integer = 0
|
||||
' If CurrDataSearch2Load.ToString.Contains(",") Then
|
||||
|
||||
' End If
|
||||
' For Each oRow As DataRow In DTDataSearchDefinition.Rows
|
||||
' RefreshTabData(oRow.Item("PROFILE_ID"), oRow.Item("CONN_ID"), oRow.Item("SQL_COMMAND"), ocounter, oRow.Item("TAB_TITLE"))
|
||||
' ocounter += 1
|
||||
' Next
|
||||
' Else
|
||||
' MsgBox("Sorry but the selection of profile went wrong. (CurrSearch2Load is nothing)", MsgBoxStyle.Critical)
|
||||
' Close()
|
||||
' End If
|
||||
'End Sub
|
||||
|
||||
Private Sub MenuItemReload_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
|
||||
Reload_Active_DocumentTab()
|
||||
End Sub
|
||||
@@ -238,4 +228,9 @@ Public Class frmResultSQL
|
||||
'RefreshTabData(oProfileID, oConID, oCommand, oTabIndex, oTabCaption)
|
||||
Reload_Active_DocumentTab()
|
||||
End Sub
|
||||
|
||||
Private Sub btnBackToMatchForm_Click(sender As Object, e As EventArgs) Handles btnBackToMatchForm.Click
|
||||
ShouldReturnToMatchForm = True
|
||||
Close()
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user