jj für ms

app/DD-Record-Organizer/ClassNodeNavigation.vb

@@ -94,17 +94,18 @@ Public Class ClassNodeNavigation
                 Exit Sub
             End If
             Dim NODE_ID
+            Dim NODE_CONFIG_ID
             Dim staticListItems = myTreeNode.Tag.Split("#")
             If staticListItems(0).Contains("NODE-TYPE") Then
                 ' NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "")
                 NODE_ID = Return_NODEID_forTag(myTreeNode.Tag)
-
+                NODE_CONFIG_ID = Return_NODE_CONFIG_ID_forTag(myTreeNode.Tag)
             End If
-            If CURRENT_DT_NODE_CONFIGURABLE_NODES.Rows.Count > 0 And IsNumeric(NODE_ID) Then
+            If NODE_CONFIGURABLE_NODES_DT.Rows.Count > 0 And IsNumeric(NODE_ID) Then
                 'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt
-                Dim table As DataTable = CURRENT_DT_NODE_CONFIGURABLE_NODES
+                Dim table As DataTable = NODE_CONFIGURABLE_NODES_DT
                 ' Get rows with PARENT_ID = NODE_ID
-                Dim result() As DataRow = table.Select("PARENT_NODE = " & NODE_ID)
+                Dim result() As DataRow = table.Select("PARENT_NODE = " & NODE_CONFIG_ID)
                 Dim count As Integer
                 Dim ID
                 ' Loop.
@@ -116,7 +117,7 @@ Public Class ClassNodeNavigation
                     Console.WriteLine(row(0))
                 Next
 
-                'Dim result = (From form In CURRENT_DT_NODE_CONFIGURABLE_NODES.AsEnumerable()
+                'Dim result = (From form In NODE_CONFIGURABLE_NODES_DT.AsEnumerable()
                 '              Select form
                 '              Where form.Item("PARENT_NODE") = NODE_ID).Single()
 
@@ -128,7 +129,7 @@ Public Class ClassNodeNavigation
                     CURRENT_NODE_CONFIGURABLE_ID = 0
                 End If
             Else
-                If LogErrorsOnly = False Then ClassLogger.Add("NO CURRENT_DT_NODE_CONFIGURABLE_NODES", False)
+                If LogErrorsOnly = False Then ClassLogger.Add("NO NODE_CONFIGURABLE_NODES_DT", False)
             End If
         Catch ex As Exception
             ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0
@@ -374,4 +375,28 @@ Public Class ClassNodeNavigation
 
         End If
     End Function
+    Public Shared Function Return_NODE_CONFIG_ID_forTag(NodeString As String)
+        'If NODE_CONFIGURABLE_ID = NODE_CONFIG_ID Then
+        '    vType = "CONFIG_NODE-" & NODE_CONFIG_ID.ToString
+        'Else
+        '    vType = "NODE-TYPE-" & NODE_CONFIG_ID.ToString
+        'End If
+        'If Not IsDBNull(Record) Then
+        '    TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode & "#RECORD-ID" & Record.ToString
+        'Else
+        '    TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode
+        'End If
+        'NODE-TYPE-17#5#NODE_ID-2
+        If IsNumeric(NodeString) Then
+            Return NodeString
+        Else
+            Dim staticListItems = NodeString.Split("#")
+            If staticListItems(0).Contains("NODE-TYPE") Then
+                Return staticListItems(0).ToString.Replace("NODE-TYPE-", "")
+            Else
+                Return 0
+            End If
+
+        End If
+    End Function
 End Class