From e48739fcf92a9fffa2c2c37bb9fcd8e7595ed896 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 7 Nov 2018 10:54:02 +0100 Subject: [PATCH] jj: fix default value of checkbox --- Global_Indexer/ClassControls.vb | 7 +++++-- Global_Indexer/frmIndex.vb | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb index 78bf70c..4e33aed 100644 --- a/Global_Indexer/ClassControls.vb +++ b/Global_Indexer/ClassControls.vb @@ -1,6 +1,7 @@ Public Class ClassControls Public Shared Function AddCheckBox(indexname As String, y As Integer, vorbelegung As String, caption As String) Try + Dim value As Boolean = False Dim chk As New CheckBox chk.Name = "chk" & indexname chk.Size = New Size(100, 27) @@ -10,15 +11,17 @@ chk.Text = caption chk.Size = New Size(CInt(caption.Length * 15), 27) End If - If vorbelegung <> "" Then + + If Boolean.TryParse(vorbelegung, value) = False Then If vorbelegung = "1" Or vorbelegung = "0" Then chk.Checked = CBool(vorbelegung) Else chk.Checked = False End If Else - chk.Checked = False + chk.Checked = value End If + Return chk Catch ex As Exception ClassLogger.Add("Unhandled Exception in AddCheckBox: " & ex.Message, True) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index e5af6a6..e548074 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -2122,9 +2122,8 @@ Public Class frmIndex End If Select Case type Case "BOOLEAN" - Dim VORBELGUNG As Integer = DefaultValue 'nur eine Textbox - Dim chk As CheckBox = ClassControls.AddCheckBox(DR.Item("NAME"), y, VORBELGUNG, DR.Item("COMMENT").ToString) + Dim chk As CheckBox = ClassControls.AddCheckBox(DR.Item("NAME"), y, DefaultValue, DR.Item("COMMENT").ToString) If Not IsNothing(chk) Then pnlIndex.Controls.Add(chk) End If @@ -2262,7 +2261,6 @@ Public Class frmIndex Dim manIndexwert = GetManIndex_Value(elementOhneSonderzeichen, "IDX_AUTO", optionalIndex) If Not IsNothing(manIndexwert) Then SqlString = SqlString.Replace(element.Value, manIndexwert) - Else ClassLogger.Add(">> Attention: manIndexwert is NOTHING - Funktion: FillIndexe_Autom", False) ' Return False