MS

2017-03-22 10:54:43 +01:00 · 2017-03-22 10:54:43 +01:00 · 00db59f666
commit 00db59f666
parent 3ae8717426
5 changed files with 34 additions and 25 deletions
--- a/app/DD-Record-Organizer/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organizer/ModuleHelperMethods.vb
@ -442,6 +442,7 @@ Module ModuleHelperMethods
                                 IS_SINGLE_RECORD As Boolean, FORM_TYPE As Integer, ByRef VIEW_ID As Integer, ByRef GridControlMain As GridControl, ByRef grvwGrid As GridView, Optional ByRef IS_GEOData As Boolean = False)
        Try
            Dim ViewName As String = "VWTEMP_PMO_FORM" & FormId.ToString
+            CURRENT_VIEWNAME = ViewName
            Dim EntitySQL As String

            If GRID_TYPE = frmConstructor_Main.GridType.Grid Then
--- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb
@ -28,6 +28,7 @@

    Public CURRENT_ENTITYSTRING As String = ""
    Public CURRENT_ENTITYSQL As String
+    Public CURRENT_VIEWNAME As String = ""
    Public CURRENT_ENTITY_REDUNDANT_ID As Integer
    'Public CURRENT_ENTITYSQL As String

--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@ -693,7 +693,7 @@ Partial Class frmConstructor_Main
        Me.SplitContainerDetails.Panel2.Controls.Add(Me.pnlDocFill)
        Me.SplitContainerDetails.Panel2.Controls.Add(Me.statStripDoc)
        Me.SplitContainerDetails.Panel2.Controls.Add(Me.pnlDocToolStrip)
-        Me.SplitContainerDetails.SplitterPosition = 786
+        Me.SplitContainerDetails.SplitterPosition = 699
        '
        'pnlDetails
        '
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@ -528,7 +528,7 @@
    <value>1067, 212</value>
  </data>
  <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>2</value>
  </data>
  <data name="&gt;&gt;GridControlMain.Name" xml:space="preserve">
    <value>GridControlMain</value>
@ -652,6 +652,9 @@
  <data name="tsbtnRefresh_Entity.Text" xml:space="preserve">
    <value>Neu laden</value>
  </data>
+  <data name="tsbtnRefresh_Entity.ToolTipText" xml:space="preserve">
+    <value>Neu laden (strg&amp;R)</value>
+  </data>
  <data name="tsbtnGeodata.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
    <value>Magenta</value>
  </data>
@ -668,7 +671,7 @@
    <value>1067, 25</value>
  </data>
  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>1</value>
  </data>
  <data name="ToolStripRecords.Text" xml:space="preserve">
    <value>ToolStrip1</value>
@ -749,10 +752,10 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 336</value>
+    <value>699, 336</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+    <value>4</value>
  </data>
  <data name="&gt;&gt;pnlDetails.Name" xml:space="preserve">
    <value>pnlDetails</value>
@ -779,10 +782,10 @@
    <value>0, 26</value>
  </data>
  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 286</value>
+    <value>641, 286</value>
  </data>
  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>5</value>
  </data>
  <data name="&gt;&gt;pnlDocFill.Name" xml:space="preserve">
    <value>pnlDocFill</value>
@ -829,7 +832,7 @@
    <value>0, 312</value>
  </data>
  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 24</value>
+    <value>641, 24</value>
  </data>
  <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -856,7 +859,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 26</value>
+    <value>641, 26</value>
  </data>
  <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@ -932,6 +935,9 @@
  <data name="tsButtonSave.Text" xml:space="preserve">
    <value>Speichern</value>
  </data>
+  <data name="tsButtonSave.ToolTipText" xml:space="preserve">
+    <value>Speichern (strg&amp;S)</value>
+  </data>
  <data name="tsButtonDelete.Enabled" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
@ -1071,7 +1077,7 @@
    <value>1362, 396</value>
  </data>
  <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>3</value>
  </data>
  <data name="GridControlPos.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/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