Monitor: version 1.7.1.0 - Anzeige von Caption und Comment

GUIs.Monitor/Helper/ParameterLoader.vb

@@ -1,4 +1,5 @@
-Imports DevExpress.Utils
+Imports DevExpress.Data.ExpressionEditor
+Imports DevExpress.Utils
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Controls
 Imports DevExpress.XtraLayout
@@ -42,9 +43,11 @@ Public Class ParameterLoader
     End Function
 
     Public Sub LoadParameters(pSearch As Search)
-        For Each oParam As SearchParameter In pSearch.Parameters
-            Dim oControl As Control
+        Dim oControl As Control
 
+        For Each oParam As SearchParameter In pSearch.Parameters
+
+            oControl = Nothing
             Select Case oParam.DataType
                 Case Constants.DataTypeEnum.Boolean
                     Dim oDefaultValue As Boolean = GetDefaultValue(oParam)
@@ -52,7 +55,6 @@ Public Class ParameterLoader
                         .Text = oParam.Title,
                         .Checked = oDefaultValue
                     }
-
                     oControl = oCheckbox
 
 
@@ -127,9 +129,33 @@ Public Class ParameterLoader
             oItem.TextLocation = Locations.Top
             oItem.TextToControlDistance = 3
             oItem.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 10, 0)
-
-
         Next
+
+        If String.IsNullOrEmpty(pSearch.Caption) = False Then
+
+            ' Beschreibung anzeigen
+            Dim oMemoEdit = New MemoEdit() With {
+                .EditValue = pSearch.Caption,
+                .ReadOnly = True,
+                .BorderStyle = BorderStyles.NoBorder
+            }
+
+            oMemoEdit.Name = "SearchCaption"
+            oMemoEdit.Tag = "SearchCaption"
+            oMemoEdit.Properties.ScrollBars = ScrollBars.None
+
+            If String.IsNullOrEmpty(pSearch.Comment) = False Then
+                oMemoEdit.ToolTip = pSearch.Comment
+            End If
+
+            Dim oItem1 As LayoutControlItem = LayoutControl.AddItem()
+            oItem1.Text = "Beschreibung:"
+            oItem1.Control = oMemoEdit
+            oItem1.TextLocation = Locations.Top
+            oItem1.TextToControlDistance = 3
+            oItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 5, 0)
+        End If
+
     End Sub
 
     Private Function GetClearButtonForControl(pControl As Control) As EditorButton

GUIs.Monitor/Helper/SearchLoader.vb

@@ -39,6 +39,7 @@ Public Class SearchLoader
                     .Id = oSearchId,
                     .Title = oRow.ItemEx("TITLE", String.Empty),
                     .Caption = oRow.ItemEx("CAPTION", String.Empty),
+                    .Comment = oRow.ItemEx("COMMENT", String.Empty),
                     .ReturnType = GetReturnType(oRow.ItemEx("RETURN_TYPE", String.Empty)),
                     .SQLCommand = oRow.ItemEx("EXEC_SQL", String.Empty),
                     .UseMOTLogic = GetMOTLogicType(oRow.ItemEx("RETURN_TYPE", String.Empty)),