MS Release
This commit is contained in:
@@ -5,6 +5,7 @@ Imports DD_LIB_Standards
|
||||
Imports DevExpress.XtraGrid
|
||||
Imports DevExpress.XtraGrid.Views.Base
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DigitalData.GUIs.Common
|
||||
Imports DigitalData.Modules.Language.Utils
|
||||
|
||||
Public Class frmAdministration
|
||||
@@ -228,9 +229,12 @@ Public Class frmAdministration
|
||||
Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles btnWMSuche.Click
|
||||
If IDB_ACTIVE = True Then
|
||||
CURRENT_DESIGN_TYPE = "IDB_SEARCH"
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = Me.WD_SEARCHTextBox.Text}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Me.WD_SEARCHTextBox.Text = oForm.SQLCommand
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = Me.WD_SEARCHTextBox.Text, .SQLConnection = 1}
|
||||
oForm.ShowDialog()
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
Me.WD_SEARCHTextBox.Text = oForm.SQLCommand
|
||||
End If
|
||||
|
||||
Else
|
||||
If Not Me.WD_SEARCHTextBox.Text = "" Then
|
||||
Me.dlgWindreamsuche.FileName = Me.WD_SEARCHTextBox.Text
|
||||
@@ -1201,10 +1205,13 @@ Public Class frmAdministration
|
||||
Private Sub BarButtonItem13_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem13.ItemClick
|
||||
Try
|
||||
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oSQL}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oSQL,
|
||||
.SQLConnection = 1
|
||||
}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
|
||||
BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand
|
||||
End If
|
||||
@@ -1344,10 +1351,10 @@ Public Class frmAdministration
|
||||
Try
|
||||
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
|
||||
CURRENT_DESIGN_TYPE = "SQL_OVERVIEW"
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oSQL}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 1}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''")))
|
||||
BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand
|
||||
End If
|
||||
@@ -1364,10 +1371,12 @@ Public Class frmAdministration
|
||||
CURRENT_DESIGN_TYPE = "SQL_PROFILE"
|
||||
Dim oSQL = $"SELECT [SQL_VIEW] FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}"
|
||||
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oldSQL,
|
||||
.SQLConnection = 1}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
If oldSQL <> oForm.SQLCommand Then
|
||||
Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_VIEW = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}"
|
||||
If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then
|
||||
@@ -1389,10 +1398,12 @@ Public Class frmAdministration
|
||||
CURRENT_DESIGN_TYPE = "SQL_BTNFINISH"
|
||||
Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}"
|
||||
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) ', CONNECTION_STRING_ECM, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH")
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = oldSQL,
|
||||
.SQLConnection = 1}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
If oldSQL <> oForm.SQLCommand Then
|
||||
Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}"
|
||||
If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then
|
||||
@@ -1654,10 +1665,13 @@ Public Class frmAdministration
|
||||
|
||||
Private Sub Series2SQL_Click(sender As Object, e As EventArgs) Handles Series1SQL.Click, Series2SQL.Click, Series3SQL.Click, Series4SQL.Click
|
||||
Dim obutton As Button = sender
|
||||
Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = obutton.Tag}
|
||||
Dim oResult = oForm.ShowDialog()
|
||||
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
|
||||
.SQLCommand = obutton.Tag,
|
||||
.SQLConnection = 1
|
||||
}
|
||||
oForm.ShowDialog()
|
||||
|
||||
If oResult = DialogResult.OK Then
|
||||
If oForm.DialogResult = DialogResult.OK Then
|
||||
If oForm.SQLCommand <> obutton.Tag Then
|
||||
obutton.Tag = oForm.SQLCommand.Replace(" '", "''")
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user