MS_18052016

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -1321,8 +1321,6 @@ Public Class frmConstructor_Main
         Try
             If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then
                 SELECTED_RECORD_ID = 0
-                CURRENT_RECORD_ID = 0
-                RECORD_ID = 0
                 Lock_RecordControls(False)
                 tsButtonShowWorkflowTasks.Enabled = True
                 tsButtonCancel.Visible = True
@@ -1411,11 +1409,12 @@ Public Class frmConstructor_Main
             Dim recid As Integer
             Update_Status_Label(True, ResultMessage, EDIT_STATE)
 
-            If EDIT_STATE = EditState.Update Then
-                recid = RECORD_ID
-            Else
-                recid = NEW_RECORD_ID
-            End If
+            'If EDIT_STATE = EditState.Update Then
+            '    recid = RECORD_ID
+            'Else
+            '    recid = NEW_RECORD_ID
+            'End If
+            recid = CURRENT_RECORD_ID
 
             SELECTED_RECORD_ID = recid
             RECORD_ID = recid
@@ -1549,19 +1548,18 @@ Public Class frmConstructor_Main
                 End If
                 Dim result1 As MsgBoxResult
                 result1 = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                If result = MsgBoxResult.Yes Then
+                If result1 = MsgBoxResult.Yes Then
                     WD_DELETE_DOCS()
                 End If
+
                 SELECTED_RECORD_ID = 0
                 RECORD_ID = 0
                 CURRENT_RECORD_ID = 0
                 RECORD_CHANGED = False
-                Load_Tree_View_Data()
-                ' Nach dem löschen muss die aktuelle Ansicht neugeladen werden
-                Load_Entity_Data(ACT_EBENE)
-
+                'Den derzeitigen Record Neuladen
                 DisableEditMode()
-
+                Load_Entity_Data(ACT_EBENE)
+                RECORD_CHANGED = False
 
             End If
         End If
@@ -5091,4 +5089,11 @@ Public Class frmConstructor_Main
         ' Den derzeitigen Record Neuladen
         Column_Row_Handler()
     End Sub
+
+    Private Sub pnlDetails_MouseHover(sender As Object, e As EventArgs) Handles pnlDetails.MouseHover
+        If pnlDetails.Focus = False Then
+            pnlDetails.Focus()
+            Console.WriteLine("Focus panel")
+        End If
+    End Sub
 End Class