MS

2018-05-11 10:37:00 +02:00
parent 17946f1a19
commit f4d1a8c8b1
13 changed files with 273 additions and 187 deletions
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -130,7 +130,7 @@ Public Class frmConstructor_Main

    Private _FormClosing As Boolean = False

-    Private ENTITY_LOADED As Boolean = False
+    Private ENTITY_LOADING_PROCESS As Boolean = False

    Private LinkParentID As Integer

@@ -850,7 +850,7 @@ Public Class frmConstructor_Main
        GridControlMain.MainView = grvwTiles
    End Sub
    Public Function Get_Pos_SQL(FormId As Integer)
-        POS_SQL = "Select T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID And T1.RECORD1_ID = @PARENT_ID"
+        POS_SQL = String.Format("Select T.* FROM VWPMO_ENTITY_TABLE{0} T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID And T1.RECORD1_ID = @PARENT_ID", FormId.ToString)
    End Function
    Public Sub Clear_Grid_View()
        GridControlMain.DataSource = Nothing
@@ -961,7 +961,7 @@ Public Class frmConstructor_Main
                Exit Sub
            End If
            'Aussteigen, wenng erade die Entität gewechselt wird
-            If ENTITY_LOADED = False Then
+            If ENTITY_LOADING_PROCESS = False Then
                Exit Sub
            End If
            If GRIDRightMouse_Clicked Then
@@ -1234,7 +1234,7 @@ Public Class frmConstructor_Main
                Update_Status_Label(True, SelectedNode.Tag)

                ClassNodeNavigation.Check_NODE_CONFIG_ID(ENTITY_ID)
-
+               
                If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then
                    Dim Record = ClassNodeNavigation.Return_RECORD_forTag(SelectedNode.Tag)
                    If Record <> 0 Then
@@ -1436,25 +1436,37 @@ Public Class frmConstructor_Main
        '    Exit Sub
        'End If
        Try
-
-
-            'CURRENT_DATE_FORMAT = USER_DATE_FORMAT
-
-            If NODE_NAVIGATION = True Then
-                If NODE_NAVIGATION_LOADED = True Then
-                    Exit Sub
+            Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
+            If SelectedNode IsNot Nothing Then
+                Dim _TagENT_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
+                If _TagENT_ID <> 0 And _TagENT_ID <> ENTITY_ID Then
+                    ENTITY_ID = _TagENT_ID
+                    CURRENT_ENTITY_ID = ENTITY_ID
                Else
-                    NODE_NAVIGATION_LOADED = True
+                    Exit Sub
                End If
+
+
            End If

+            'If NODE_NAVIGATION = True Then
+            '    If NODE_NAVIGATION_LOADED = True Then
+            '        Exit Sub
+            '    Else
+            '        NODE_NAVIGATION_LOADED = True
+            '    End If
+            'End If
+
            Dim sw As New SW("Load_Datafor_Entity")
-            Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
+

            If SelectedNode IsNot Nothing Then
-                ENTITY_LOADED = False
-                ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
-                CURRENT_ENTITY_ID = ENTITY_ID
+                ENTITY_LOADING_PROCESS = False
+                'If NODE_NAVIGATION = True Then
+                '    ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
+                '    CURRENT_ENTITY_ID = ENTITY_ID
+                'End If
+
                Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
                              Select form
                              Where form.Item("FORM_ID") = ENTITY_ID).Single()
@@ -1534,7 +1546,7 @@ Public Class frmConstructor_Main
                    Get_RecordCounts_Nodes()
                End If
                sw.Done()
-                Load_Entity_Data()
+                Load_Entity_Data_CONTROLS_RECORDS()



@@ -1731,7 +1743,7 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub OnRecordChanged(sender As Object, e As System.EventArgs)
-        If ENTITY_LOADED Then
+        If ENTITY_LOADING_PROCESS Then
            RECORD_CHANGED = True
        End If

@@ -2088,7 +2100,7 @@ Public Class frmConstructor_Main
                    RECORD_CHANGED = False
                    'Den derzeitigen Record Neuladen
                    DisableEditMode()
-                    Load_Entity_Data()
+                    Load_Entity_Data_CONTROLS_RECORDS()
                    RECORD_CHANGED = False
                End If
            End If
@@ -2275,7 +2287,7 @@ Public Class frmConstructor_Main
 #End Region


-    Sub Load_Entity_Data()
+    Sub Load_Entity_Data_CONTROLS_RECORDS()
        Try
            If LogErrorsOnly = False Then ClassLogger.Add("START Load_Entity_Data", False)
            Dim sw As New SW("Load_Entity_Data")
@@ -2625,7 +2637,7 @@ Public Class frmConstructor_Main
                    End Try

                    DT_SELECTION = DTEntity
-                    LoadGrid_Selection()
+                    LoadGrid_Records()
                    If GRID_TYPE = GridType.Grid Then
                        grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None
                        grvwGrid.OptionsBehavior.Editable = False
@@ -2673,7 +2685,7 @@ Public Class frmConstructor_Main
                CtrlBuilder.WatchRecordChanges = True

                'Zurücksetzen
-                ENTITY_LOADED = True
+                ENTITY_LOADING_PROCESS = True
                Dim RecLoaded As Boolean = False
                If LOAD_DIRECT = True Then
                    Load_Record_Direct()
@@ -2720,7 +2732,7 @@ Public Class frmConstructor_Main
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_Entity_Data", ex.Message, ex.StackTrace)
        Finally
            'Me.Cursor = Cursors.Default
-            ENTITY_LOADED = True
+            ENTITY_LOADING_PROCESS = True
        End Try


@@ -2756,18 +2768,18 @@ Public Class frmConstructor_Main
    End Sub
    Sub Load_Entity_Data_Only()
        Try
-            ENTITY_LOADED = False
+            ENTITY_LOADING_PROCESS = False
            Dim DTEntity As DataTable = ClassDatabase.Return_Datatable(_ENTITYSQL, True)
            Dim primaryKey(1) As DataColumn
            primaryKey(0) = DTEntity.Columns("Record-ID")
            DTEntity.PrimaryKey = primaryKey
            DT_SELECTION = DTEntity
-            LoadGrid_Selection()
+            LoadGrid_Records()
            Load_Grid_Layout()
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
        End Try
-        ENTITY_LOADED = True
+        ENTITY_LOADING_PROCESS = True
    End Sub

    Sub CreateTile()
@@ -3041,7 +3053,7 @@ Public Class frmConstructor_Main
            Return 0
        End Try
    End Function
-    Private Function LoadGrid_Selection()
+    Private Function LoadGrid_Records()
        Try
            If GRID_TYPE = GridType.Tiles Then
                CreateTile()
@@ -3089,7 +3101,7 @@ Public Class frmConstructor_Main
                tslbldisplayRecords.Text = msg & Get_Grid_Row_Count()
            End If
        Catch ex As Exception
-            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in LoadGrid_Records", ex.Message, ex.StackTrace)
            Return False
        End Try

@@ -3512,7 +3524,7 @@ Public Class frmConstructor_Main
                        windream_inited = False
                    End Try

-                    SW.Done()
+                    sw.Done()
                End If
            End If
        Catch ex As Exception
@@ -4110,7 +4122,7 @@ Public Class frmConstructor_Main
            Dim XMLPath = Get_Grid_Layout_Filename()
            If File.Exists(XMLPath) Then
                File.Delete(XMLPath)
-                Load_Entity_Data()
+                Load_Entity_Data_CONTROLS_RECORDS()
            End If
        Catch ex As Exception
            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset Layout Grid: ", ex.Message)
@@ -4481,7 +4493,7 @@ Public Class frmConstructor_Main
        End Try
    End Sub
    Private Sub dtpWV_ValueChanged(sender As Object, e As EventArgs) Handles dtpFollowUp.ValueChanged
-        If ENTITY_LOADED = False = False Then
+        If ENTITY_LOADING_PROCESS = False = False Then
            Exit Sub
        End If
        If ClassControlCommandsUI.UpdateControlValue(FOLL_UP_DATE_CTRL_ID, RECORD_ID, dtpFollowUp.Value, CURRENT_ENTITY_ID) = True Then
@@ -4495,7 +4507,7 @@ Public Class frmConstructor_Main
    End Sub

    Private Sub chkFollowUp_CheckedChanged(sender As Object, e As EventArgs) Handles chkFollowUp.CheckedChanged
-        If ENTITY_LOADED = False Then
+        If ENTITY_LOADING_PROCESS = False Then
            Exit Sub
        End If
        If ClassControlCommandsUI.UpdateControlValue(FOLL_UP_DONE_CTRL_ID, RECORD_ID, chkFollowUp.Checked.ToString, CURRENT_ENTITY_ID) = True Then
@@ -4952,6 +4964,7 @@ Public Class frmConstructor_Main
                        Dim ColorRow As Color
                        Try
                            ColorRow = Color.FromName(rowCellValue)
+                            If LogErrorsOnly = False Then ClassLogger.Add(">> RowBackColor '" & rowCellValue & "' will be used for record: " & Get_Focused_Row_Cell_Value("Record-ID"), False)
                        Catch ex As Exception
                            ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False)
                            Exit Sub
@@ -6194,7 +6207,7 @@ Public Class frmConstructor_Main
            If result = MsgBoxResult.Yes Then
                Dim SQL = String.Format("EXEC PRPMO_COPY_RECORD {0}, '{1}'", RECORD_ID, USER_USERNAME)
                If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
-                    Load_Entity_Data()
+                    Load_Entity_Data_CONTROLS_RECORDS()
                End If
            End If
        Else
@@ -6224,7 +6237,7 @@ Public Class frmConstructor_Main
                CURRENT_ENTITY_ID = ENTITY_ID
                ClassControlValueCache.ClearCache()
                DisableEditMode()
-                Load_Entity_Data()
+                Load_Entity_Data_CONTROLS_RECORDS()
                RECORD_CHANGED = False
            Catch ex As Exception
                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Clear Cache: ", ex.Message)