MS SQL Overview Connection enable

This commit is contained in:
SchreiberM 2020-12-14 15:39:22 +01:00
parent 4d2ee99a82
commit 8b1d519992
13 changed files with 527 additions and 452 deletions

View File

@ -12,7 +12,7 @@
<applicationSettings> <applicationSettings>
<DD_ProcessManager.My.MySettings> <DD_ProcessManager.My.MySettings>
<setting name="UseAppConfigConString" serializeAs="String"> <setting name="UseAppConfigConString" serializeAs="String">
<value>False</value> <value>True</value>
</setting> </setting>
</DD_ProcessManager.My.MySettings> </DD_ProcessManager.My.MySettings>
<DevExpress.LookAndFeel.Design.AppSettings> <DevExpress.LookAndFeel.Design.AppSettings>

View File

@ -8,6 +8,9 @@ Public Class ClassConfig
Public Property ConnectionStringTest As String = "" Public Property ConnectionStringTest As String = ""
<ConnectionStringAppServer> <ConnectionStringAppServer>
Public Property ConnectionStringAppServer As String = "" Public Property ConnectionStringAppServer As String = ""
<AppServerConfig>
Public Property AppServerConfig As String = ""
Public Property TestMode As Boolean = False Public Property TestMode As Boolean = False
' PDF Viewer Settings ' PDF Viewer Settings

View File

@ -183,7 +183,7 @@
If oExists = False Then If oExists = False Then
Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!" Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
LOGGER.Info(oInfo) LOGGER.Info(oInfo)
SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo) 'SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo)
Delete_Term_Object_From_Metadata(oAttributeName, oOldValueRow.Item(0)) Delete_Term_Object_From_Metadata(oAttributeName, oOldValueRow.Item(0))
End If End If
@ -202,7 +202,7 @@
If oExists = False Then If oExists = False Then
Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!" Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
LOGGER.Info(oInfo2) LOGGER.Info(oInfo2)
SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo2) 'SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo2)
Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
End If End If
Else Else

View File

@ -4,9 +4,9 @@ Imports DLLLicenseManager
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports System.Threading Imports System.Threading
Imports DigitalData.Modules.EDMI.API
Public Class ClassInit Public Class ClassInit
Public _lizenzManager As ClassLicenseManager Public _lizenzManager As ClassLicenseManager
Public Sub New() Public Sub New()
@ -22,6 +22,21 @@ Public Class ClassInit
LOGGER = LOGCONFIG.GetLogger("ProcessManager") LOGGER = LOGCONFIG.GetLogger("ProcessManager")
LOGGER.Info("## ProcessManager started - {0}", Now) LOGGER.Info("## ProcessManager started - {0}", Now)
Try
Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
For Each file As IO.FileInfo In directory.GetFiles
If (Now - file.CreationTime).Days > 29 Then
file.Delete()
Else
Exit For
End If
Next
Catch ex As Exception
End Try
End Sub End Sub
<STAThread()> <STAThread()>
@ -54,6 +69,23 @@ Public Class ClassInit
CONNECTION_STRING_READ = CONNECTION_STRING CONNECTION_STRING_READ = CONNECTION_STRING
End If End If
If CONFIG.Config.AppServerConfig <> String.Empty Then
Try
_Client = New Client(LOGCONFIG, CONFIG.Config.AppServerConfig, 9000)
If Not IsNothing(_Client) Then
If _Client.Connect() Then
APPSERVER_ACTIVE = True
End If
End If
Catch ex As Exception
LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}")
End Try
End If
'VIEWER_UNIVERSAL = CONFIG.Config.UniversalViewerPath 'VIEWER_UNIVERSAL = CONFIG.Config.UniversalViewerPath
'VIEWER_XCHANGE = CONFIG.Config.XChangeViewerPath 'VIEWER_XCHANGE = CONFIG.Config.XChangeViewerPath
'VIEWER_SUMATRA = CONFIG.Config.SumatraViewerPath 'VIEWER_SUMATRA = CONFIG.Config.SumatraViewerPath
@ -120,7 +152,9 @@ Public Class ClassInit
End If End If
End If End If
If dbResult = False Then
If dbResult = False Then
ERROR_STATE = "FAILED DBCONNECTION" ERROR_STATE = "FAILED DBCONNECTION"
MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical) MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical)
Return False Return False

View File

@ -162,6 +162,9 @@
<Reference Include="DigitalData.Modules.Database"> <Reference Include="DigitalData.Modules.Database">
<HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\..\DDMonorepo\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>

View File

@ -9,6 +9,8 @@
Public CONNECTION_STRING_IDB_READ As String = "" Public CONNECTION_STRING_IDB_READ As String = ""
Public CONNECTION_STRING_IDB_WRITE As String = "" Public CONNECTION_STRING_IDB_WRITE As String = ""
Public IDB_ACTIVE As Boolean = False Public IDB_ACTIVE As Boolean = False
Public APPSERVER_ACTIVE As Boolean = False
Public IDB_USES_WMFILESTORE As Boolean = False Public IDB_USES_WMFILESTORE As Boolean = False
Public BASIC_CONF_VISIBLE As Boolean = True Public BASIC_CONF_VISIBLE As Boolean = True
Public IDB_DOC_DATA_SQL As String Public IDB_DOC_DATA_SQL As String

View File

@ -1,7 +1,7 @@
Imports WINDREAMLib Imports WINDREAMLib
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMI.API
Module ModuleRuntimeVariables Module ModuleRuntimeVariables
' Diese Werte müssen später zur Laufzeit geladen werden ' Diese Werte müssen später zur Laufzeit geladen werden
@ -137,4 +137,6 @@ Module ModuleRuntimeVariables
Public MyIndicies As List(Of String) Public MyIndicies As List(Of String)
Public MyIndicies_Types As List(Of Integer) Public MyIndicies_Types As List(Of Integer)
Public _Client As Client
End Module End Module

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.5.8")> <Assembly: AssemblyVersion("2.1.5.9")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -291,7 +291,7 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _ <Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _ Global.System.Configuration.DefaultSettingValueAttribute("True")> _
Public ReadOnly Property UseAppConfigConString() As Boolean Public ReadOnly Property UseAppConfigConString() As Boolean
Get Get
Return CType(Me("UseAppConfigConString"),Boolean) Return CType(Me("UseAppConfigConString"),Boolean)

View File

@ -65,7 +65,7 @@
<Value Profile="(Default)">Normal</Value> <Value Profile="(Default)">Normal</Value>
</Setting> </Setting>
<Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="Application"> <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">False</Value> <Value Profile="(Default)">True</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

View File

@ -46,6 +46,7 @@ Public Class frmMain
Private DT_CHECKUSER_MODULE As DataTable Private DT_CHECKUSER_MODULE As DataTable
Private IsFilterMode As Boolean Private IsFilterMode As Boolean
Private DetailLinkActive As Boolean = False
Private Function GET_LAST_ADDED(pDatatable As DataTable) As String Private Function GET_LAST_ADDED(pDatatable As DataTable) As String
Dim oADDED As String Dim oADDED As String
Try Try
@ -634,9 +635,11 @@ Public Class frmMain
GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString
TimerRefresh.Stop() TimerRefresh.Stop()
GridView_Docs.ShowLoadingPanel() GridView_Docs.ShowLoadingPanel()
DetailLinkActive = True
Await Load_single_Profile(True) Await Load_single_Profile(True)
GridView_Docs.HideLoadingPanel() GridView_Docs.HideLoadingPanel()
TimerRefresh.Start() TimerRefresh.Start()
End If End If
End If End If
End If End If
@ -685,7 +688,7 @@ Public Class frmMain
Next Next
If result = 1 Then If result = 1 Then
ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
Dim oSQL = foundRows(0)("SQL_VIEW") Dim oSQL = foundRows(0)("SQL_VIEW")
@ -699,12 +702,14 @@ Public Class frmMain
oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID)
CURR_DT_OVERVIEW = Await ClassDatabase.Return_DatatableAsync(oSQL, "Load_single_Profile") CURR_DT_OVERVIEW = Await ClassDatabase.Return_DatatableAsync(oSQL, "Load_single_Profile")
If ForceReload = True Then
LOGGER.Info("ForceReload is true!")
End If
Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW)
Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW)
If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then
LOGGER.Info("No changes on OverviewHash - so exit Refresh")
If ForceReload = False Then If ForceReload = False Then
LOGGER.Info("No changes on OverviewHash - so exit Refresh")
Exit Function Exit Function
End If End If
@ -712,7 +717,7 @@ Public Class frmMain
OVERVIEW_ADDED_WHEN = oADDED OVERVIEW_ADDED_WHEN = oADDED
OVERVIEW_CHANGED_WHEN = oChanged OVERVIEW_CHANGED_WHEN = oChanged
End If End If
ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
If CURR_DT_OVERVIEW.Rows.Count = 0 Then If CURR_DT_OVERVIEW.Rows.Count = 0 Then
NO_WORKFLOWITEMS = True NO_WORKFLOWITEMS = True
Else Else
@ -741,30 +746,30 @@ Public Class frmMain
End Try End Try
' Spalte für Status Icon erstellen ' Spalte für Status Icon erstellen
Dim columnStateIcon As New DataColumn() 'Dim columnStateIcon As New DataColumn()
columnStateIcon.DataType = GetType(Image) 'columnStateIcon.DataType = GetType(Image)
columnStateIcon.ColumnName = "ICON" 'columnStateIcon.ColumnName = "ICON"
columnStateIcon.Caption = "" 'columnStateIcon.Caption = ""
CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) 'CURR_DT_OVERVIEW.Columns.Add(columnStateIcon)
RedDocuments = 0 RedDocuments = 0
YellowDocuments = 0 YellowDocuments = 0
GreenDocuments = 0 GreenDocuments = 0
For Each row As DataRow In CURR_DT_OVERVIEW.Rows 'For Each row As DataRow In CURR_DT_OVERVIEW.Rows
Dim State As Integer = row.Item("TL_STATE") ' Dim State As Integer = row.Item("TL_STATE")
Select Case State ' Select Case State
Case 1 ' Case 1
RedDocuments += 1 ' RedDocuments += 1
row.Item("ICON") = My.Resources.ampel_rot ' row.Item("ICON") = My.Resources.ampel_rot
Case 2 ' Case 2
YellowDocuments += 1 ' YellowDocuments += 1
row.Item("ICON") = My.Resources.ampel_gelb ' row.Item("ICON") = My.Resources.ampel_gelb
Case 3 ' Case 3
GreenDocuments += 1 ' GreenDocuments += 1
row.Item("ICON") = My.Resources.ampel_gruen ' row.Item("ICON") = My.Resources.ampel_gruen
End Select ' End Select
Next 'Next
If IDB_ACTIVE = True Then If IDB_ACTIVE = True Then
' Spalte für Conversation erstellen ' Spalte für Conversation erstellen
Dim columnConvIcon As New DataColumn() Dim columnConvIcon As New DataColumn()
@ -1169,17 +1174,22 @@ Public Class frmMain
'Decide_Load() 'Decide_Load()
Try
Dim iterateIndex As Integer = 0
Dim oNewDataTable As DataTable = CURR_DT_OVERVIEW.Copy
For Each row As DataRow In oNewDataTable.Rows
If row("GUID") = CURRENT_DOC_GUID Then
CURR_DT_OVERVIEW.Rows.RemoveAt(iterateIndex)
Exit For
Else
iterateIndex += 1
End If
Next
Catch ex As Exception
LOGGER.Warn("Unexpected Error in Removing Row after Loading Record from Grid: " & ex.Message)
End Try
TimerRefresh.Enabled = True TimerRefresh.Enabled = True
Dim iterateIndex As Integer = 0
Dim oNewDataTable As DataTable = CURR_DT_OVERVIEW.Copy
For Each row As DataRow In oNewDataTable.Rows
If row("GUID") = CURRENT_DOC_GUID Then
CURR_DT_OVERVIEW.Rows.RemoveAt(iterateIndex)
Exit For
Else
iterateIndex += 1
End If
Next
' th = New Threading.Thread(AddressOf Task_A) ' th = New Threading.Thread(AddressOf Task_A)
' th.SetApartmentState(ApartmentState.STA) ' th.SetApartmentState(ApartmentState.STA)
' th.Start() ' th.Start()
@ -1517,7 +1527,13 @@ Public Class frmMain
GridView_Docs.ShowLoadingPanel() GridView_Docs.ShowLoadingPanel()
TimerRefresh.Stop() TimerRefresh.Stop()
Await Load_Grid_Overview(False) Dim oForce As Boolean = False
If DetailLinkActive = True Then
oForce = True
DetailLinkActive = False
OVERVIEW_ADDED_WHEN = ""
End If
Await Load_Grid_Overview(oForce)
GridView_Docs.HideLoadingPanel() GridView_Docs.HideLoadingPanel()
TimerRefresh.Start() TimerRefresh.Start()
RefreshHelper.LoadViewInfo() RefreshHelper.LoadViewInfo()
@ -1527,11 +1543,7 @@ Public Class frmMain
Layout_Single_Profile() Layout_Single_Profile()
GRID_LOAD_TYPE = "OVERVIEW" GRID_LOAD_TYPE = "OVERVIEW"
CURRENT_CLICKED_PROFILE_ID = 0 CURRENT_CLICKED_PROFILE_ID = 0
If USER_LANGUAGE = "de-DE" Then
ToolStripLabelViewTape.Text = "Gesamtübersicht"
Else
ToolStripLabelViewTape.Text = "Overview"
End If
Try Try
bsiMessage.Caption = "" bsiMessage.Caption = ""
@ -1572,8 +1584,8 @@ Public Class frmMain
Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW)
Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW)
If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then
LOGGER.Info("No changes on OverviewHash - so exit Load_Grid_overview")
If ForceReload = False Then If ForceReload = False Then
LOGGER.Info("No changes on OverviewHash - so exit Load_Grid_overview")
Exit Function Exit Function
End If End If
@ -1583,6 +1595,11 @@ Public Class frmMain
OVERVIEW_ADDED_WHEN = oADDED OVERVIEW_ADDED_WHEN = oADDED
OVERVIEW_CHANGED_WHEN = oChanged OVERVIEW_CHANGED_WHEN = oChanged
End If End If
If USER_LANGUAGE = "de-DE" Then
ToolStripLabelViewTape.Text = "Gesamtübersicht"
Else
ToolStripLabelViewTape.Text = "Overview"
End If
NO_WORKFLOWITEMS = False NO_WORKFLOWITEMS = False
If CURR_DT_OVERVIEW.Rows.Count = 0 Then If CURR_DT_OVERVIEW.Rows.Count = 0 Then
If USER_LANGUAGE = "de-DE" Then If USER_LANGUAGE = "de-DE" Then
@ -1614,30 +1631,30 @@ Public Class frmMain
GridControl_Docs.Visible = True GridControl_Docs.Visible = True
' Spalte für Status Icon erstellen ' Spalte für Status Icon erstellen
Dim columnStateIcon As New DataColumn() 'Dim columnStateIcon As New DataColumn()
columnStateIcon.DataType = GetType(Image) 'columnStateIcon.DataType = GetType(Image)
columnStateIcon.ColumnName = "ICON" 'columnStateIcon.ColumnName = "ICON"
columnStateIcon.Caption = "" 'columnStateIcon.Caption = ""
CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) 'CURR_DT_OVERVIEW.Columns.Add(columnStateIcon)
RedDocuments = 0 RedDocuments = 0
YellowDocuments = 0 YellowDocuments = 0
GreenDocuments = 0 GreenDocuments = 0
For Each row As DataRow In CURR_DT_OVERVIEW.Rows 'For Each row As DataRow In CURR_DT_OVERVIEW.Rows
Dim State As Integer = row.Item("TL_STATE") ' Dim State As Integer = row.Item("TL_STATE")
Select Case State ' Select Case State
Case 1 ' Case 1
RedDocuments += 1 ' RedDocuments += 1
row.Item("ICON") = My.Resources.ampel_rot ' row.Item("ICON") = My.Resources.ampel_rot
Case 2 ' Case 2
YellowDocuments += 1 ' YellowDocuments += 1
row.Item("ICON") = My.Resources.ampel_gelb ' row.Item("ICON") = My.Resources.ampel_gelb
Case 3 ' Case 3
GreenDocuments += 1 ' GreenDocuments += 1
row.Item("ICON") = My.Resources.ampel_gruen ' row.Item("ICON") = My.Resources.ampel_gruen
End Select ' End Select
Next 'Next
If IDB_ACTIVE = True Then If IDB_ACTIVE = True Then
' Spalte für Conversation erstellen ' Spalte für Conversation erstellen
Dim columnConvIcon As New DataColumn() Dim columnConvIcon As New DataColumn()
@ -2357,7 +2374,18 @@ Public Class frmMain
Check_Timer_Inactivity() Check_Timer_Inactivity()
Exit Sub Exit Sub
End If End If
If Application.OpenForms().OfType(Of frmAdmin2).Any Then
Check_Timer_Inactivity()
Exit Sub
End If
If Application.OpenForms().OfType(Of frmMonitor).Any Then
Check_Timer_Inactivity()
Exit Sub
End If
If GHOSTMODE_ACTIVE = True Then
Check_Timer_Inactivity()
Exit Sub
End If
INACTIVITYRecognized = True INACTIVITYRecognized = True
Dim omsg As String = "Sie wurden aufgrund von Inaktivität automatisch abgemeldet!" Dim omsg As String = "Sie wurden aufgrund von Inaktivität automatisch abgemeldet!"

View File

@ -39,7 +39,13 @@ Public Class frmSQL_DESIGNER
Else Else
CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2")
End If End If
If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Then
cmbConnection.Enabled = False
btnShowConnections.Enabled = False
Else
cmbConnection.Enabled = True
btnShowConnections.Enabled = True
End If
If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Then If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Then
If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then

File diff suppressed because it is too large Load Diff