MS

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -264,7 +264,7 @@ Module ModuleHelperMethods
 
     End Sub
 
-    Public Sub OpenFormConstructor(id As Integer, Optional recordId As Integer = -1)
+    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional recordId As Integer = -1)
         Try
             If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then
                 Dim frm1 As New frmConstructor_Main
@@ -286,25 +286,42 @@ Module ModuleHelperMethods
             CURRENT_CONSTRUCTOR_ID = id
             CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
 
-            ' Dim frm As New frmNodeNavigation()
-            'frm.Tag = id
+            If NodeNav Then
+                Dim frmNN As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID)
+                frmNN.Tag = id
+                Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild
+                If activeChild1 IsNot Nothing Then
+                    activeChild1.WindowState = FormWindowState.Normal
+                End If
 
+                If recordId <> -1 Then
+                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                    JUMP_RECORD_ID = recordId
+                End If
 
-            Dim frm As New frmConstructor_Main()
-            frm.Tag = id
+                frmNN.MdiParent = MAIN_FORM
+                frmNN.Show()
+            Else
+                Dim frm As New frmConstructor_Main()
+                frm.Tag = id
 
-            Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
-            If activeChild IsNot Nothing Then
-                activeChild.WindowState = FormWindowState.Normal
+                Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+                If activeChild IsNot Nothing Then
+                    activeChild.WindowState = FormWindowState.Normal
+                End If
+
+                If recordId <> -1 Then
+                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                    JUMP_RECORD_ID = recordId
+                End If
+
+                frm.MdiParent = MAIN_FORM
+                frm.Show()
             End If
 
-            If recordId <> -1 Then
-                ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                JUMP_RECORD_ID = recordId
-            End If
 
-            frm.MdiParent = MAIN_FORM
-            frm.Show()
+
+
         Catch ex As Exception
             LOGGER.Warn("Error in OpenFormConstructor: " & ex.Message)
             MsgBox("Error in OpenFormConstructor: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)