jj 23.06

app/DD-Record-Organizer/ClassControlCommands.vb

@@ -196,9 +196,9 @@
     End Function
 
     Public Shared Function UpdateControl(control As Control, properties As Object)
-        ' Try
-        ' Nach Typ den Update Befehl anpassen
-        Dim type As String = control.GetType.Name
+        Try
+            ' Nach Typ den Update Befehl anpassen
+            Dim type As String = control.GetType.Name
 
             Dim SQL As String
             Dim NAME As String
@@ -208,7 +208,7 @@
             Dim CHANGED_WHO As String = USER_USERNAME
             Dim COL_NAME As String
             Dim SQLCommand As String
-            Dim EnabledWhen As String
+            Dim SQL_ENABLED_WHEN As String
             Dim MULTILINE As Integer
             Dim MASTER_DATA_ID As Integer
             Dim DEFAULTVALUE As String
@@ -217,6 +217,8 @@
             Dim STATIC_LIST As String
             Dim VISIBLE As Integer
             Dim TREE_VIEW As Integer
+            Dim AUTO_SUGGEST As Integer
+
 
             ' So sollte diese Funktion später mal aussehen :(
             'Select Case type
@@ -242,6 +244,12 @@
                 MULTILINE = 0
             End If
 
+            If propExists(properties, "AutoSuggest") Then
+                AUTO_SUGGEST = BoolToInt(properties.AutoSuggest)
+            Else
+                AUTO_SUGGEST = 0
+            End If
+
             If propExists(properties, "ColumnTitle") Then
                 COL_NAME = properties.ColumnTitle
             Else
@@ -307,12 +315,12 @@
 
             If propExists(properties, "EnabledWhen") Then
                 Dim value As SQLValue = DirectCast(properties.EnabledWhen, SQLValue)
-                EnabledWhen = value.Value
-                If EnabledWhen.Contains("'") Then
-                    EnabledWhen = EnabledWhen.Replace("'", "''")
+                SQL_ENABLED_WHEN = value.Value
+                If SQL_ENABLED_WHEN.Contains("'") Then
+                    SQL_ENABLED_WHEN = SQL_ENABLED_WHEN.Replace("'", "''")
                 End If
             Else
-                EnabledWhen = String.Empty
+                SQL_ENABLED_WHEN = String.Empty
             End If
 
             If propExists(properties, "StaticList") Then
@@ -333,33 +341,21 @@
                 CURRENT_CONTROL_ID = properties.ID
             End If
 
-            SQL = String.Format(
-                "UPDATE TBPMO_CONTROL SET REQUIRED = {0}, READ_ONLY = {1}, SHOW_COLUMN = {2}, FORMAT_TYPE = '{3}', DEFAULT_VALUE = '{4}', " &
-                "NAME = '{5}', SQL_COMMAND_1 = '{6}', CHANGED_WHO = '{7}', COL_NAME = '{8}', MULTILINE = {9}, MASTER_DATA_ID = {10}, " &
-                "STATIC_LIST = '{11}', SQL_COMMAND_2 = '{12}', VISIBLE = {13}, TREE_VIEW = {14}, SELECT_ONLY = {15} " &
-                "WHERE GUID = {16}",
-                REQUIRED, READ_ONLY, SHOW_COLUMN, FORMAT_TYPE, DEFAULTVALUE,
-                NAME, SQLCommand, CHANGED_WHO, COL_NAME, MULTILINE, MASTER_DATA_ID,
-                STATIC_LIST, EnabledWhen, VISIBLE, TREE_VIEW, SELECT_ONLY,
-                CURRENT_CONTROL_ID
-            )
-
-            'SQL = "UPDATE TBPMO_CONTROL SET REQUIRED = " & REQUIRED & ", READ_ONLY = " & READ_ONLY & ", SHOW_COLUMN = " & SHOW_COLUMN & _
-            '    ", FORMAT_TYPE = '" & FORMAT_TYPE & "', DEFAULT_VALUE = '" & DEFAULTVALUE & "', NAME = '" & NAME & "', SQL_COMMAND_1 = '" & SQLCommand & _
-            '    "', CHANGED_WHO = '" & CHANGED_WHO & "', COL_NAME = '" & COL_NAME & "', MULTILINE = " & MULTILINE & ", MASTER_DATA_ID = " & MASTER_DATA_ID & _
-            '    ", STATIC_LIST = '" & STATIC_LIST & "', SQL_COMMAND_2 = '" & EnabledWhen & "', VISIBLE = " & VISIBLE & ", TREE_VIEW = " & TREE_VIEW & _
-            '    " WHERE GUID = " & CURRENT_CONTROL_ID
+            SQL = $"UPDATE TBPMO_CONTROL SET REQUIRED = {REQUIRED}, READ_ONLY = {READ_ONLY}, SHOW_COLUMN = {SHOW_COLUMN}, FORMAT_TYPE = '{FORMAT_TYPE}', DEFAULT_VALUE = '{DEFAULTVALUE}', 
+                    NAME = '{NAME}', SQL_COMMAND_1 = '{SQLCommand}', CHANGED_WHO = '{CHANGED_WHO}', COL_NAME = '{COL_NAME}', MULTILINE = {MULTILINE}, MASTER_DATA_ID = {MASTER_DATA_ID}, 
+                    STATIC_LIST = '{STATIC_LIST}',  SQL_COMMAND_2 = '{SQL_ENABLED_WHEN}', VISIBLE = {VISIBLE}, TREE_VIEW = {TREE_VIEW}, SELECT_ONLY = {SELECT_ONLY}, AUTO_SUGGEST = {AUTO_SUGGEST} 
+                    WHERE GUID = {CURRENT_CONTROL_ID}"
 
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 Return UpdateControlScreen(control, properties)
             Else
                 Throw New Exception()
             End If
-        'Catch ex As Exception
-        '    ClassLogger.Add("Unexpected Error in UpdateControl: " & ex.Message, True)
-        '    MsgBox("Unexpected Error in UpdateControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
-        '    Return False
-        'End Try
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in UpdateControl: " & ex.Message, True)
+            MsgBox("Unexpected Error in UpdateControl:" + vbNewLine + ex.Message, MsgBoxStyle.Critical)
+            Return False
+        End Try
     End Function
 
     Public Shared Function UpdateControlScreen(control As Control, properties As Object)