fix sql not being saved on new man index

This commit is contained in:
Jonathan Jenne 2020-07-03 11:55:29 +02:00
parent 8d2e5be621
commit ebf08aa141
3 changed files with 2030 additions and 856 deletions

View File

@ -274,8 +274,8 @@ Partial Class frmAdministration
Me.TextBox7 = New System.Windows.Forms.TextBox()
Me.XtraTabPageUsersGroups = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
Me.tabPageUsers = New DevExpress.XtraTab.XtraTabPage()
Me.tabPageGroups = New DevExpress.XtraTab.XtraTabPage()
Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBDD_EINGANGSARTENBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBDD_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@ -300,6 +300,8 @@ Partial Class frmAdministration
Me.TBGI_REGEX_DOCTYPETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPage8 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.txtManIndexSQL = New System.Windows.Forms.TextBox()
Me.txtManIndexConnectionId = New System.Windows.Forms.TextBox()
GUIDLabel = New System.Windows.Forms.Label()
GUIDLabel1 = New System.Windows.Forms.Label()
NAMELabel = New System.Windows.Forms.Label()
@ -389,8 +391,8 @@ Partial Class frmAdministration
Me.XtraTabPageUsersGroups.SuspendLayout()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl3.SuspendLayout()
Me.XtraTabPage1.SuspendLayout()
Me.XtraTabPage2.SuspendLayout()
Me.tabPageUsers.SuspendLayout()
Me.tabPageGroups.SuspendLayout()
CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_EINGANGSARTENBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -1292,6 +1294,8 @@ Partial Class frmAdministration
'
'Panel1
'
Me.Panel1.Controls.Add(Me.txtManIndexConnectionId)
Me.Panel1.Controls.Add(Me.txtManIndexSQL)
Me.Panel1.Controls.Add(Me.ACTIVECheckBox)
Me.Panel1.Controls.Add(Me.GUIDTextBox1)
Me.Panel1.Controls.Add(Me.VKT_PREVENT_MULTIPLE_VALUESCheckbox)
@ -2239,24 +2243,24 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.XtraTabControl3, "XtraTabControl3")
Me.XtraTabControl3.Name = "XtraTabControl3"
Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPage1
Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage1})
Me.XtraTabControl3.SelectedTabPage = Me.tabPageUsers
Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageGroups, Me.tabPageUsers})
'
'XtraTabPage1
'tabPageUsers
'
Me.XtraTabPage1.Controls.Add(Me.SplitContainerControl2)
Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage1.Name = "XtraTabPage1"
resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
Me.tabPageUsers.Controls.Add(Me.SplitContainerControl2)
Me.tabPageUsers.ImageOptions.SvgImage = CType(resources.GetObject("tabPageUsers.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabPageUsers.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.tabPageUsers.Name = "tabPageUsers"
resources.ApplyResources(Me.tabPageUsers, "tabPageUsers")
'
'XtraTabPage2
'tabPageGroups
'
Me.XtraTabPage2.Controls.Add(Me.SplitContainerControl5)
Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage2.Name = "XtraTabPage2"
resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
Me.tabPageGroups.Controls.Add(Me.SplitContainerControl5)
Me.tabPageGroups.ImageOptions.SvgImage = CType(resources.GetObject("tabPageGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabPageGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.tabPageGroups.Name = "tabPageGroups"
resources.ApplyResources(Me.tabPageGroups, "tabPageGroups")
'
'TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource
'
@ -2381,6 +2385,18 @@ Partial Class frmAdministration
Me.RibbonPage8.Name = "RibbonPage8"
resources.ApplyResources(Me.RibbonPage8, "RibbonPage8")
'
'txtManIndexSQL
'
Me.txtManIndexSQL.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "SQL_RESULT", True))
resources.ApplyResources(Me.txtManIndexSQL, "txtManIndexSQL")
Me.txtManIndexSQL.Name = "txtManIndexSQL"
'
'txtManIndexConnectionId
'
Me.txtManIndexConnectionId.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "CONNECTION_ID", True))
resources.ApplyResources(Me.txtManIndexConnectionId, "txtManIndexConnectionId")
Me.txtManIndexConnectionId.Name = "txtManIndexConnectionId"
'
'frmAdministration
'
Me.Appearance.Options.UseFont = True
@ -2444,8 +2460,8 @@ Partial Class frmAdministration
Me.XtraTabPageUsersGroups.ResumeLayout(False)
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl3.ResumeLayout(False)
Me.XtraTabPage1.ResumeLayout(False)
Me.XtraTabPage2.ResumeLayout(False)
Me.tabPageUsers.ResumeLayout(False)
Me.tabPageGroups.ResumeLayout(False)
CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_EINGANGSARTENBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@ -2662,8 +2678,8 @@ Partial Class frmAdministration
Friend WithEvents ListBoxControl4 As DevExpress.XtraEditors.ListBoxControl
Friend WithEvents ListBox1 As ListBox
Friend WithEvents XtraTabControl3 As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents tabPageUsers As DevExpress.XtraTab.XtraTabPage
Friend WithEvents tabPageGroups As DevExpress.XtraTab.XtraTabPage
Friend WithEvents SplitContainerControl5 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents gridAssignedUsers As DevExpress.XtraGrid.GridControl
Friend WithEvents viewAssignedUsers As DevExpress.XtraGrid.Views.Grid.GridView
@ -2688,4 +2704,6 @@ Partial Class frmAdministration
Friend WithEvents BarButtonItem33 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents Panel1 As Panel
Friend WithEvents SplitContainerControl4 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents txtManIndexSQL As TextBox
Friend WithEvents txtManIndexConnectionId As TextBox
End Class

File diff suppressed because it is too large Load Diff

View File

@ -466,37 +466,29 @@ Public Class frmAdministration
End Sub
Private Sub btnSQLView_Click(sender As Object, e As EventArgs) Handles btnSQLView.Click
Save_IndexMan()
'CURRENT_INDEXMAN = GUIDTextBox1.Text
'frmSQLSuggestion.ShowDialog()
Dim oIndexGuid As Integer = GUIDTextBox1.Text
Dim oDocTypeGuid As Integer = DOKART_GUIDTextBox.Text
Dim oSQLCommand = ""
Try
Dim oSQL = $"SELECT SQL_RESULT, CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = {oIndexGuid}"
Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL)
Dim oRow = oDatatable.Rows.Item(0)
Dim oConnection As Integer = 1
Dim oSQLCommand = ""
If Not IsDBNull(oRow.Item("CONNECTION_ID")) Then
oConnection = oRow.Item("CONNECTION_ID")
If txtManIndexConnectionId.Text <> String.Empty Then
oConnection = txtManIndexConnectionId.Text
End If
If txtManIndexSQL.Text <> String.Empty Then
oSQLCommand = txtManIndexSQL.Text
End If
Dim oForm As New frmSQL_DESIGNER(oIndexGuid, oDocTypeGuid) With {
.SQLCommand = oRow.Item("SQL_RESULT"),
.SQLCommand = oSQLCommand,
.ConnectionID = oConnection
}
If oForm.ShowDialog() = DialogResult.OK Then
oSQLCommand = oForm.SQLCommand.Replace("'", "''")
Dim oConnectionId = oForm.SQLConnectionId
oSQL = $"UPDATE TBDD_INDEX_MAN SET CONNECTION_ID = {oConnectionId},SQL_RESULT = '{oSQLCommand}',CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {oIndexGuid}"
ClassDatabase.Execute_non_Query(oSQL, True)
txtManIndexSQL.Text = oForm.SQLCommand
txtManIndexConnectionId.Text = oForm.SQLConnectionId
End If
Catch ex As Exception
LOGGER.Error(ex)