From 32bb0f3c0c1341d00dc7b591c8fd36b1e583a128 Mon Sep 17 00:00:00 2001
From: MPitz <m.pitz@digitaldata.works>
Date: Wed, 12 Apr 2023 13:46:26 +0200
Subject: [PATCH] =?UTF-8?q?EXPANDED-Funktion=20f=C3=BCr=20Root-Knoten=20er?=
 =?UTF-8?q?g=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GUIs.Monitor/Forms/frmMonitor.Designer.vb |  2 +-
 GUIs.Monitor/Forms/frmMonitor.vb          | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/GUIs.Monitor/Forms/frmMonitor.Designer.vb b/GUIs.Monitor/Forms/frmMonitor.Designer.vb
index 681d0e2..06efa04 100644
--- a/GUIs.Monitor/Forms/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/Forms/frmMonitor.Designer.vb
@@ -241,7 +241,7 @@ Partial Class frmMonitor
         '
         'lbSearchTime
         '
-        Me.lbSearchTime.Caption = "BarStaticItem1"
+        Me.lbSearchTime.Caption = "lbSearchTime"
         Me.lbSearchTime.Id = 13
         Me.lbSearchTime.Name = "lbSearchTime"
         '
diff --git a/GUIs.Monitor/Forms/frmMonitor.vb b/GUIs.Monitor/Forms/frmMonitor.vb
index b8fc52e..9d46a9d 100644
--- a/GUIs.Monitor/Forms/frmMonitor.vb
+++ b/GUIs.Monitor/Forms/frmMonitor.vb
@@ -166,6 +166,7 @@ Public Class frmMonitor
             SplitContainerFileHTML.Collapsed = True
 
             SetResultCount(0)
+            SetSearchTimeValue("")
             SetVersion()
 
         Catch ex As Exception
@@ -402,7 +403,7 @@ Public Class frmMonitor
             ActivateMenuBarButtons(oSearch.ReturnType)
 
             Dim oTotalTime = Now.Subtract(oStartTime)
-            lbSearchTime.Caption = oTotalTime.ToString("mm':'ss")
+            SetSearchTimeValue(oTotalTime.ToString("mm':'ss"))
 
             Return True
         Catch ex As Exception
@@ -621,11 +622,16 @@ Public Class frmMonitor
             Exit Sub
         End If
 
+        If pRootNode.Item("PARENT_ID") = 0 Then
+            ' Auswertung für Parent-Knoten
+            ExpandCollapseNode(pRootNode)
+        End If
+
         For Each oNode As TreeListNode In pRootNode.Nodes
             Try
-                Dim oExpanded As TristateBoolean = NotNull(oNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
-                ExpandCollapseNode(oNode, oExpanded)
+                ExpandCollapseNode(oNode)
 
+                ' Und rein in die Rekursion
                 SetExpandedForChildNodes(oNode, pDepth + 1)
             Catch ex As Exception
                 Logger.Error(ex)
@@ -860,8 +866,9 @@ Public Class frmMonitor
         End If
     End Sub
 
-    Private Sub ExpandCollapseNode(pNode As TreeListNode, pState As TristateBoolean)
-        Select Case pState
+    Private Sub ExpandCollapseNode(pNode As TreeListNode)
+        Dim oExpanded As TristateBoolean = NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
+        Select Case oExpanded
             Case TristateBoolean.False
                 pNode.Collapse()
             Case TristateBoolean.True
@@ -1188,6 +1195,10 @@ Public Class frmMonitor
         lbResultCount.Caption = String.Format(lbResultCount.Tag, pResults)
     End Sub
 
+    Private Sub SetSearchTimeValue(pValue As String)
+        lbSearchTime.Caption = pValue
+    End Sub
+
     Private Sub SetVersion()
         lbVersion.Caption = String.Format(lbVersion.Tag, System.Reflection.Assembly.GetEntryAssembly().GetName().Version)
     End Sub