From 5d6dc32e22f42779880a0529f0650ddc8afc77d4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 26 Apr 2018 17:20:52 +0200 Subject: [PATCH] jj: work on depending controls --- app/DD_PM_WINDREAM/frmValidator.vb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 9723b0b..761e682 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1060,7 +1060,7 @@ Public Class frmValidator Dim box As TextBox = sender If box.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True Then - If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Or (e.KeyCode = Keys.Enter) Then + If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Or (e.KeyCode = Keys.Enter) Then Try Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name) @@ -1227,16 +1227,15 @@ Public Class frmValidator input_value = cmb1.Text End If sql_Statement = sql_Statement.ToString.Replace(element.Value, input_value) + If LogErrorsOnly = False Then ClassLogger.Add(">>> sql_Statement: " & sql_Statement) Catch ex As Exception ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result ComboBox - ERROR: " & ex.Message) End Try Next - - Dim resultDT As DataTable = ClassDatabase.Return_Datatable_CS(sql_Statement, ROW.Item(1)) - If resultDT.Rows.Count >= 1 Then + If resultDT.Rows.Count = 1 Then 'Nur dediziert einen Wert zurückerhalten For Each row1 As DataRow In resultDT.Rows Dim result = row1.Item(0) @@ -1248,6 +1247,15 @@ Public Class frmValidator Exit For End If Next + ElseIf resultDT.Rows.Count > 1 Then + 'Ist das Control ein Control was mehrfachwerte enthalten kann + If displayboxname.StartsWith(ClassControlCreator.PREFIX_COMBOBOX) Then + + Else + MsgBox("Result contains more than one rows!", MsgBoxStyle.Information) + + End If + ' wenn ja: dann datasource an control anpassen Else pnldesigner.Controls(displayboxname).Text = "NO RESULT" End If