From adf094fd19d76fc512a3835cfd411c97cc4a7f12 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 27 May 2019 13:01:13 +0200 Subject: [PATCH 1/3] MassValidator --- app/DD_PM_WINDREAM/frmMassValidator.vb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 82f12d5..0a1201f 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -1409,7 +1409,7 @@ Public Class frmMassValidator If oMyControlInput = "Unexp. error in GetWM_Value_Multiple_Docs" Then Continue For End If - If oMyControlInput = "(Untersch. Werte)" Then + If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then Continue For End If If oIndexname.StartsWith("[%VKT") Then @@ -1421,7 +1421,7 @@ Public Class frmMassValidator Exit For End If Else - If oMyControlInput = "(Untersch. Werte)" Then + If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then Continue For End If Dim result() As String @@ -1455,6 +1455,9 @@ Public Class frmMassValidator Exit For Else oMyControlInput = oControl.Text + If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then + Continue For + End If 'Wenn der Wert in ein Vektorfeld geschrieben wird If oIndexname.StartsWith("[%VKT") Then oMyControlInput = Return_PM_VEKTOR(oMyControlInput, oIndexname) From 8f2006df78acfe1ebcbd7f88cd8c964c2e8e177b Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 7 Jun 2019 11:41:38 +0200 Subject: [PATCH 2/3] UserInit --- app/DD_PM_WINDREAM/ClassInit.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 27efe14..401c075 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -179,7 +179,7 @@ Public Class ClassInit USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") - USER_RIGHT_FILE_DELETE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL") + USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") From bf3c9d71a5ca617df8bd6405ba9b9569a10d1c94 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 7 Jun 2019 15:34:56 +0200 Subject: [PATCH 3/3] use connectionid for loadsimpledata, version 1.9.6.1 --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmValidator.vb | 2 +- 2 files 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 2c3e8d4..1d4a0b1 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 5f075ca..b119567 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -508,7 +508,7 @@ Public Class frmValidator sql = clsPatterns.ReplaceInternalValues(sql) LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) - dt = ClassDatabase.Return_Datatable(sql) + dt = ClassDatabase.Return_Datatable_CS(sql, connectionId) If IsNothing(dt) Then MsgBox($"SQL-Query for control {control.Name} is invalid.")