jj_06_01_16

app/DD-Record-Organiser/ModuleHelperMethods.vb

@@ -211,23 +211,8 @@
         frm3.Show()
 
     End Sub
-    Public Sub OpenFormConstructor(id As Integer)
-        CURRENT_CONSTRUCTOR_ID = id
-        Dim frm As New frmForm_Constructor()
 
-        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
-        If activeChild IsNot Nothing Then
-            activeChild.WindowState = FormWindowState.Normal
-        End If
-
-        frm.MdiParent = MAIN_FORM
-        frm.Show()
-        ' frm = frmForm_Constructor.Instance()
-        
-    End Sub
-
-    ' TODO: NUR FÜR WINDREAM CON!!!
-    Public Sub OpenFormConstructorDemo(id As Integer)
+    Public Sub OpenFormConstructor(id As Integer, Optional recordId As Integer = -1)
         Try
             CURRENT_CONSTRUCTOR_ID = id
             Dim frm As New frmForm_Constructor_Main_2()
@@ -238,6 +223,11 @@
                 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()
         Catch ex As Exception
@@ -245,7 +235,6 @@
             MsgBox("Fehler beim Laden des Formulars, bitte erneut versuchen")
         End Try
     End Sub
-    ' TODO: NUR FÜR WINDREAM CON!!!
 
     Public Sub OpenTaskmanagement()
         Dim frm As New frmTaskmanagement