From e49713246b0f67f67c42b25ffb1f6ebb234f1af5 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Fri, 5 Jun 2026 10:53:31 +0200 Subject: [PATCH] Erweiterung von frmSQLEditor-Initialisierung MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Die Initialisierung des Formulars `frmSQLEditor` wurde in den Klassen `frmColumn_Detail` und `frmFormDesigner` erweitert. Neue Eigenschaften wie `PlaceholdersManualPrefix`, `PlaceholdersManualTitle` und `PlaceholdersManual` wurden hinzugefügt. Eine Bedingung für `IDB_ACTIVE` wurde eingeführt, um die Eigenschaften `ATTRIBUTE_STORE` und `PlaceholdersWindream` dynamisch zu setzen. Die Eigenschaft `SQLConnection` wurde in beiden Klassen auf `1` geändert. --- app/TaskFlow/My Project/AssemblyInfo.vb | 2 +- app/TaskFlow/frmColumn_Detail.vb | 15 ++++++++++++--- app/TaskFlow/frmFormDesigner.vb | 19 +++++++++++++------ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 6fdfa83..127fba6 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index c9ba846..ddb01ee 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -136,9 +136,18 @@ Public Class frmColumn_Detail CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" CURRENT_INDEX_ID = GUIDTextBox.Text Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { - .SQLCommand = SQL_COMMANDTextBox.Text, - .SQLConnection = 0 - } + .SQLCommand = SQL_COMMANDTextBox.Text, + .SQLConnection = 1, + .PlaceholdersManualPrefix = "CTRL", + .PlaceholdersManualTitle = "Controls", + .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) + } + If IDB_ACTIVE = False Then + oForm2.ATTRIBUTE_STORE = "WM" + oForm2.PlaceholdersWindream = MVSource_AllIndicies + Else + oForm2.ATTRIBUTE_STORE = "IDB" + End If oForm2.ShowDialog() If oForm2.DialogResult = DialogResult.OK Then diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 24aa955..848aa4a 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -1021,12 +1021,19 @@ Public Class frmFormDesigner Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { - .SQLCommand = oldSQL, - .SQLConnection = 1, - .PlaceholdersManualPrefix = "CTRL", - .PlaceholdersManualTitle = "Controls", - .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) - } + .SQLCommand = oldSQL, + .SQLConnection = 1, + .PlaceholdersManualPrefix = "CTRL", + .PlaceholdersManualTitle = "Controls", + .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) + } + If IDB_ACTIVE = False Then + oForm.ATTRIBUTE_STORE = "WM" + oForm.PlaceholdersWindream = MVSource_AllIndicies + Else + oForm.ATTRIBUTE_STORE = "IDB" + End If + oForm.ShowDialog() If oForm.DialogResult = DialogResult.OK Then