From 93057172cd3fe46106485fa5a7afdec200ce287a Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Mon, 13 Mar 2017 14:22:42 +0100
Subject: [PATCH] jj 13.03

---
 .../ClassControlProperties.vb                 | 117 ++++++++++++++----
 .../frmConstructor_Main.vb                    |   2 +-
 2 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/app/DD-Record-Organizer/ClassControlProperties.vb b/app/DD-Record-Organizer/ClassControlProperties.vb
index 0007b4c..e653a00 100644
--- a/app/DD-Record-Organizer/ClassControlProperties.vb
+++ b/app/DD-Record-Organizer/ClassControlProperties.vb
@@ -142,9 +142,7 @@ Module ClassControlProperties
         Private _location As Point
         Private _name As String = ""
         Private _column_title = ""
-        ' Other Configurations
-        Private _required As Boolean = False
-        Private _read_only As Boolean = False
+
         ' Database Configurations
         Private _sql_command As String = ""
         Private _sql_command_2 As String = "" 'EnabledWhen
@@ -163,28 +161,6 @@ Module ClassControlProperties
             End Set
         End Property
 
-        <LocalizedCategoryAttribute("category_other")>
-        <LocalizedDescriptionAttribute("desc_required")>
-        Public Property IsRequired() As Boolean
-            Get
-                Return _required
-            End Get
-            Set(value As Boolean)
-                _required = value
-            End Set
-        End Property
-
-        <LocalizedCategoryAttribute("category_other")>
-        <LocalizedDescriptionAttribute("desc_readonly")>
-        Public Property IsReadOnly() As Boolean
-            Get
-                Return _read_only
-            End Get
-            Set(value As Boolean)
-                _read_only = value
-            End Set
-        End Property
-
         <LocalizedCategoryAttribute("category_database")>
         <LocalizedDescriptionAttribute("desc_sqlcommand")>
         Public Property SQLCommand() As SQLValue
@@ -238,6 +214,32 @@ Module ClassControlProperties
         Private _tab_stop As Boolean
         Private _show_column As Boolean
 
+        ' Other Configurations
+        Private _required As Boolean = False
+        Private _read_only As Boolean = False
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_required")>
+        Public Property IsRequired() As Boolean
+            Get
+                Return _required
+            End Get
+            Set(value As Boolean)
+                _required = value
+            End Set
+        End Property
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_readonly")>
+        Public Property IsReadOnly() As Boolean
+            Get
+                Return _read_only
+            End Get
+            Set(value As Boolean)
+                _read_only = value
+            End Set
+        End Property
+
         <LocalizedCategoryAttribute("category_other")>
         <LocalizedDescriptionAttribute("desc_tabindex")>
         Public Property TabIndex() As Integer
@@ -302,6 +304,18 @@ Module ClassControlProperties
             End Set
         End Property
 
+        <Browsable(False)>
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_tree_view")>
+        Public Overloads Property TreeView() As Boolean
+            Get
+                Return False
+            End Get
+            Set(value As Boolean)
+                '_tree_view = value
+            End Set
+        End Property
+
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_caption")>
         Public Property Caption() As String
@@ -496,6 +510,9 @@ Module ClassControlProperties
         Inherits CommonProperties
 
         Private _show_column As Boolean
+        Private _required As Boolean
+        Private _read_only As Boolean
+        Private _tree_view As Boolean
 
         <LocalizedCategoryAttribute("category_view")>
         <LocalizedDescriptionAttribute("desc_showcolumn")>
@@ -507,10 +524,58 @@ Module ClassControlProperties
                 _show_column = value
             End Set
         End Property
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_required")>
+        Public Property IsRequired() As Boolean
+            Get
+                Return _required
+            End Get
+            Set(value As Boolean)
+                _required = value
+            End Set
+        End Property
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_readonly")>
+        Public Property IsReadOnly() As Boolean
+            Get
+                Return _read_only
+            End Get
+            Set(value As Boolean)
+                _read_only = value
+            End Set
+        End Property
+
     End Class
 
     Public Class PictureBoxProperties
         Inherits CommonProperties
+
+        Private _required As Boolean
+        Private _read_only As Boolean
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_required")>
+        Public Property IsRequired() As Boolean
+            Get
+                Return _required
+            End Get
+            Set(value As Boolean)
+                _required = value
+            End Set
+        End Property
+
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_readonly")>
+        Public Property IsReadOnly() As Boolean
+            Get
+                Return _read_only
+            End Get
+            Set(value As Boolean)
+                _read_only = value
+            End Set
+        End Property
     End Class
     Public Class GroupBoxProperties
         Inherits CommonProperties
@@ -548,6 +613,8 @@ Module ClassControlProperties
                 _back_color = value
             End Set
         End Property
+
+
     End Class
 
     ' +++++ FUNCTION CLASSES +++++
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index d9fdea3..c7725b6 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -2145,7 +2145,7 @@ Public Class frmConstructor_Main
                 tsbtnGeodata.Visible = False
             End If
             ACTIVATE_DOC_SEARCH_ON_EDIT = result.Item("ACTIVATE_DOC_SEARCH_ON_EDIT")
-            sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
+            sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND CONFIG_COLUMNS = 0", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql, True)
             sql = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
             DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql, True)