MS05082016

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -136,6 +136,9 @@ Public Class frmConstructor_Main
     Private DT_WINDREAM_RESULTLIST_DEF As DataTable
     Private DT_WINDREAM_RESULTLIST As DataTable
     Private DT_RESULTLIST_OPTIONS As DataTable
+    Private DT_WORKFLOWS_MANUAL As DataTable
+
+    Private _MANUAL_WORKFLOW As Boolean = False
 
     Private USER_RESULTLIST_CONFIG_GUID As Integer = 0
     Private DT_TBPMO_FORM_VIEW As DataTable
@@ -259,6 +262,7 @@ Public Class frmConstructor_Main
             VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
+            VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
             Dim SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
                         "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND  CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
 
@@ -304,6 +308,12 @@ Public Class frmConstructor_Main
                 Me.Text = DT_CONSTRUCT_VIEW.Rows(0).Item("FORM_TITLE")
                 'Die Standards ein/ausblenden
             End If
+
+            Dim sql_ResultList = "select T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP " & _
+                        "FROM TBPMO_WORKFLOW T,TBPMO_WORKFLOW_ENTITY_STATE T1 " & _
+                        "WHERE T.GUID = T1.WF_ID " & _
+                        "GROUP BY T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP"
+            DT_WORKFLOWS_MANUAL = ClassDatabase.Return_Datatable(sql_ResultList)
             Load_Tree_View(CONSTRUCTORID)
            
             FORM_LOADED = True
@@ -551,7 +561,7 @@ Public Class frmConstructor_Main
                 If btn.IsMain Then
                     ResetNav()
                 ElseIf btn.Name = "NavButtonRefresh" Then
-                    Load_Tree_View_Data()
+                    Load_Datafor_Entity()
                 End If
 
             Else
@@ -560,7 +570,7 @@ Public Class frmConstructor_Main
 
                 If Node IsNot Nothing Then
                     TreeViewMain.SelectedNode = Node
-                    Load_Tree_View_Data()
+                    Load_Datafor_Entity()
                 End If
             End If
 
@@ -701,6 +711,7 @@ Public Class frmConstructor_Main
                 ClassLogger.Add("Error in Get Entity SQL for User: " & vbNewLine & ex.Message, True)
                 MsgBox("Error in Get Entity SQL for User: " & vbNewLine & ex.Message)
             End Try
+            CURRENT_ENTITYSQL = _ENTITYSQL
         Catch ex As Exception
             ClassLogger.Add("Error in Get_Grid_Sql: " & vbNewLine & ex.Message, True)
             MsgBox("Error in Get_Grid_Sql: " & vbNewLine & ex.Message)
@@ -955,8 +966,7 @@ Public Class frmConstructor_Main
             TabWindream.PageEnabled = True
             WindreamsucheNeuLadenToolStripMenuItem.Enabled = True
             EntitätssucheStartenToolStripMenuItem.Enabled = True
-            WorkflowTasksNeuErstellenToolStripMenuItem.Enabled = True
-            tsButtonShowWorkflowTasks.Enabled = True
+
             VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True
             Dim tempsql
             If SQL_RIGHT_READ_AND_VIEW_ONLY <> "" Then
@@ -1007,8 +1017,9 @@ Public Class frmConstructor_Main
                         RecordKopierenToolStripMenuItem.Enabled = False
                         TabFollowUp.PageEnabled = False
                         TabPos.PageEnabled = False
-                        tsButtonShowWorkflowTasks.Enabled = False
-                        WorkflowTasksNeuErstellenToolStripMenuItem.Enabled = False
+                        ' tsButtonShowTaskOverview.Enabled = False
+                        CreateWorkflowTasksToolStripMenuItem.Enabled = False
+                        CreateWorkflowTasksToolStripMenuItem.Enabled = False
                         VerknüpfungenAnzeigenToolStripMenuItem.Enabled = False
                     End If
 
@@ -1125,7 +1136,7 @@ Public Class frmConstructor_Main
             End If
         End If
 
-        Load_Tree_View_Data()
+        Load_Datafor_Entity()
         If NODE_NAVIGATION = True Then
             Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
             If SelectedNode IsNot Nothing Then
@@ -1429,6 +1440,7 @@ Public Class frmConstructor_Main
                 Dim LEVEL1_TITLE = LEVEL1ROW.Item("CAPTION").ToString
                 Dim NODE1_ENTITY_ID = LEVEL1ROW.Item("FORM_ID").ToString
                 Dim ENTITY_ID = LEVEL1ROW.Item("FORM_ID")
+
                 ' Rootnode erstellen und taggen
                 LEVEL0_NODE = New TreeNode(LEVEL1_TITLE)
                 LEVEL0_NODE.Tag = NODE1_ENTITY_ID
@@ -1528,7 +1540,7 @@ Public Class frmConstructor_Main
 
         End If
     End Function
-    Sub Load_Tree_View_Data()
+    Sub Load_Datafor_Entity()
         Try
             If NODE_NAVIGATION = True Then
                 If NODE_NAVIGATION_LOADED = True Then
@@ -1575,12 +1587,19 @@ Public Class frmConstructor_Main
 
                 End If
 
-
+                ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS
+                Dim query2 = From form In DT_WORKFLOWS_MANUAL.AsEnumerable()
+                            Select form Where form.Item("ENTITY_ID") = ENTITY_ID
+                Dim Rows = query2.ToList()
+                _MANUAL_WORKFLOW = False
+                For Each _row In Rows
+                    _MANUAL_WORKFLOW = _row.Item("MANUALLY")
+                Next
 
 
                 Dim elapsed As Double
                 elapsed = sw.Elapsed.TotalSeconds
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Tree_View_Data1 took " & Format(elapsed, "0.000000000") & " seconds", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity1 took " & Format(elapsed, "0.000000000") & " seconds", False)
                 If NODE_NAVIGATION = True Then
                     If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then
                         Console.WriteLine("Record beinhaltet")
@@ -1594,10 +1613,10 @@ Public Class frmConstructor_Main
                 sw.Stop()
                 sw.Reset()
                 elapsed = elapsed - sw.Elapsed.TotalSeconds
-                If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Tree_View_Data2 took " & Format(elapsed, "0.000000000") & " seconds", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity2 took " & Format(elapsed, "0.000000000") & " seconds", False)
             End If
         Catch ex As Exception
-            MsgBox("Unexpected Error in Load_Tree_View_Data:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
+            MsgBox("Unexpected Error in Load_Datafor_Entity:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
         End Try
 
     End Sub
@@ -1860,7 +1879,6 @@ Public Class frmConstructor_Main
             If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then
                 SELECTED_RECORD_ID = 0
                 Lock_RecordControls(False)
-                tsButtonShowWorkflowTasks.Enabled = True
                 tsButtonCancel.Visible = True
 
                 CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
@@ -2089,7 +2107,7 @@ Public Class frmConstructor_Main
 
                 WD_DELETE_DOCS()
 
-               
+
 
                 SELECTED_RECORD_ID = 0
                 RECORD_ID = 0
@@ -2352,6 +2370,7 @@ Public Class frmConstructor_Main
             sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG"
             DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql_ResultList, "GETVARIABLE CONTROLS")
 
+
             Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable()
                       Select form
                       Where form.Item("GUID") = ENTITY_ID).Single()
@@ -3084,6 +3103,7 @@ Public Class frmConstructor_Main
                         grvwGrid.Columns(col).ColumnEdit = CheckBoxEditorForDisplay
                     End If
                 Next
+
                 Try
                     grvwGrid.GridControl.RepositoryItems.Add(CheckBoxEditorForDisplay)
                     grvwGrid.Columns("files?").ColumnEdit = CheckBoxEditorForDisplay
@@ -3091,7 +3111,6 @@ Public Class frmConstructor_Main
                     ClassLogger.Add(">> Attention: Column files? not existing in GridView?", False)
                 End Try
                 'grvwGrid.Columns("Record-ID").OptionsColumn.AllowShowHide = False
-               
             End If
 
             HideColumns()
@@ -3176,6 +3195,13 @@ Public Class frmConstructor_Main
             ' FormID und RecordID immer ausblenden
             grvwGridPos.Columns.Item("Record-ID").Visible = False
             grvwGridPos.Columns.Item("Form-ID").Visible = False
+            grvwGridPos.Columns.Item("ROW_COLOR").Visible = False
+            Try
+                grvwGridPos.Columns.Item("files?").Visible = False
+                grvwGridPos.Columns.Item("file count").Visible = False
+            Catch ex As Exception
+
+            End Try
         Catch ex As Exception
             MsgBox("Error in HideColumns_Pos:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -3302,8 +3328,7 @@ Public Class frmConstructor_Main
             Refresh_Navpane()
             Update_Record_Label(SELECTED_RECORD_ID)
             Show_act_WFTask()
-            Me.tsButtonShowWorkflowTasks.Enabled = True
-            Me.tsButtonShowTaskOverview.Enabled = True
+
             RECORD_ID = SELECTED_RECORD_ID
             Dim elapsed As Double
             elapsed = sw.Elapsed.TotalSeconds - elapsed
@@ -3329,7 +3354,7 @@ Public Class frmConstructor_Main
         End If
         result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
-            Load_Tree_View_Data()
+            Load_Datafor_Entity()
         Else
             Me.Close()
         End If
@@ -3991,7 +4016,7 @@ Public Class frmConstructor_Main
 
                 End If
             End If
-           
+
             'Dim windream_temp_search
             'If Not windream_Docshow = True Or Sett_LoadWD_Docs = False Then
             '    Exit Sub
@@ -4363,7 +4388,7 @@ Public Class frmConstructor_Main
         grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel
         GridControlMain.MainView = grvwCarousel
 
-        Load_Tree_View_Data()
+        Load_Datafor_Entity()
     End Sub
 
     Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click
@@ -4372,7 +4397,7 @@ Public Class frmConstructor_Main
         GRID_TYPE_ID = 1
         GridControlMain.MainView = grvwTiles
 
-        Load_Tree_View_Data()
+        Load_Datafor_Entity()
     End Sub
 
     Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click
@@ -4381,7 +4406,7 @@ Public Class frmConstructor_Main
         GRID_TYPE_ID = 3
         GridControlMain.MainView = grvwGrid
 
-        Load_Tree_View_Data()
+        Load_Datafor_Entity()
     End Sub
 
     Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click
@@ -4435,8 +4460,17 @@ Public Class frmConstructor_Main
                 Load_DocGrid_Layout()
                 tsButtonEdit.Enabled = False
                 If RECORD_ID = 0 Then
-                    'RUN_WD_SEARCH(WD_Suche, "ENTITY")
-                    RUN_WDSEARCH_GRID("ENTITY")
+                    Dim result As MsgBoxResult
+                    Dim msg = String.Format("Wollen Sie eine Entitätsweite Suche ausführen?")
+
+                    If USER_LANGUAGE <> "de-DE" Then
+                        msg = String.Format("Would You like to run a entity-wide docsearch?")
+                    End If
+                    result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    If result = MsgBoxResult.Yes Then
+                        RUN_WDSEARCH_GRID("ENTITY")
+                    End If
+
                 Else
                     ' RUN_WD_SEARCH(WD_Suche, "RECORD")
                     RUN_WDSEARCH_GRID("RECORD")
@@ -4770,18 +4804,19 @@ Public Class frmConstructor_Main
     End Function
 #End Region
 #Region "Tasks"
-    Private Sub tsButtonShowWorkflowTasks_Click(sender As Object, e As EventArgs) Handles tsButtonShowWorkflowTasks.Click
-        If RECORD_ID > 0 Then
-            CURRENT_RECORD_ID = RECORD_ID
-            CURRENT_FORM_ID = ENTITY_ID
-            frmTask_Editor.ShowDialog()
-            Show_act_WFTask()
-            Refresh_TaskOverview()
-        End If
-    End Sub
+    'Private Sub tsButtonShowWorkflowTasks_Click(sender As Object, e As EventArgs) Handles tsButtonShowWorkflowTasks.Click
+    '    If RECORD_ID > 0 Then
+    '        CURRENT_RECORD_ID = RECORD_ID
+    '        CURRENT_FORM_ID = ENTITY_ID
+    '        frmTask_Editor.ShowDialog()
+    '        Show_act_WFTask()
+    '        Refresh_TaskOverview()
+    '    End If
+    'End Sub
 
     Private Sub tsButtonShowTaskOverview_Click(sender As Object, e As EventArgs) Handles tsButtonShowTaskOverview.Click
-        frmTask_Overview.Show()
+        ClassJumpRecord.JumpToRecord(2, RECORD_ID)
+        JUMP_RECORD_ID = 0
     End Sub
 
 
@@ -4798,45 +4833,51 @@ Public Class frmConstructor_Main
     End Sub
     Sub Show_act_WFTask()
         Try
-            Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName, RECORD_ID)
+            Dim query = From table In DD_DMSDataSet.VWPMO_WF_ACTIVE.AsEnumerable()
+                         Select table Where table.Item("ENTITY_ID") = ENTITY_ID
+            Dim Entity_rows = query.ToList()
+            Dim exists As Boolean = False
+            For Each _row In Entity_rows
+                If _row.Item("RECORD_ID") = RECORD_ID Then
+                    CURRENT_TASK_ID = _row.Item("WF_TASK_ID")
+                    Dim text = "Task: " & _row.Item("WF_TITLE")
+                    text += " - " & _row.Item("STATE_TITLE")
+                    text += " - " & _row.Item("DUE_DATE")
+                    tsslblWorkflowstate.Text = text
+                    tsslblWorkflowstate.Visible = True
+                    If _MANUAL_WORKFLOW = True Then
+                        CreateWorkflowTasksToolStripMenuItem.Visible = True
+                    Else
+                        CreateWorkflowTasksToolStripMenuItem.Visible = False
+                    End If
+                    'Direkten Zugriff auf RecordView Workflow erlauben
+                    tsButtonShowTaskOverview.Visible = True
+                    tsButtonShowTaskOverview.Enabled = True
+                    Dim Colorstring = _row.Item("COLOR")
+                    If IsDBNull(Colorstring) Then
+                        Exit Sub
+                    End If
+                    If Colorstring <> "" Then
+                        'grvwSelection.Appearance.FocusedRow.BackColor = ColorTranslator.FromWin32(CInt(Colorstring))
+                        'grvwSelection.Appearance.FocusedRow.ForeColor = Color.Yellow
+                        tsslblWorkflowstate.BackColor = ColorTranslator.FromWin32(CInt(Colorstring))
+                        Select Case tsslblWorkflowstate.BackColor
+                            Case Color.Red
+                                tsslblWorkflowstate.ForeColor = Color.White
+                        End Select
+                    End If
+                    exists = True
+                End If
+            Next
             tsslblWorkflowstate.BackColor = Color.Black
-            If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then
-                CURRENT_TASK_ID = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("WF_TASK_ID")
-                Dim text = "Task: " & Me.DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("WF_TITLE")
-                text += " - " & Me.DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("STATE_TITLE")
-                text += " - " & Me.DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("DUE_DATE")
-                tsslblWorkflowstate.Text = text
-                tsslblWorkflowstate.Visible = True
-                tsButtonShowWorkflowTasks.Visible = True
-                tsButtonShowWorkflowTasks.Enabled = True
-
-                Dim Colorstring = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows(0).Item("COLOR")
-                If IsDBNull(Colorstring) Then
-                    Exit Sub
+            If exists = False Then
+                'Keine Workflows....also auch keinen Zugriff geben
+                tsButtonShowTaskOverview.Visible = False
+                If _MANUAL_WORKFLOW = True Then
+                    CreateWorkflowTasksToolStripMenuItem.Visible = True
                 End If
-                If Colorstring <> "" Then
-                    'grvwSelection.Appearance.FocusedRow.BackColor = ColorTranslator.FromWin32(CInt(Colorstring))
-                    'grvwSelection.Appearance.FocusedRow.ForeColor = Color.Yellow
-                    tsslblWorkflowstate.BackColor = ColorTranslator.FromWin32(CInt(Colorstring))
-                    Select Case tsslblWorkflowstate.BackColor
-                        Case Color.Red
-                            tsslblWorkflowstate.ForeColor = Color.White
-                    End Select
-                End If
-
-            Else
                 tsslblWorkflowstate.Visible = False
-                tsButtonShowWorkflowTasks.Visible = False
-                ' grvwSelection.Appearance.FocusedRow.BackColor = Color.Fuchsia
             End If
-            Dim sql1 As String = "SELECT COUNT(*) FROM TBPMO_WORKFLOW_ENTITY_STATE where ENTITY_ID = @ID"
-            sql1 = sql1.Replace("@ID", ENTITY_ID)
-            Dim result As Integer = ClassDatabase.Execute_Scalar(sql1)
-            If result > 0 Then
-                tsButtonShowWorkflowTasks.Visible = True
-                tsButtonShowWorkflowTasks.Enabled = True
-            End If
-
 
         Catch ex As Exception
             MsgBox("Error in Show act WFTask: " & ex.Message, MsgBoxStyle.Critical)
@@ -4874,21 +4915,43 @@ Public Class frmConstructor_Main
         ' RUN_WD_SEARCH(WD_Suche, "RECORD")
     End Sub
 
-    Private Sub WorkflowTasksNeuErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WorkflowTasksNeuErstellenToolStripMenuItem.Click
+    Private Sub WorkflowTasksNeuErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CreateWorkflowTasksToolStripMenuItem.Click
         Dim result As MsgBoxResult
-        Dim stg As String
+        Dim stg, caption As String
         If USER_LANGUAGE = "de-DE" Then
-            stg = "Wollen Sie die Workflowtasks für diesen record neu erzeugen? Die alten werden gelöscht?"
+            stg = "Wollen Sie die Workflowtasks für diesen Datensatz erzeugen? Alte Workflows werden gelöscht!"
+            caption = "Bestätigung erforderlich:"
         Else
-            stg = "Do You really want to create the workflowtasks new?"
+            stg = "Do You really want to create workflowtasks for this record? Existing workflows will be deleted!"
+            caption = "Confirmation needed:"
         End If
-        result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
             Try
                 CURRENT_FORM_ID = ENTITY_ID
-                Dim sql = "EXEC	PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & " " & RECORD_ID
+                Dim sql = "EXEC	PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & ", " & RECORD_ID
                 If ClassDatabase.Execute_non_Query(sql) Then
+                    VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName)
                     Show_act_WFTask()
+                    If USER_LANGUAGE = "de-DE" Then
+                        stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?"
+                        caption = "Erfolgreich:"
+                    Else
+                        stg = "Workflows created! Would You like to show the Workflow-Overview?"
+                        caption = "Success:"
+                    End If
+                    result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    If result = MsgBoxResult.Yes Then
+                        ClassJumpRecord.JumpToRecord(2, RECORD_ID)
+                        JUMP_RECORD_ID = 0
+                    End If
+                Else
+                    If USER_LANGUAGE = "de-DE" Then
+                        stg = "Die Workflows konnten nicht erzeugt werden. Bitte prüfen Sie die Log-Datei!"
+                    Else
+                        stg = "Error in Creating Workflow-Tasks. Please check the logfile!"
+                    End If
+                    MsgBox(stg, MsgBoxStyle.Exclamation)
                 End If
             Catch ex As Exception
                 MsgBox("Unexpected Error in Create Workflowtasks Record: " & ex.Message, MsgBoxStyle.Critical)
@@ -5315,7 +5378,7 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click
-        Load_Tree_View_Data()
+        Load_Datafor_Entity()
     End Sub
 
     Private Sub AnwendungscacheFreigebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnwendungscacheFreigebenToolStripMenuItem.Click
@@ -5697,7 +5760,7 @@ Public Class frmConstructor_Main
             Save_Grid_Layout()
             frmMass_Change.ShowDialog()
             If SUCCESSFULL = True Then
-                Load_Tree_View_Data()
+                Load_Datafor_Entity()
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in MassChange Collector:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -5792,6 +5855,7 @@ Public Class frmConstructor_Main
     
     Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click
         ClassJumpRecord.JumpToRecord(0, RECORD_ID)
+        JUMP_RECORD_ID = 0
     End Sub