Anzeige von Labels, Chart-Typ: StackedBar, Dateinamen für Chart-Export

GUIs.Monitor/Helper/SearchLoader.vb

@@ -93,7 +93,7 @@ Public Class SearchLoader
     End Sub
 
     Public Sub LoadChartParameters()
-        Dim oSQL As String = $"SELECT * FROM TBMON_CHARTS"
+        Dim oSQL As String = $"SELECT * FROM TBMON_CHARTS WHERE ACTIVE = 1"
         Dim oTable As DataTable = Database.GetDatatable(oSQL)
         Dim oParameters As New List(Of ChartParameter)
 
@@ -106,7 +106,8 @@ Public Class SearchLoader
                 .SQLCommand = oRow.ItemEx("SQL_COMMAND", String.Empty),
                 .ChartType = GetChartType(oRow.ItemEx("CHART_TYPE", String.Empty)),
                 .Argument = oRow.ItemEx("ARGUMENT", String.Empty),
-                .Value = oRow.ItemEx("VALUE", String.Empty)
+                .Value = oRow.ItemEx("VALUE", String.Empty),
+                .LabelType = GetLabelType(oRow.ItemEx("LABEL_TYPE", String.Empty))
             })
         Next
 
@@ -162,11 +163,24 @@ Public Class SearchLoader
                 Return ChartTypeEnum.Line
             Case "PIE"
                 Return ChartTypeEnum.Pie
+            Case "STACKEDBAR"
+                Return ChartTypeEnum.StackedBar
             Case Else
                 Return ChartTypeEnum.Undefined
         End Select
     End Function
 
+    Private Function GetLabelType(pTypeString As String) As LabelTypeEnum
+        Select Case pTypeString.ToUpper
+            Case "NOLABELS"
+                Return LabelTypeEnum.NoLabels
+            Case "DEFAULT"
+                Return LabelTypeEnum.DefaultLabels
+            Case Else
+                Return LabelTypeEnum.NoLabels
+        End Select
+    End Function
+
     Private Function GetChartPosType(pPosTypeId As Integer) As ChartPosEnum
         Select Case pPosTypeId
             Case 1