ms

2017-02-17 14:38:36 +01:00
parent a7ab84cc3f
commit 4fbf33d5ab
6 changed files with 216 additions and 145 deletions
--- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb
@@ -123,6 +123,7 @@ Partial Class frmConstructor_Main
        Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsbtnPos_Refresh = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
        Me.tsbtnWork = New System.Windows.Forms.ToolStripButton()
        Me.tslblPoslocked = New System.Windows.Forms.ToolStripLabel()
@@ -225,7 +226,6 @@ Partial Class frmConstructor_Main
        Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
        Me.TBPMO_RECORD_VARIANTTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter()
        Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components)
-        Me.tsbtnPos_Refresh = New System.Windows.Forms.ToolStripButton()
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -309,6 +309,7 @@ Partial Class frmConstructor_Main
        Me.TreeViewMain.FullRowSelect = True
        Me.TreeViewMain.Name = "TreeViewMain"
        Me.TreeViewMain.ShowLines = False
+        Me.TreeViewMain.TabStop = False
        '
        'cmsTreeView
        '
@@ -425,6 +426,7 @@ Partial Class frmConstructor_Main
        Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
        Me.GridControlMain.MainView = Me.grvwTiles
        Me.GridControlMain.Name = "GridControlMain"
+        Me.GridControlMain.TabStop = False
        Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGrid, Me.grvwCarousel, Me.grvwTiles})
        '
        'ContextMenuGrid
@@ -669,6 +671,7 @@ Partial Class frmConstructor_Main
        Me.TCDetails.Name = "TCDetails"
        Me.TCDetails.SelectedTabPage = Me.TabDetails
        Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabPos, Me.TabWindream, Me.TabFollowUp, Me.TabPageVariant})
+        Me.TCDetails.TabStop = False
        '
        'TabDetails
        '
@@ -701,6 +704,7 @@ Partial Class frmConstructor_Main
        Me.pnlDetails.AllowDrop = True
        resources.ApplyResources(Me.pnlDetails, "pnlDetails")
        Me.pnlDetails.Name = "pnlDetails"
+        Me.pnlDetails.TabStop = True
        '
        'pnlDocFill
        '
@@ -823,6 +827,7 @@ Partial Class frmConstructor_Main
        resources.ApplyResources(Me.GridControlPos, "GridControlPos")
        Me.GridControlPos.MainView = Me.grvwGridPos
        Me.GridControlPos.Name = "GridControlPos"
+        Me.GridControlPos.TabStop = False
        Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos})
        '
        'grvwGridPos
@@ -903,6 +908,12 @@ Partial Class frmConstructor_Main
        Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
        '
+        'tsbtnPos_Refresh
+        '
+        Me.tsbtnPos_Refresh.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
+        resources.ApplyResources(Me.tsbtnPos_Refresh, "tsbtnPos_Refresh")
+        Me.tsbtnPos_Refresh.Name = "tsbtnPos_Refresh"
+        '
        'BindingNavigatorDeleteItem
        '
        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
@@ -933,6 +944,7 @@ Partial Class frmConstructor_Main
        resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch")
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
+        Me.GridControlDocSearch.TabStop = False
        Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
        '
        'cmsResultFilesBasic
@@ -1144,6 +1156,7 @@ Partial Class frmConstructor_Main
        Me.GridControl1.MainView = Me.GridViewVariants
        Me.GridControl1.Name = "GridControl1"
        Me.GridControl1.ShowOnlyPredefinedDetails = True
+        Me.GridControl1.TabStop = False
        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewVariants})
        '
        'TBPMO_RECORD_VARIANTBindingSource
@@ -1576,12 +1589,6 @@ Partial Class frmConstructor_Main
        '
        Me.TimerClearResultfiles.Interval = 3000
        '
-        'tsbtnPos_Refresh
-        '
-        Me.tsbtnPos_Refresh.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
-        resources.ApplyResources(Me.tsbtnPos_Refresh, "tsbtnPos_Refresh")
-        Me.tsbtnPos_Refresh.Name = "tsbtnPos_Refresh"
-        '
        'frmConstructor_Main
        '
        resources.ApplyResources(Me, "$this")
@@ -1589,6 +1596,7 @@ Partial Class frmConstructor_Main
        Me.Controls.Add(Me.SplitContainerFORM)
        Me.Controls.Add(Me.StatusStrip_Main)
        Me.Controls.Add(Me.NavPane)
+        Me.KeyPreview = True
        Me.Name = "frmConstructor_Main"
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerMain.ResumeLayout(False)
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -525,7 +525,7 @@
    <value>0, 25</value>
  </data>
  <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1067, 212</value>
+    <value>1074, 212</value>
  </data>
  <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -665,7 +665,7 @@
    <value>0, 0</value>
  </data>
  <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1067, 25</value>
+    <value>1074, 25</value>
  </data>
  <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -749,7 +749,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 336</value>
+    <value>786, 343</value>
  </data>
  <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -779,7 +779,7 @@
    <value>0, 26</value>
  </data>
  <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 286</value>
+    <value>561, 293</value>
  </data>
  <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -826,10 +826,10 @@
    <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
  </data>
  <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 312</value>
+    <value>0, 319</value>
  </data>
  <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 24</value>
+    <value>561, 24</value>
  </data>
  <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -856,7 +856,7 @@
    <value>0, 0</value>
  </data>
  <data name="pnlDocToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>554, 26</value>
+    <value>561, 26</value>
  </data>
  <data name="pnlDocToolStrip.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -877,7 +877,7 @@
    <value>Panel2</value>
  </data>
  <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
  </data>
  <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1050,7 +1050,7 @@
    <value>1</value>
  </data>
  <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
  </data>
  <data name="TabDetails.Text" xml:space="preserve">
    <value>Detailansicht</value>
@@ -1068,7 +1068,7 @@
    <value>0</value>
  </data>
  <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1362, 396</value>
+    <value>1362, 403</value>
  </data>
  <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1083,7 +1083,7 @@
    <value>Cyan</value>
  </data>
  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
  </data>
  <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -1107,7 +1107,7 @@
    <value>0, 25</value>
  </data>
  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
  </data>
  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1361,7 +1361,7 @@
 </value>
  </data>
  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
  </data>
  <data name="TabPos.Text" xml:space="preserve">
    <value>Positionen</value>
@@ -1423,7 +1423,7 @@
    <value>Aqua</value>
  </data>
  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
  </data>
  <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@@ -1525,7 +1525,7 @@
    <value>1</value>
  </data>
  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
  </data>
  <data name="TabWindream.Text" xml:space="preserve">
    <value>Dateien</value>
@@ -1956,7 +1956,7 @@
    <value>2</value>
  </data>
  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
  </data>
  <data name="TabFollowUp.Text" xml:space="preserve">
    <value>Wiedervorlage</value>
@@ -2010,7 +2010,7 @@
    <value>39</value>
  </data>
  <data name="colREASON_CODE.Caption" xml:space="preserve">
-    <value>Reason for Variant</value>
+    <value>Grund für Variantenerstellung</value>
  </data>
  <data name="colREASON_CODE.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -2022,7 +2022,7 @@
    <value>229</value>
  </data>
  <data name="colCOMMENT.Caption" xml:space="preserve">
-    <value>Comment</value>
+    <value>Kommentar</value>
  </data>
  <data name="colCOMMENT.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -2034,7 +2034,7 @@
    <value>438</value>
  </data>
  <data name="colADDED_WHO.Caption" xml:space="preserve">
-    <value>Added who</value>
+    <value>Erstellt wer</value>
  </data>
  <data name="colADDED_WHO.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -2046,7 +2046,7 @@
    <value>157</value>
  </data>
  <data name="colADDED_WHEN.Caption" xml:space="preserve">
-    <value>Added when</value>
+    <value>Erstellt wann</value>
  </data>
  <data name="colADDED_WHEN.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -2067,7 +2067,7 @@
    <value>5</value>
  </data>
  <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 340</value>
+    <value>1356, 347</value>
  </data>
  <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
    <value>90</value>
@@ -2139,7 +2139,7 @@
    <value>1</value>
  </data>
  <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 365</value>
+    <value>1356, 372</value>
  </data>
  <data name="TabPageVariant.Text" xml:space="preserve">
    <value>Vorgängervarianten</value>
@@ -3561,6 +3561,12 @@
  <data name="&gt;&gt;BindingNavigatorSeparator2.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;tsbtnPos_Refresh.Name" xml:space="preserve">
+    <value>tsbtnPos_Refresh</value>
+  </data>
+  <data name="&gt;&gt;tsbtnPos_Refresh.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;BindingNavigatorDeleteItem.Name" xml:space="preserve">
    <value>BindingNavigatorDeleteItem</value>
  </data>
@@ -4011,12 +4017,6 @@
  <data name="&gt;&gt;TimerClearResultfiles.Type" xml:space="preserve">
    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;tsbtnPos_Refresh.Name" xml:space="preserve">
-    <value>tsbtnPos_Refresh</value>
-  </data>
-  <data name="&gt;&gt;tsbtnPos_Refresh.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmConstructor_Main</value>
  </data>
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -1705,12 +1705,16 @@ Public Class frmConstructor_Main
            Me.Cursor = Cursors.WaitCursor
            SAVE_ROUTINE_ACTIVE = True
            Save_Grid_Layout()
+            Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
+            If RequiredControlsFilled = False Then
+                Return False
+            End If
            If CtrlCommandUI.IsInsert Then
                EDIT_STATE = EditState.Insert
            Else
                EDIT_STATE = EditState.Update
                NEW_RECORD_ID = 0
-                If Not RECORD_CHANGED Then
+                If RECORD_CHANGED = False Then
                    Update_Status_Label(True, "NO CHANGES in Record.")
                    ActivateAllTabs()
                    DisableEditMode()
@@ -5171,14 +5175,17 @@ Public Class frmConstructor_Main
        Try
            'EDIT_STATE = EditState.None
            'Update_Status_Label(False)
+            Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()

-            If RECORD_CHANGED = False Then
+            If RECORD_CHANGED = False And RequiredControlsFilled = True Then
                ' Datensatz wurde nicht verändert
                Return True
+            Else
+                If RequiredControlsFilled = False Then
+                    Return False
+                End If
            End If

-            Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
-
            If RequiredControlsFilled = True Then
                TrySave_DoSave()

@@ -5809,7 +5816,7 @@ Public Class frmConstructor_Main
                                Dim DT_DOCS As DataTable = ClassDatabase.Return_Datatable(sql, True)
                                For Each doc As DataRow In DT_DOCS.Rows
                                    Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & doc.Item("OBJECTTYPE") & "'", True)
-                                    clsWD_SET.REMOVE_VEKTOR_LINK(doc.Item("DOC_PATH"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID)
+                                    clsWD_SET.REMOVE_VEKTOR_LINK(doc.Item("FULL_FILENAME"), DT_INDICES.Rows(0).Item("IDXNAME_ENTITYID"), ENTITY_ID)
                                Next

                                sql = String.Format("select ORIGIN_CTRL_ID,LINKED_CTRL_ID from TBPMO_CONTROL_ENTITY_LINK where ORIGIN_CTRL_ID in (SELECT GUID FROM TBPMO_CONTROL where FORM_ID = {0}) " & _
@@ -6188,10 +6195,12 @@ Public Class frmConstructor_Main
                    ' Rename file.
                    My.Computer.FileSystem.RenameFile(OldName, NewName)
                    Cursor = Cursors.WaitCursor
-                    If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                        Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
-                                                OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
-                        ClassDatabase.Execute_non_Query(upd, True)
+                    Dim upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Filename = '{0}', FULL_FILENAME = '{1}', CHANGED_WHO = '{2}', CHANGED_WHEN = GETDATE() WHERE DocID = {3}", _
+                                               OnlyFilename, NewName, USER_USERNAME, ClassWindreamDocGrid.SELECTED_DOC_ID)
+                    If DD_LIB_Standards.clsDatabase.Execute_non_Query(upd) Then
+                        If LICENSE_SITE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+                            ClassDatabase.Execute_non_Query(upd, True)
+                        End If
                    End If
                    Cursor = Cursors.Default
                    RUN_WDSEARCH_GRID()
@@ -6576,4 +6585,13 @@ Public Class frmConstructor_Main
    Private Sub tsbtnPos_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnPos_Refresh.Click
        Load_Pos_Data()
    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
+
+        End If
+    End Sub
 End Class