From c0115d833d97fde5d5209cdcbc6f6b9bc85fb9e8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 28 Jun 2022 08:36:25 +0200 Subject: [PATCH 1/6] Fix FinalIndex database query when no client is available --- app/DD_PM_WINDREAM/frmValidator.vb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 33936d1..9f6df86 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3978,12 +3978,7 @@ Public Class frmValidator ItemWorked = False End If If Not IsNothing(oSQLCommand) Then - Dim oDBResult = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID) - Dim oResultfromSQL As Object = "" - If oDBResult.OK Then - oResultfromSQL = oDBResult.Scalar - End If - + Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID) If Not IsNothing(oResultfromSQL) Then LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]") If IsDBNull(oResultfromSQL) Then From 56c6e6fc1d2fd59aaf41010f6d344b605789a7ec Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 28 Jun 2022 08:37:33 +0200 Subject: [PATCH 2/6] Version 2.3.7.7 --- 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 7efb1b5..0847ca0 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: ' - + From 3ae5c018524119a4d4f40243c944717c8e3f4696 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 10:23:01 +0200 Subject: [PATCH 3/6] Assign both connection ids from sql editor --- app/DD_PM_WINDREAM/ClassSQLEditor.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/DD_PM_WINDREAM/ClassSQLEditor.vb b/app/DD_PM_WINDREAM/ClassSQLEditor.vb index 0f269c2..88c08d6 100644 --- a/app/DD_PM_WINDREAM/ClassSQLEditor.vb +++ b/app/DD_PM_WINDREAM/ClassSQLEditor.vb @@ -19,9 +19,11 @@ Public Class ClassSQLEditor 'CURRENT_DESIGN_TYPE = "INPUT_INDEX" Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) oForm.SQLCommand = SQLSTring + If svc.ShowDialog(oForm) = DialogResult.OK Then Dim sql As New SQLValue(oForm.SQLCommand) CURRENT_SQL_CON = oForm.SQLConnection + CURRENT_CONN_ID = oForm.SQLConnection value = sql End If End Using From d96ed141c6ccd894b02885b19d1bd33518ce9025 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 10:23:36 +0200 Subject: [PATCH 4/6] Version 2.3.7.8 --- 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 0847ca0..dce6405 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: ' - + From 92ef2464c212c5e1969761afd3ddf500c503a680 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 11:16:34 +0200 Subject: [PATCH 5/6] remove continue for for readonly controls --- app/DD_PM_WINDREAM/frmValidator.vb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 9f6df86..488eea3 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -4410,10 +4410,11 @@ Public Class frmValidator Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG")) Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY")) - If oIsReadOnly = True Then + ' WARUM HABEN SIE GEMACHT????!!!!!!einself11 + 'If oIsReadOnly = True Then + ' Continue For + 'End If - Continue For - End If Dim oControlType As String = oControlRow.Item("CTRL_TYPE") Dim oIDBTyp As Integer If IDB_ACTIVE Then From 8aa16e7677ce3dceb72b9d8f308733be6fc4d360 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 8 Jul 2022 11:17:01 +0200 Subject: [PATCH 6/6] Version 2.3.7.9 --- 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 dce6405..b8c2fe1 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: ' - +