From 5e0a462f0e22cab9fcba42fc36b16d389e5bdf62 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 26 Jul 2022 10:26:47 +0200 Subject: [PATCH 1/2] Show Control names in Final Indexing SQL --- app/DD_PM_WINDREAM/ClassSQLEditor.vb | 2 +- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 1 + app/DD_PM_WINDREAM/frmAdministration.vb | 12 +++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassSQLEditor.vb b/app/DD_PM_WINDREAM/ClassSQLEditor.vb index fff9ccb..81722a8 100644 --- a/app/DD_PM_WINDREAM/ClassSQLEditor.vb +++ b/app/DD_PM_WINDREAM/ClassSQLEditor.vb @@ -22,7 +22,7 @@ Public Class ClassSQLEditor oForm.PlaceholdersManualPrefix = "CTRL" oForm.PlaceholdersManualTitle = "Controls" - oForm.PlaceholdersManual = CURRENT_CONTROL_LIST.ToDictionary(Function(control) control.Name, Function(control) control.Name) + oForm.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) If svc.ShowDialog(oForm) = DialogResult.OK Then Dim sql As New SQLValue(oForm.SQLCommand) diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index ce7de2a..f969c52 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -131,6 +131,7 @@ Module ModuleRuntimeVariables Public Property CURRENT_DT_PROFILE As DataTable Public Property CURRENT_CONTROL_LIST As New List(Of Control) + Public Property CURRENT_CONTROL_NAME_LIST As New List(Of String) Public CURRENT_INDEX_ARRAY(100, 250) As String diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 49d647d..6fe4bc6 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -290,9 +290,11 @@ Public Class frmAdministration TabControl1.SelectedIndex = 0 Exit Sub End If + + TBPROFILE_USERTableAdapter.Fill(DD_DMSLiteDataSet.TBPROFILE_USER, profileId) TBPROFILE_GROUPTableAdapter.Fill(DD_DMSLiteDataSet.TBPROFILE_GROUP, profileId) - Me.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter.Fill(Me.DD_DMSLiteDataSet.FNPM_GET_FREE_USER_FOR_PROFILE, profileId) + FNPM_GET_FREE_USER_FOR_PROFILETableAdapter.Fill(DD_DMSLiteDataSet.FNPM_GET_FREE_USER_FOR_PROFILE, profileId) TBDD_GROUPSTableAdapter.FillByProfileId_NotAssigned(DD_DMSLiteDataSet.TBDD_GROUPS, profileId) Catch ex As Exception @@ -1707,12 +1709,16 @@ Public Class frmAdministration End Sub Private Sub PROFILGUIDTextBox_TextChanged(sender As Object, e As EventArgs) Handles PROFILGUIDTextBox.TextChanged - If IsNumeric(PROFILGUIDTextBox.Text) Then CURRENT_ProfilGUID = PROFILGUIDTextBox.Text 'UNSAVED_CHANGES_PROFILE = False PROFILEBS_POS = TBPM_PROFILEBindingSource.Position - ' change_BindingSource = False + 'change_BindingSource = False + + TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, CURRENT_ProfilGUID) + CURRENT_CONTROL_NAME_LIST = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.AsEnumerable(). + Select(Function(row) row.NAME). + ToList() End If End Sub From 2c9d22a33a5f3e1a7c83685972e5382005a21fa1 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 26 Jul 2022 10:42:18 +0200 Subject: [PATCH 2/2] Version 2.3.7.11 --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 70408dc..a575637 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +