Verbesserungen

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -262,8 +262,15 @@ Module ModuleHelperMethods
 
     End Sub
 
-    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional pRecordId As Integer = -1)
+    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional pJumpID As Integer = -1)
         Try
+
+            If pJumpID <> -1 Then
+                ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                JUMP_ID = pJumpID
+            End If
+
+
             If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then
                 Dim frm1 As New frmConstructor_Main
                 frm1.Tag = id
@@ -275,6 +282,14 @@ Module ModuleHelperMethods
                         If frmCollection.Item(i).WindowState = FormWindowState.Minimized Then
                             frmCollection.Item(i).WindowState = FormWindowState.Normal
                         End If
+                        CURRENT_CONSTRUCTOR_ID = id
+                        CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
+                        If pJumpID <> -1 Then
+                            ' Nur ausführen, wenn das Form tatsächlich JumptoNode unterstützt
+                            If TypeOf frmCollection.Item(i) Is frmNodeNavigation Then
+                                DirectCast(frmCollection.Item(i), frmNodeNavigation).JumptoNode()
+                            End If
+                        End If
                         Exit Sub
                     End If
                 Next i
@@ -285,7 +300,7 @@ Module ModuleHelperMethods
             CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
 
             If NodeNav Then
-                Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID, pRecordId)
+                Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID)
                 frmNodeNav.Tag = id
                 If My.Settings.EntFormsChild = True Then
                     Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild
@@ -295,15 +310,15 @@ Module ModuleHelperMethods
                 End If
 
 
-                If pRecordId <> -1 Then
-                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                    JUMP_RECORD_ID = pRecordId
-                End If
                 If My.Settings.EntFormsChild = True Then
                     frmNodeNav.MdiParent = MAIN_FORM
                 End If
 
                 frmNodeNav.Show()
+                If pJumpID <> -1 Then
+                    frmNodeNav.JumptoNode()
+                End If
+
             Else
                 Dim frm As New frmConstructor_Main()
                 frm.Tag = id
@@ -315,9 +330,9 @@ Module ModuleHelperMethods
                 End If
 
 
-                If pRecordId <> -1 Then
+                If pJumpID <> -1 Then
                     ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                    JUMP_RECORD_ID = pRecordId
+                    JUMP_ID = pJumpID
                 End If
                 If My.Settings.EntFormsChild = True Then
                     frm.MdiParent = MAIN_FORM