MS

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -1295,7 +1295,7 @@ Public Class frmConstructor_Main
                                  Select form
                                  Where form.Item("FORM_ID") = ENTITY_ID).Single()
                 CONSTRUCTOR_DETAIL_ID = result.Item("GUID")
-                CONSTRUCT_EXPAND = result.Item("EXPAND")
+                ' CONSTRUCT_EXPAND = result.Item("EXPAND")
                 Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT")
                 If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then
                     CURRENT_DATE_FORMAT = FORM_DATE_FORMAT
@@ -1686,7 +1686,6 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click
-        Me.Cursor = Cursors.WaitCursor
         Save_Record()
     End Sub
 
@@ -2212,8 +2211,6 @@ Public Class frmConstructor_Main
             PARENT_ENTITYID = result1.Item("PARENT_ID")
             CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
 
-            'Abhängig von der Entität die Selektierungs-Daten laden
-            'Get_Grid_Sql(CONSTRUCTORID, ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID)
 
             ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS
             Dim query = From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
@@ -2222,9 +2219,9 @@ Public Class frmConstructor_Main
 
             Dim QuickViewSQL = query.Single().Item("SQL_QUICK_VIEW")
 
-            Dim GridSQL As String = Get_Grid_Sql(CONSTRUCTORID, ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID, GRID_TYPE, USER_GUID, QuickViewSQL, IS_SINGLE_RECORD, FORM_TYPE, VIEW_ID, GridControlMain, grvwGrid)
-            _ENTITYSQL = GridSQL
-            CURRENT_ENTITYSQL = GridSQL
+            _ENTITYSQL = Get_Grid_Sql(CONSTRUCTORID, ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID, GRID_TYPE, USER_GUID, QuickViewSQL, IS_SINGLE_RECORD, FORM_TYPE, VIEW_ID, GridControlMain, grvwGrid)
+            ' _ENTITYSQL = GridSQL
+
 
             'Anzahl der Datensätze
             ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & ENTITY_ID, True)
@@ -2337,10 +2334,10 @@ Public Class frmConstructor_Main
                     'End Select
                     EBENE3_GRID_RESULT = Nothing
             End Select
-
-
+            CURRENT_ENTITYSQL = _ENTITYSQL
             _ENTITYSTRING = ACT_EBENE_STRING
             CURRENT_PARENT_RECORD_ID = PARENT_RECORDID
+
             DT_TBPMO_FORM_VIEW = 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")
@@ -5814,6 +5811,9 @@ Public Class frmConstructor_Main
                         For Each _RECORD As String In e.Data.GetData(GetType(String()))
                             Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD)
                             If ClassDatabase.Execute_non_Query(upd) = True Then
+                                If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
+                                    ClassDatabase.Execute_non_Query(upd, True)
+                                End If
                                 msg = String.Format("ENTITY WAS CHANGED TO {0}-{1} by User: {2}", ENTITY_STRING, node_tag, USER_USERNAME)
                                 ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg)
                                 sql = "SELECT T.* FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK T1  WHERE T.DocID = T1.DOC_ID AND T1.RECORD_ID = " & _RECORD
@@ -5829,6 +5829,9 @@ Public Class frmConstructor_Main
                                 For Each row As DataRow In DT_CHANGE_CTR.Rows
                                     upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET CONTROL_ID = {0}, CHANGED_WHO = '{3}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", row.Item("LINKED_CTRL_ID"), row.Item("ORIGIN_CTRL_ID"), _RECORD, USER_USERNAME)
                                     ClassDatabase.Execute_non_Query(upd)
+                                    If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
+                                        ClassDatabase.Execute_non_Query(upd, True)
+                                    End If
                                 Next
                             End If
                         Next
@@ -6330,7 +6333,6 @@ Public Class frmConstructor_Main
                         TreeViewMain.SelectedNode.Parent.Nodes.Add(NEWNODE)
                         TreeViewMain.SelectedNode.Parent.Expand()
                     Else
-
                         TreeViewMain.SelectedNode.Nodes.Add(NEWNODE)
                         TreeViewMain.SelectedNode.Expand()
                     End If
@@ -6592,11 +6594,10 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub frmConstructor_Main_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
-        If e.KeyCode = Keys.Tab Then
-            If pnlDetails.Focused Then
-
-            End If
-
+        If e.KeyCode = Keys.Control And e.KeyCode = Keys.R Then
+            Refresh_Entity_Data()
+        ElseIf e.KeyCode = Keys.Control And e.KeyCode = Keys.S Then
+            Save_Record()
         End If
     End Sub
 End Class