From 9b795bdc69c856fd7858bbd8d6c0429fe2b0f01d Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Mon, 23 Nov 2015 12:28:39 +0100
Subject: [PATCH] version 2.0.1.0 - radiobutton fix

---
 .../ClassControlValuesConverter.vb            | 40 +++++++++++++++++++
 .../DD-Record-Organiser.vbproj                |  1 +
 .../My Project/AssemblyInfo.vb                |  2 +-
 .../frmTool_ControlProperties.vb              | 12 +++---
 app/SetupWiX/Product.wxs                      |  2 +-
 5 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 app/DD-Record-Organiser/ClassControlValuesConverter.vb

diff --git a/app/DD-Record-Organiser/ClassControlValuesConverter.vb b/app/DD-Record-Organiser/ClassControlValuesConverter.vb
new file mode 100644
index 0000000..65466cb
--- /dev/null
+++ b/app/DD-Record-Organiser/ClassControlValuesConverter.vb
@@ -0,0 +1,40 @@
+Public Class ClassControlValuesConverter
+
+    Public Shared Function ToBooleanOrDefault(value As Object, Optional defaultValue As Boolean = False)
+        Try
+            If IsDBNull(value) OrElse value = "" Then
+                Return defaultValue
+            Else
+                Return Convert.ToBoolean(value)
+            End If
+        Catch ex As Exception
+            Return defaultValue
+        End Try
+    End Function
+
+    Public Shared Function ToStringOrDefault(value As Object, Optional defaultValue As String = "")
+        Try
+            If IsDBNull(value) OrElse String.IsNullOrEmpty(value) Then
+                Return defaultValue
+            Else
+                Return Convert.ToString(value)
+            End If
+        Catch ex As Exception
+            Return defaultValue
+        End Try
+    End Function
+
+
+    Public Shared Function ToIntOrDefault(value As Object, Optional defaultValue As Integer = 0)
+        Try
+            If IsDBNull(value) Then
+                Return defaultValue
+            Else
+                Return Convert.ToInt16(value)
+            End If
+        Catch ex As Exception
+            Return defaultValue
+        End Try
+    End Function
+
+End Class
diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
index c98ba26..5701427 100644
--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@@ -234,6 +234,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ClassControlValuesConverter.vb" />
     <Compile Include="frmAbout.designer.vb">
       <DependentUpon>frmAbout.vb</DependentUpon>
     </Compile>
diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb
index 1ea8a63..ee082da 100644
--- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb	
+++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.0")> 
+<Assembly: AssemblyVersion("2.0.1.0")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/app/DD-Record-Organiser/frmTool_ControlProperties.vb b/app/DD-Record-Organiser/frmTool_ControlProperties.vb
index ff76204..c88f99e 100644
--- a/app/DD-Record-Organiser/frmTool_ControlProperties.vb
+++ b/app/DD-Record-Organiser/frmTool_ControlProperties.vb
@@ -105,11 +105,13 @@
                         Case "RadioButton"
                             props = New RadioButtonProperties()
                             props.Caption = row.Item("CTRLSCR_CAPTION")
-                            If Not IsDBNull(row.Item("CONTROL_DEF_VALUE")) Then
-                                props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
-                            Else
-                                props.DefaultValue = False
-                            End If
+
+                            props.DefaultValue = ClassControlValuesConverter.ToBooleanOrDefault(row.Item("CONTROL_DEF_VALUE"))
+                            'If Not IsDBNull(row.Item("CONTROL_DEF_VALUE")) Then
+                            '    props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
+                            'Else
+                            '    props.DefaultValue = False
+                            'End If
                         Case "F_AddAppointment"
                             props = New FunctionAddAppointment()
                         Case "F_AddFormData"
diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs
index e0389d8..0d589f3 100644
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="2.0.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="2.0.1.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
     <Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
     
     <!-- Nicht entfernen! -->