jj für ms

2018-12-06 10:57:00 +01:00
parent 609df5b5c5
commit 3f2dfd56d2
22 changed files with 2394 additions and 562 deletions
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -344,7 +344,7 @@ Public Class frmConstructor_Main
            SQL = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
            DT_ADDING_USERS = ClassDatabase.Return_Datatable(SQL, False)
            SQL = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
-            CURRENT_DT_NODE_CONFIGURABLE_NODES = ClassDatabase.Return_Datatable(SQL, False)
+            NODE_CONFIGURABLE_NODES_DT = ClassDatabase.Return_Datatable(SQL, False)
        Catch ex As System.Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2")
        End Try
@@ -688,11 +688,12 @@ Public Class frmConstructor_Main
        Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
        Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "")
        Dim Filename As String = String.Format("GridViewDoc_Search-{0}-{1}-UserLayout.xml", GetSafeFilename(EntityName), CONSTRUCTOR_DETAIL_ID)
-        Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+        LAYOUT_DOC_GRIDVIEW = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+        Return LAYOUT_DOC_GRIDVIEW
    End Function
 #End Region

-    Sub Refresh_Entity_Data()
+    Sub Refresh_Entity_Data(pManually As Boolean)
        If TrySave_Automatic() = True Then
            Save_Grid_Layout()
            ' Setzt die RECORD_ID auf Null
@@ -705,7 +706,7 @@ Public Class frmConstructor_Main
            If CtrlCommandUI.IsInsert Then
                ActivateAllTabs()
            End If
-            Load_Datafor_Entity()
+            Load_Datafor_Entity(pManually)
        End If
    End Sub

@@ -1283,7 +1284,7 @@ Public Class frmConstructor_Main
            firstORFOLLWOWIN = False
        End If
        sw.Done()
-        Load_Datafor_Entity()
+        Load_Datafor_Entity(False)

        sw = New SW("TreeViewMain_AfterSelect2")

@@ -1541,7 +1542,7 @@ Public Class frmConstructor_Main
    Sub Create_variable_node()

    End Sub
-    Sub Load_Datafor_Entity()
+    Sub Load_Datafor_Entity(pManually As Boolean)
        'If ClassProxy.IS_PROXY_BUSY = True Then
        '    MsgBox("Proxy-Server is actually synchronizing! Please wait until synchronisation is finished!" & vbNewLine & "This might take up to 3 minutes!", MsgBoxStyle.Information)
        '    Exit Sub
@@ -1554,7 +1555,10 @@ Public Class frmConstructor_Main
                    ENTITY_ID = _TagENT_ID
                    CURRENT_ENTITY_ID = ENTITY_ID
                Else
-                    Exit Sub
+                    If pManually = False Then
+                        Exit Sub
+                    End If
+
                End If


@@ -2667,7 +2671,9 @@ Public Class frmConstructor_Main
            _ENTITYSTRING = ACT_EBENE_STRING
            CURRENT_PARENT_RECORD_ID = PARENT_RECORDID

+
            DT_TBPMO_FORM_VIEW = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_FORM_VIEW, "FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, "")
+            CURRENT_ENTITYSTRING = DT_TBPMO_FORM_VIEW.Rows(0).Item("FORM_TITLE")
            'ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, True)

            act_FormViewID = DT_TBPMO_FORM_VIEW.Rows(0).Item("GUID")
@@ -3467,7 +3473,7 @@ Public Class frmConstructor_Main
        End If
        result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
        If result = MsgBoxResult.Yes Then
-            Load_Datafor_Entity()
+            Load_Datafor_Entity(False)
        Else
            Me.Close()
        End If
@@ -4203,7 +4209,7 @@ Public Class frmConstructor_Main
        grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel
        GridControlMain.MainView = grvwCarousel

-        Load_Datafor_Entity()
+        Load_Datafor_Entity(True)
    End Sub

    Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click
@@ -4212,7 +4218,7 @@ Public Class frmConstructor_Main
        GRID_TYPE_ID = 1
        GridControlMain.MainView = grvwTiles

-        Load_Datafor_Entity()
+        Load_Datafor_Entity(True)
    End Sub

    Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click
@@ -4221,7 +4227,7 @@ Public Class frmConstructor_Main
        GRID_TYPE_ID = 3
        GridControlMain.MainView = grvwGrid

-        Load_Datafor_Entity()
+        Load_Datafor_Entity(True)
    End Sub

    Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click
@@ -5231,7 +5237,7 @@ Public Class frmConstructor_Main
        End If
    End Sub
    Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click
-        Load_Datafor_Entity()
+        Load_Datafor_Entity(True)
    End Sub
    Private Sub grvwGrid_ColumnFilterChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnFilterChanged
        SET_ROWCOUNT_STRING()
@@ -5657,7 +5663,7 @@ Public Class frmConstructor_Main
            frmMass_Change.ShowDialog()
            If SUCCESSFULL = True Then
                Cursor = Cursors.WaitCursor
-                Load_Datafor_Entity()
+                Load_Datafor_Entity(True)
                Cursor = Cursors.Default
            End If
        Catch ex As Exception
@@ -5665,12 +5671,7 @@ Public Class frmConstructor_Main
        End Try
    End Sub
    Private Sub GridViewDoc_Search_ColumnWidthChanged(sender As Object, e As ColumnEventArgs) Handles GridViewDoc_Search.ColumnWidthChanged
-        Try
-
-        Catch ex As Exception
-            ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False)
-        End Try
-
+        Save_DocGrid_Layout()
    End Sub
    Private Sub UmbenennenToolStripMenuItem_MouseHover(sender As Object, e As EventArgs)
        Display_Filename()
@@ -5702,7 +5703,18 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub DateiMitDatensatzVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_linkRecord.Click
-
+        Try
+            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+            Refresh_Selected_Table()
+            Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE)
+            frm.Show()
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
    End Sub

    Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click
@@ -6215,7 +6227,7 @@ Public Class frmConstructor_Main
                            End If
                            MsgBox(msg, MessageBoxIcon.Information)
                        End If
-                        Load_Datafor_Entity()
+                        Load_Datafor_Entity(True)
                    End If
                End If
            End If
@@ -6385,7 +6397,7 @@ Public Class frmConstructor_Main
                ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT")
                ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD")
                Me.Cursor = Cursors.Default
-                Load_Datafor_Entity()
+                Load_Datafor_Entity(True)
                LocateRecordinGridById(CURRENT_RECORD_ID)
            End If
        Else
@@ -6399,7 +6411,7 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub tsbtnRefresh_Entity_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh_Entity.Click
-        Refresh_Entity_Data()
+        Refresh_Entity_Data(True)
    End Sub

    Private Sub RecordDeleteToolStripMenuItem_Click(sender As Object, e As EventArgs)
@@ -6490,7 +6502,7 @@ Public Class frmConstructor_Main
            tsbtnPanel1Collapse.Image = My.Resources.arrow_left
        End If
    End Sub
-    Private Sub CMSEntity_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cmsTreeView.Opening
+    Private Sub cmsTreeView_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cmsTreeView.Opening
        tsmiNodeDelete.Visible = False
        Dim control = Me.ActiveControl
        If Not IsNothing(control) Then
@@ -6673,7 +6685,7 @@ Public Class frmConstructor_Main
            expression = "ENTITY_ID = " & ENTITY_ID & " AND GUID = " & CURRENT_NODE_CONFIGURABLE_ID
            Dim foundRowsLevel0() As DataRow
            ' Use the Select method to find all rows matching the filter.
-            foundRowsLevel0 = CURRENT_DT_NODE_CONFIGURABLE_NODES.Select(expression)
+            foundRowsLevel0 = NODE_CONFIGURABLE_NODES_DT.Select(expression)
            Dim i As Integer
            Dim RECORD_CREATE As Boolean
            ' For each row create a Node
@@ -6763,7 +6775,7 @@ Public Class frmConstructor_Main
                    Dim oDelete = String.Format("EXEC PRPMO_DELETE_NODE {0},'{1}'", NODE_GUID, USER_USERNAME)
                    If ClassDatabase.Execute_non_Query(oDelete) Then
                        TreeViewMain.Nodes.Remove(TreeViewMain.SelectedNode)
-                        Refresh_Entity_Data()
+                        Refresh_Entity_Data(True)
                    End If
                End If
            End If
@@ -7002,7 +7014,7 @@ Public Class frmConstructor_Main

    Private Sub frmConstructor_Main_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
        If e.KeyCode = Keys.Control And e.KeyCode = Keys.R Then
-            Refresh_Entity_Data()
+            Refresh_Entity_Data(True)
        ElseIf e.KeyCode = Keys.Control And e.KeyCode = Keys.S Then
            Save_Record()
            If ERROR_WHILE_SAVING = True Then
@@ -7110,36 +7122,9 @@ Public Class frmConstructor_Main
        End Sub
    End Class

-    Private Sub AusDieserEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusDieserEntitätToolStripMenuItem.Click
-        Try
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
-                Exit Sub
-            End If
-            Refresh_Selected_Table()
-            Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE)
-            frm.Show()
-        Catch ex As Exception
-            MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Sub
+    Private Sub AusDieserEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs)

-    Private Sub AusAndererEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusAndererEntitätToolStripMenuItem.Click
-        Try
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
-                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
-                Exit Sub
-            End If
-            Refresh_Selected_Table()
-            Dim frm As New frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE)
-            frm.Show()
-        Catch ex As Exception
-            MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical)
-        End Try
    End Sub
-
    Private Sub tstxtRenameNode_KeyUp(sender As Object, e As KeyEventArgs) Handles tstxtRenameNode.KeyUp
        If e.KeyCode = Keys.Return Then
            Try
@@ -7174,4 +7159,9 @@ Public Class frmConstructor_Main
            Me.tstxtRenameNode.Text = TreeViewMain.SelectedNode.Text
        End If
    End Sub
+
+    Private Sub ToolStripMenuItem1_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
+        Save_DocGrid_Layout()
+    End Sub
+
 End Class