jj 22.06 visible / treeview property

app/DD-Record-Organiser/ClassControlCommands.vb

@@ -192,6 +192,8 @@
             Dim FORMAT_TYPE As String
             Dim SHOW_COLUMN As Integer
             Dim STATIC_LIST As String
+            Dim VISIBLE As Integer
+            Dim TREE_VIEW As Integer
 
             ' So sollte diese Funktion später mal aussehen :(
             'Select Case type
@@ -209,6 +211,7 @@
 
 
             NAME = properties.Name
+            VISIBLE = BoolToInt(properties.Visible)
 
             If propExists(properties, "Multiline") Then
                 MULTILINE = BoolToInt(properties.Multiline)
@@ -222,6 +225,10 @@
                 COL_NAME = String.Empty
             End If
 
+            If Not (type = "RadioButton" Or type = "CheckBox" Or type = "GroupBox") Then
+                TREE_VIEW = BoolToInt(properties.TreeView)
+            End If
+
             If type = "RadioButton" Then
                 DEFAULTVALUE = properties.DefaultValue
             ElseIf type = "CheckBox" Then
@@ -297,11 +304,22 @@
                 CURRENT_CONTROL_ID = properties.ID
             End If
 
-            SQL = "UPDATE TBPMO_CONTROL SET REQUIRED = " & REQUIRED & ", READ_ONLY = " & READ_ONLY & ", SHOW_COLUMN = " & SHOW_COLUMN & _
+            SQL = String.Format(
-                ", FORMAT_TYPE = '" & FORMAT_TYPE & "', DEFAULT_VALUE = '" & DEFAULTVALUE & "', NAME = '" & NAME & "', SQL_COMMAND_1 = '" & SQLCommand & _
+                "UPDATE TBPMO_CONTROL SET REQUIRED = {0}, READ_ONLY = {1}, SHOW_COLUMN = {2}, FORMAT_TYPE = '{3}', DEFAULT_VALUE = '{4}', " &
-                "', CHANGED_WHO = '" & CHANGED_WHO & "', COL_NAME = '" & COL_NAME & "', MULTILINE = " & MULTILINE & ", MASTER_DATA_ID = " & MASTER_DATA_ID & _
+                "NAME = '{5}', SQL_COMMAND_1 = '{6}', CHANGED_WHO = '{7}', COL_NAME = '{8}', MULTILINE = {9}, MASTER_DATA_ID = {10}, " &
-                ", STATIC_LIST = '" & STATIC_LIST & "', SQL_COMMAND_2 = '" & EnabledWhen & _
+                "STATIC_LIST = '{11}', SQL_COMMAND_2 = '{12}', VISIBLE = {13}, TREE_VIEW = {14} " &
-                "' WHERE GUID = " & CURRENT_CONTROL_ID
+                "WHERE GUID = {15}",
+                REQUIRED, READ_ONLY, SHOW_COLUMN, FORMAT_TYPE, DEFAULTVALUE,
+                NAME, SQLCommand, CHANGED_WHO, COL_NAME, MULTILINE, MASTER_DATA_ID,
+                STATIC_LIST, EnabledWhen, VISIBLE, TREE_VIEW,
+                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
 
             If ClassDatabase.Execute_non_Query(SQL) = True Then
                 Return UpdateControlScreen(control, properties)

app/DD-Record-Organiser/ClassControlProperties.vb

@@ -39,6 +39,19 @@ Module ClassControlProperties
         Private _location As Point
         Private _name As String
         Private _hint As String
+        Private _visible As Boolean
+        Private _tree_view As Boolean
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_tree_view")>
+        Public Property TreeView() As Boolean
+            Get
+                Return _tree_view
+            End Get
+            Set(value As Boolean)
+                _tree_view = value
+            End Set
+        End Property
 
         <LocalizedCategoryAttribute("category_info")>
         <LocalizedDescriptionAttribute("desc_id")>
@@ -75,6 +88,17 @@ Module ClassControlProperties
             End Set
         End Property
 
+        <LocalizedCategoryAttribute("category_view")>
+        <LocalizedDescriptionAttribute("desc_visible")>
+        Public Property Visible() As Boolean
+            Get
+                Return _visible
+            End Get
+            Set(value As Boolean)
+                _visible = value
+            End Set
+        End Property
+
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_size")>
         Public Property Size() As Size
@@ -381,6 +405,16 @@ Module ClassControlProperties
         Private _caption As String = ""
         Private _default_value As Boolean = False
 
+        <Browsable(False)>
+        Public Overloads Property TreeView() As Boolean
+            Get
+                Return False
+            End Get
+            Set(value As Boolean)
+                'noop
+            End Set
+        End Property
+
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_caption")>
         Public Property Caption() As String
@@ -411,6 +445,16 @@ Module ClassControlProperties
         Private _caption As String = ""
         Private _default_value As Boolean = False
 
+        <Browsable(False)>
+        Public Overloads Property TreeView() As Boolean
+            Get
+                Return False
+            End Get
+            Set(value As Boolean)
+                'noop
+            End Set
+        End Property
+
 
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_caption")>
@@ -461,6 +505,16 @@ Module ClassControlProperties
         Private _caption As String = ""
         Private _back_color As Color
 
+        <Browsable(False)>
+        Public Overloads Property TreeView() As Boolean
+            Get
+                Return False
+            End Get
+            Set(value As Boolean)
+                'noop
+            End Set
+        End Property
+
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_caption")>
         Public Property Caption() As String

app/DD-Record-Organiser/Strings/ControlProperties.Designer.vb

@@ -423,5 +423,14 @@ Namespace My.Resources
                 Return ResourceManager.GetString("desc_type", resourceCulture)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gibt an, ob das Element angezeigt wird. ähnelt.
+        '''</summary>
+        Friend Shared ReadOnly Property desc_visible() As String
+            Get
+                Return ResourceManager.GetString("desc_visible", resourceCulture)
+            End Get
+        End Property
     End Class
 End Namespace

app/DD-Record-Organiser/Strings/ControlProperties.en.resx

@@ -237,4 +237,7 @@
   <data name="desc_type" xml:space="preserve">
     <value>The element's type</value>
   </data>
+  <data name="desc_visible" xml:space="preserve">
+    <value>Should the element be visible?</value>
+  </data>
 </root>

app/DD-Record-Organiser/Strings/ControlProperties.resx

@@ -237,4 +237,7 @@
   <data name="desc_type" xml:space="preserve">
     <value>Der Typ des Elements</value>
   </data>
+  <data name="desc_visible" xml:space="preserve">
+    <value>Gibt an, ob das Element angezeigt wird.</value>
+  </data>
 </root>

app/DD-Record-Organiser/frmLevel_Designer.vb

@@ -704,6 +704,7 @@
             props.Name = r.Item("CONTROL_NAME")
             props.Size = New Size(r.Item("CTRLSCR_WIDTH"), r.Item("CTRLSCR_HEIGHT"))
             props.Location = New Point(r.Item("CTRLSCR_X_LOC"), r.Item("CTRLSCR_Y_LOC"))
+            props.Visible = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_VISIBLE"), True)
             props.Hint = hint
 
             'Control-spezifische Properties laden
@@ -717,6 +718,7 @@
                     props.ColumnTitle = r.Item("CONTROL_COL_NAME")
                     props.Caption = r.Item("CTRLSCR_CAPTION")
                     props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.TreeView = CBool(r.Item("CONTROL_VISIBLE"))
 
                 Case "Textbox"
                     props.ControlType = "TextBox"
@@ -735,6 +737,7 @@
                     props.Multiline = r.Item("CONTROL_MULTILINE")
                     props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "Combobox"
                     props.ControlType = "ComboBox"
@@ -755,6 +758,7 @@
                     props.ShowColumn = NotNull(CBool(r.Item("CONTROL_SHOW_COLUMN")), True)
                     props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "Checkbox"
                     props.ControlType = "CheckBox"
@@ -800,6 +804,7 @@
                     props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
                     props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "Datagridview"
                     props.ControlType = "DataGridView/Table"
@@ -813,6 +818,7 @@
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
                     props.IsRequired = r.Item("CONTROL_REQUIRED")
                     props.IsReadOnly = r.Item("CONTROL_READ_ONLY")
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "Groupbox"
                     props.ControlType = "GroupBox"
@@ -823,6 +829,7 @@
                     props.ControlType = "PictureBox"
                     props.IsRequired = r.Item("CONTROL_REQUIRED")
                     props.IsReadOnly = r.Item("CONTROL_READ_ONLY")
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "ListBox"
                     props.ControlType = "ListBox"
@@ -837,6 +844,7 @@
                     props.ColumnTitle = ClassConverter.ToStringOrDefault(r.Item("CONTROL_COL_NAME"), ctrl.Name)
                     props.ShowColumn = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_SHOW_COLUMN"), True)
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
 
                 Case "CheckedListBox"
                     props.ControlType = "CheckedListBox"
@@ -852,6 +860,8 @@
                     props.ShowColumn = ClassConverter.ToBooleanOrDefault(r.Item("CONTROL_SHOW_COLUMN"), True)
                     props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
                     props.EnabledWhen = New SQLValue(r.Item("CONTROL_SQLCOMMAND_2").ToString())
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
+
                 Case "DatagridviewCheckable"
                     props.ControlType = "DataGridView/Table Checkable"
                     props.StaticList = New StaticListValue(r.Item("CONTROL_STATIC_LIST").ToString())
@@ -867,6 +877,8 @@
                     props.IsReadOnly = r.Item("CONTROL_READ_ONLY")
                     props.TabStop = r.Item("CTRLSCR_TAB_STOP")
                     props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
+
                 Case "F_AddAppointment"
                     props.ControlType = "Function.AddToCalendar"
                     props.Caption() = r.Item("CTRLSCR_CAPTION")