diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index d5b5e05..95a7dfa 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,2 +1,4 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 2e6e1bb..95e0ed5 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -252,8 +252,16 @@ Partial Class frmConstructor_Main Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerMain.Panel1.SuspendLayout() + CType(Me.SplitContainerMain.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerMain.Panel2.SuspendLayout() Me.SplitContainerMain.SuspendLayout() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerTop.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTop.Panel1.SuspendLayout() + CType(Me.SplitContainerTop.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTop.Panel2.SuspendLayout() Me.SplitContainerTop.SuspendLayout() Me.cmsTreeView.SuspendLayout() CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit() @@ -265,6 +273,10 @@ Partial Class frmConstructor_Main Me.TCDetails.SuspendLayout() Me.TabDetails.SuspendLayout() CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerDetails.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDetails.Panel1.SuspendLayout() + CType(Me.SplitContainerDetails.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDetails.Panel2.SuspendLayout() Me.SplitContainerDetails.SuspendLayout() Me.statStripDoc.SuspendLayout() Me.ToolStripEdit.SuspendLayout() @@ -290,6 +302,9 @@ Partial Class frmConstructor_Main CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerFORM.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerFORM.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerFORM.Panel2.SuspendLayout() Me.SplitContainerFORM.SuspendLayout() Me.ContextMenuStripResultFiles.SuspendLayout() CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() @@ -307,8 +322,14 @@ Partial Class frmConstructor_Main resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain") Me.SplitContainerMain.Horizontal = False Me.SplitContainerMain.Name = "SplitContainerMain" + ' + 'SplitContainerMain.Panel1 + ' Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerTop) resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") + ' + 'SplitContainerMain.Panel2 + ' Me.SplitContainerMain.Panel2.Controls.Add(Me.TCDetails) resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") Me.SplitContainerMain.SplitterPosition = 237 @@ -318,8 +339,14 @@ Partial Class frmConstructor_Main Me.SplitContainerTop.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 resources.ApplyResources(Me.SplitContainerTop, "SplitContainerTop") Me.SplitContainerTop.Name = "SplitContainerTop" + ' + 'SplitContainerTop.Panel1 + ' Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain) resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1") + ' + 'SplitContainerTop.Panel2 + ' Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain) resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2") Me.SplitContainerTop.SplitterPosition = 283 @@ -650,8 +677,14 @@ Partial Class frmConstructor_Main Me.SplitContainerDetails.ContextMenuStrip = Me.cmsTreeView resources.ApplyResources(Me.SplitContainerDetails, "SplitContainerDetails") Me.SplitContainerDetails.Name = "SplitContainerDetails" + ' + 'SplitContainerDetails.Panel1 + ' Me.SplitContainerDetails.Panel1.Controls.Add(Me.pnlDetails) resources.ApplyResources(Me.SplitContainerDetails.Panel1, "SplitContainerDetails.Panel1") + ' + 'SplitContainerDetails.Panel2 + ' resources.ApplyResources(Me.SplitContainerDetails.Panel2, "SplitContainerDetails.Panel2") Me.SplitContainerDetails.Panel2.Controls.Add(Me.pnlDocFill) Me.SplitContainerDetails.Panel2.Controls.Add(Me.statStripDoc) @@ -1200,7 +1233,13 @@ Partial Class frmConstructor_Main Me.SplitContainerFORM.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 resources.ApplyResources(Me.SplitContainerFORM, "SplitContainerFORM") Me.SplitContainerFORM.Name = "SplitContainerFORM" + ' + 'SplitContainerFORM.Panel1 + ' resources.ApplyResources(Me.SplitContainerFORM.Panel1, "SplitContainerFORM.Panel1") + ' + 'SplitContainerFORM.Panel2 + ' Me.SplitContainerFORM.Panel2.Controls.Add(Me.SplitContainerMain) resources.ApplyResources(Me.SplitContainerFORM.Panel2, "SplitContainerFORM.Panel2") Me.SplitContainerFORM.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2 @@ -1848,8 +1887,16 @@ Partial Class frmConstructor_Main Me.Name = "frmConstructor_Main" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 + CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerMain.Panel1.ResumeLayout(False) + CType(Me.SplitContainerMain.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerMain.Panel2.ResumeLayout(False) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerMain.ResumeLayout(False) + CType(Me.SplitContainerTop.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTop.Panel1.ResumeLayout(False) + CType(Me.SplitContainerTop.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTop.Panel2.ResumeLayout(False) CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerTop.ResumeLayout(False) Me.cmsTreeView.ResumeLayout(False) @@ -1863,6 +1910,11 @@ Partial Class frmConstructor_Main Me.TCDetails.ResumeLayout(False) Me.TabDetails.ResumeLayout(False) Me.TabDetails.PerformLayout() + CType(Me.SplitContainerDetails.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDetails.Panel1.ResumeLayout(False) + CType(Me.SplitContainerDetails.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDetails.Panel2.ResumeLayout(False) + Me.SplitContainerDetails.Panel2.PerformLayout() CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerDetails.ResumeLayout(False) Me.statStripDoc.ResumeLayout(False) @@ -1897,6 +1949,9 @@ Partial Class frmConstructor_Main Me.XtraTabPage1.ResumeLayout(False) CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerFORM.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerFORM.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerFORM.Panel2.ResumeLayout(False) CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerFORM.ResumeLayout(False) Me.ContextMenuStripResultFiles.ResumeLayout(False) diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 033b755..111fbc6 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -322,7 +322,7 @@ Suche Knoten - 225, 235 + 225, 257 cmsTreeView @@ -360,6 +360,18 @@ Panel1 + + SplitContainerTop.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerTop + + + 0 + 152, 17 @@ -504,6 +516,18 @@ Panel2 + + SplitContainerTop.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerTop + + + 1 + 1203, 237 @@ -528,6 +552,18 @@ Panel1 + + SplitContainerMain.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain + + + 0 + 255, 192, 255 @@ -556,7 +592,7 @@ 0, 0 - 699, 231 + 699, 229 4 @@ -576,6 +612,18 @@ Panel1 + + SplitContainerDetails.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerDetails + + + 0 + True @@ -586,7 +634,7 @@ 0, 0 - 486, 206 + 486, 204 5 @@ -633,7 +681,7 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 206 + 0, 204 486, 25 @@ -659,8 +707,20 @@ Panel2 + + SplitContainerDetails.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerDetails + + + 1 + - 1201, 235 + 1201, 233 1 @@ -836,7 +896,7 @@ 1 - 1201, 262 + 1201, 260 Detailansicht @@ -854,7 +914,7 @@ 0 - 1203, 290 + 1203, 288 3 @@ -866,7 +926,7 @@ 0, 27 - 1201, 223 + 1201, 237 0 @@ -1123,7 +1183,7 @@ - 1201, 250 + 1201, 264 Positionen @@ -1179,7 +1239,7 @@ 0, 0 - 1201, 262 + 1201, 264 7 @@ -1197,7 +1257,7 @@ 0 - 1201, 262 + 1201, 264 Dateien @@ -1628,7 +1688,7 @@ 2 - 1201, 250 + 1201, 264 Wiedervorlage @@ -1730,7 +1790,7 @@ 5 - 1201, 223 + 1201, 237 90 @@ -1802,7 +1862,7 @@ 1 - 1201, 250 + 1201, 264 Vorgängervarianten @@ -1829,7 +1889,7 @@ 0, 0 - 1201, 250 + 1201, 264 301, 17 @@ -1837,8 +1897,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu - My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu + NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL @@ -1858,7 +1918,7 @@ 0 - 1201, 250 + 1201, 264 NodeNavigation(beta) @@ -1890,8 +1950,20 @@ Panel2 + + SplitContainerMain.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain + + + 1 + - 1203, 539 + 1203, 537 2 @@ -1920,11 +1992,35 @@ Panel1 + + SplitContainerFORM.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerFORM + + + 0 + Panel2 + + SplitContainerFORM.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerFORM + + + 1 + - 1203, 539 + 1203, 537 4 @@ -2276,7 +2372,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2302,7 +2398,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFIDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2327,7 +2423,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADACAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2347,7 +2443,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABMDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2371,7 +2467,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMAEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2402,7 +2498,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEYFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2457,7 +2553,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAH4FAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2491,7 +2587,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAB0DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2524,7 +2620,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFoEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2553,7 +2649,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2576,7 +2672,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2602,7 +2698,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2635,7 +2731,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABMDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2659,7 +2755,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPYDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2686,7 +2782,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALwFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2721,7 +2817,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMgFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2756,7 +2852,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACEEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2784,7 +2880,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADkCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2804,7 +2900,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2828,7 +2924,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2855,7 +2951,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEkDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2879,7 +2975,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2904,7 +3000,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2928,7 +3024,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPECAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2951,7 +3047,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHECAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -2992,10 +3088,10 @@ 1203, 147 - 0, 686 + 0, 684 - 1203, 23 + 1203, 25 RibbonStatusBar1 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 96a6693..04de4f2 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -21,6 +21,7 @@ Imports DevExpress.XtraTreeList.Columns Imports DevExpress.XtraTreeList.Nodes.Operations Imports DevExpress.XtraTreeList.Nodes Imports DevExpress.XtraPrinting +Imports DevExpress.XtraSplashScreen Public Class frmConstructor_Main @@ -87,6 +88,8 @@ Public Class frmConstructor_Main Private POS_SQL As String = "" Private POS_RECORD_ID Private MyTreeview As TreeView + Private Node_AfterSelect As Boolean = False + Private taskToken As CancellationTokenSource Private TreeView_perControl As Boolean = False @@ -434,7 +437,13 @@ Public Class frmConstructor_Main NODE_NAVIGATION = True tsmiNodedownSearch.Visible = True tsmiNodeNew.Visible = True - tsmiNodeRename.Visible = True + If USER_IS_ADMIN Then + tsmiNodeRename.Visible = True + Else + tsmiNodeRename.Visible = False + End If + + Else tsmiNodeNew.Visible = False tsmiNodeRename.Visible = False @@ -1301,8 +1310,9 @@ Public Class frmConstructor_Main End If End Sub Private Sub TreeViewMain_AfterSelect(sender As Object, e As TreeViewEventArgs) Handles TreeViewMain.AfterSelect - Dim sw As New SW("TreeViewMain_AfterSelect1") - Dim swAll As New SW("TreeViewMain_AfterSelect") + Node_AfterSelect = True + 'Dim sw As New SW("TreeViewMain_AfterSelect1") + ' Dim swAll As New SW("TreeViewMain_AfterSelect") DisableEditMode() If NODE_NAVIGATION = False Then SetSelectedNodeStyle(TreeViewMain.Nodes) @@ -1322,10 +1332,10 @@ Public Class frmConstructor_Main Else firstORFOLLWOWIN = False End If - sw.Done() + ' sw.Done() Load_Datafor_Entity(False) - sw = New SW("TreeViewMain_AfterSelect2") + 'sw = New SW("TreeViewMain_AfterSelect2") If DOC_SEARCH_TAB1 = True Then tsbtnPanel1Collapse.Visible = True @@ -1370,8 +1380,8 @@ Public Class frmConstructor_Main End If End If - sw.Done() - sw = New SW("TreeViewMain_AfterSelect3") + 'sw.Done() + 'SW = New SW("TreeViewMain_AfterSelect3") Load_DocGrid_Layout() Load_Grid_Layout() @@ -1379,7 +1389,8 @@ Public Class frmConstructor_Main Load_Splitter_Layout() SELECTION_IN_ACTION = False - swAll.Done() + 'swAll.Done() + Node_AfterSelect = False End Sub Sub Doc_ReadOnlyHandler(state As Boolean) Dim sw As New SW("Doc_ReadOnlyHandler") @@ -2001,7 +2012,7 @@ Public Class frmConstructor_Main ' Das StatusLabel aktualisieren Update_Record_Label(NEW_RECORD_ID) Doc_ReadOnlyHandler(True) - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) ' Im gegensatz zu EnableEditMode muss hier nur der save button enabled werden tsButtonSave.Enabled = True ' Muss aktiviert werden, sonst funktionieren die Combobox Abhängigkeits Events nicht @@ -2466,8 +2477,6 @@ Public Class frmConstructor_Main Return Convert.ToInt32(apt.CustomFields("RecordID")) = SELECTED_RECORD_ID End Function #End Region - - Sub Load_Entity_Data_CONTROLS_RECORDS() Try LOGGER.Debug("START Load_Entity_Data") @@ -3377,7 +3386,9 @@ Public Class frmConstructor_Main ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in HideColumns_Pos: ", ex.Message) End Try End Sub - Private Sub Show_Selected_Record_Data(Rec_ID As Integer, EntityLoad As Boolean) + Async Function Show_Selected_Record_Data(Rec_ID As Integer, EntityLoad As Boolean) As Threading.Tasks.Task + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + Try Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form @@ -3510,15 +3521,17 @@ Public Class frmConstructor_Main 'tsstatus_Detail_show(False, "") Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in SelectedRecord_ShowData: ", ex.Message) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) End Try - End Sub + End Function Sub DocSearch_Decision() If RECORD_ID = 0 Then 'RUN_WD_SEARCH(WD_Suche, "ENTITY") - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(False) Else - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(False) ' RUN_WD_SEARCH(WD_Suche, "RECORD") End If End Sub @@ -3828,10 +3841,18 @@ Public Class frmConstructor_Main End Try sw.Done() End Sub - Private Sub RUN_WDSEARCH_GRID() - Me.Cursor = Cursors.WaitCursor + Async Function RUN_WDSEARCH_GRID(osplashscreen As Boolean) As Threading.Tasks.Task + Dim oHandle As IOverlaySplashScreenHandle + If osplashscreen Then + oHandle = SplashScreenManager.ShowOverlayForm(Me) + taskToken = New CancellationTokenSource() + End If + + Dim sw As New SW("RUN_WDSEARCH_GRID") + Try + ' Thread.Sleep(5000) BarEditItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bsitmLoadEntity.Caption = "Documents loading..." If CURRENT_SEARCH_TYPE = "NODE_DOWN" Then @@ -3840,7 +3861,6 @@ Public Class frmConstructor_Main Dim sql = String.Format("DECLARE @return_value int " & vbNewLine & "EXEC @return_value = [dbo].[PRPMO_NODES_GET_CHILD_RECORDS] @USER_ID = {0}, @NODE_ID = {1} " & vbNewLine & "SELECT 'Return Value' = @return_value", USER_GUID, NODE_GUID) - Me.Cursor = Cursors.WaitCursor Dim DT_ASYNC As DataTable Try Dim async As New ClassAsyncSQL(sql) @@ -3859,151 +3879,157 @@ Public Class frmConstructor_Main ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Getting SubNodes-Structure", "Check the logfile") End If End If - Me.Cursor = Cursors.Default + End If Dim DT_RESULT As DataTable DT_RESULT = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_COLUMNS_GRID, ENTITY_ID, RECORD_ID, CBool(LOAD_ENTITY_SEARCH_AT_STARTUP)) If IsNothing(DT_RESULT) Then - Dim msg = "wrong DocSearch-Configuration oer unexpected Error in Get_DOC_RESULTTABLE - Check logfile and contact Digital Data" + Dim msg = "wrong DocSearch-Configuration or unexpected Error in Get_DOC_RESULTTABLE - Check logfile and contact Digital Data" GridViewDoc_Search.ViewCaption = msg - Me.Cursor = Cursors.Default - Exit Sub - End If - If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse - Dim selnode As TreeNode = TreeViewMain.SelectedNode - Dim NODE_TEXT As String = selnode.Text - - Dim msg = "Dateien für Record: " & RECORD_ID - If CURRENT_SEARCH_TYPE = "ENTITY" Then - selnode = TreeViewMain.SelectedNode - Dim Entitystring - If selnode.Text.Contains(" (") Then - Entitystring = selnode.Text.Substring(0, selnode.Text.IndexOf("(") - 1) - Else - Entitystring = selnode.Text - End If - msg = "Dateien für Entität: " & Entitystring - If USER_LANGUAGE <> "de-DE" Then - msg = "files for entity: " & Entitystring - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then - If NODE_NAVIGATION Then - If NODE_TEXT.Contains(" (") Then - NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) - End If - msg = String.Format("Dateien für Objekt '{0}' ", NODE_TEXT) - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("Files for Object '{0}'", NODE_TEXT) - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - Else - msg = String.Format("Dateien für Record '{0}' ", RECORD_ID) - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("Files for record '{0}'", RECORD_ID) - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - End If - ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then - selnode = TreeViewMain.SelectedNode - msg = "Dateien für Knotenunterstruktur" - If USER_LANGUAGE <> "de-DE" Then - msg = "files found in Node-Substructure" - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - Else - msg = String.Format("Ergebnis der Volltextsuche") - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("Result of Fulltext-Search") - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - End If - - GridViewDoc_Search.ViewCaption = msg - - If DT_RESULT.Rows.Count > 0 Then - If CURRENT_SEARCH_TYPE = "FULLTEXT" Then - If SplitContainerDetails.Collapsed = False And tsbtnPanel1Collapse.Visible = True Then - Collapse_Details() - End If - grvwGrid.ShowFindPanel() - grvwGrid.FindFilterText = CURRENT_FULLTEXT_PATTERN - End If - - If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then - LOGGER.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!") - End If - - ClassWindreamDocGrid.FillColumns( - GridViewDoc_Search, - DT_RESULT, - DT_WINDREAM_COLUMNS_GRID, - DT_DOCRESULT_DROPDOWN_ITEMS, - AddressOf OnCBSelectedValueChanged, - AddressOf OnDateSelectedValueChanged, - AddressOf OnTextSelectedValueChanged, - AddressOf OnCheckboxValueChanged, - CURRENT_SEARCH_TYPE, RECORD_ID) - - End If - BbtnitmDocSearch.Enabled = True Else - Dim selnode As TreeNode = TreeViewMain.SelectedNode - Dim NODE_TEXT As String = selnode.Text - Dim msg = "Keine Dateien für '" - If CURRENT_SEARCH_TYPE = "ENTITY" Then - selnode = TreeViewMain.SelectedNode - Dim Entitystring - If selnode.Text.Contains(" (") Then - Entitystring = selnode.Text.Substring(0, selnode.Text.IndexOf("(") - 1) - Else - Entitystring = selnode.Text - End If - msg = "Keine Dateien für Entität: " & Entitystring & " gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for entity: " & Entitystring - End If - ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then - If NODE_NAVIGATION Then - If NODE_TEXT.Contains(" (") Then - NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) - End If - msg &= NODE_TEXT & "' gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for object '" & NODE_TEXT & "'" - End If - Else - msg &= "Record '" & RECORD_ID & "' gefunden" - End If - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for record " & RECORD_ID - End If - ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then - msg = "Keine Dateien für Knotenunterstruktur gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found in Node-Substructure" - End If - Else - msg = "Keine Dateien für Volltextsuche (" & CURRENT_FULLTEXT_PATTERN & ") gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for fulltext-search (" & CURRENT_FULLTEXT_PATTERN & ")" - End If - End If + If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse + Dim selnode As TreeNode = TreeViewMain.SelectedNode + Dim NODE_TEXT As String = selnode.Text - GridViewDoc_Search.ViewCaption = msg - GridControlDocSearch.DataSource = Nothing - 'Clear_Windream_ResultList() + Dim msg = "Dateien für Record: " & RECORD_ID + If CURRENT_SEARCH_TYPE = "ENTITY" Then + selnode = TreeViewMain.SelectedNode + Dim Entitystring + If selnode.Text.Contains(" (") Then + Entitystring = selnode.Text.Substring(0, selnode.Text.IndexOf("(") - 1) + Else + Entitystring = selnode.Text + End If + msg = "Dateien für Entität: " & Entitystring + If USER_LANGUAGE <> "de-DE" Then + msg = "files for entity: " & Entitystring + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" + ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then + If NODE_NAVIGATION Then + If NODE_TEXT.Contains(" (") Then + NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) + End If + msg = String.Format("Dateien für Objekt '{0}' ", NODE_TEXT) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Files for Object '{0}'", NODE_TEXT) + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" + Else + msg = String.Format("Dateien für Record '{0}' ", RECORD_ID) + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Files for record '{0}'", RECORD_ID) + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" + End If + ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then + selnode = TreeViewMain.SelectedNode + msg = "Dateien für Knotenunterstruktur" + If USER_LANGUAGE <> "de-DE" Then + msg = "files found in Node-Substructure" + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" + Else + msg = String.Format("Ergebnis der Volltextsuche") + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Result of Fulltext-Search") + End If + msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" + End If + + GridViewDoc_Search.ViewCaption = msg + + If DT_RESULT.Rows.Count > 0 Then + If CURRENT_SEARCH_TYPE = "FULLTEXT" Then + If SplitContainerDetails.Collapsed = False And tsbtnPanel1Collapse.Visible = True Then + Collapse_Details() + End If + grvwGrid.ShowFindPanel() + grvwGrid.FindFilterText = CURRENT_FULLTEXT_PATTERN + End If + + If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then + LOGGER.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!") + End If + + ClassWindreamDocGrid.FillColumns( + GridViewDoc_Search, + DT_RESULT, + DT_WINDREAM_COLUMNS_GRID, + DT_DOCRESULT_DROPDOWN_ITEMS, + AddressOf OnCBSelectedValueChanged, + AddressOf OnDateSelectedValueChanged, + AddressOf OnTextSelectedValueChanged, + AddressOf OnCheckboxValueChanged, + CURRENT_SEARCH_TYPE, RECORD_ID) + + End If + BbtnitmDocSearch.Enabled = True + Else + Dim selnode As TreeNode = TreeViewMain.SelectedNode + Dim NODE_TEXT As String = selnode.Text + Dim msg = "Keine Dateien für '" + If CURRENT_SEARCH_TYPE = "ENTITY" Then + selnode = TreeViewMain.SelectedNode + Dim Entitystring + If selnode.Text.Contains(" (") Then + Entitystring = selnode.Text.Substring(0, selnode.Text.IndexOf("(") - 1) + Else + Entitystring = selnode.Text + End If + msg = "Keine Dateien für Entität: " & Entitystring & " gefunden" + If USER_LANGUAGE <> "de-DE" Then + msg = "No files found for entity: " & Entitystring + End If + ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then + If NODE_NAVIGATION Then + If NODE_TEXT.Contains(" (") Then + NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) + End If + msg &= NODE_TEXT & "' gefunden" + If USER_LANGUAGE <> "de-DE" Then + msg = "No files found for object '" & NODE_TEXT & "'" + End If + Else + msg &= "Record '" & RECORD_ID & "' gefunden" + End If + If USER_LANGUAGE <> "de-DE" Then + msg = "No files found for record " & RECORD_ID + End If + ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then + msg = "Keine Dateien für Knotenunterstruktur gefunden" + If USER_LANGUAGE <> "de-DE" Then + msg = "No files found in Node-Substructure" + End If + Else + msg = "Keine Dateien für Volltextsuche (" & CURRENT_FULLTEXT_PATTERN & ") gefunden" + If USER_LANGUAGE <> "de-DE" Then + msg = "No files found for fulltext-search (" & CURRENT_FULLTEXT_PATTERN & ")" + End If + End If + + GridViewDoc_Search.ViewCaption = msg + GridControlDocSearch.DataSource = Nothing + 'Clear_Windream_ResultList() + End If End If + Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Run WD-Search Database: ", ex.Message) + Finally + sw.Done() + BarEditItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + bsitmLoadEntity.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + If osplashscreen Then + SplashScreenManager.CloseOverlayForm(oHandle) + End If + End Try - sw.Done() - BarEditItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - bsitmLoadEntity.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - Cursor = Cursors.Default - End Sub + + + End Function Private Sub OnCBSelectedValueChanged(sender As Object, e As EventArgs) Try Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID @@ -4362,7 +4388,7 @@ Public Class frmConstructor_Main GridControlDocSearch.DataSource = Nothing GridViewDoc_Search.Columns.Clear() - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) Else MsgBox("Set back of Layout not successfull - File not existing!", MsgBoxStyle.Information) @@ -4409,7 +4435,7 @@ Public Class frmConstructor_Main If RECORD_ID = 0 Then Exit Sub Else - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If Load_DocGrid_Layout() Case "TabFollowUp" @@ -4557,7 +4583,7 @@ Public Class frmConstructor_Main 'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren If NEW_FILES_ADDED = True Then Me.Cursor = Cursors.WaitCursor - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) TimerClearResultfiles.Start() Else LOGGER.Debug("No new files were added or windream tab is not focused!") @@ -5087,7 +5113,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If CInt(SOLLENTITY_ID) = REC_ENTITY_ID Then Cursor = Cursors.WaitCursor If ClassOfficeTemplate.Open_Word_Template(TemplateID, RECORD_ID) = True Then - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) ' RUN_WD_SEARCH(WD_Suche, "RECORD") Update_Status_Label(True, "Template file imported to windream", EditState.Insert) End If @@ -5487,7 +5513,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH") Cursor = Cursors.WaitCursor - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If 'Dim DT_INDICES As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '" & row.Item("OBJECTTYPE") & "'", True) @@ -6077,7 +6103,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Dim msg1 As String If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Then If ClassFileResult.Set_InWork(0, "") = True Then - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If Else msglbl = "In Bearbeitung durch User '" & IW_USER & "' - Kommentar:" @@ -6090,7 +6116,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Else frmFileInWork.ShowDialog() ClassWindreamDocGrid.SELECTED_INWORK = ClassFileResult.InWork - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If End Sub @@ -6239,7 +6265,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If CURRENT_SEARCH_TYPE = "ENTITY" Then CURRENT_DT_DOC_ENTITY_SEARCH = Nothing End If - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If @@ -6553,7 +6579,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Private Sub DateiVersionierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiVersionierenToolStripMenuItem.Click Refresh_Selected_Table() frmWM_CreateVersion.ShowDialog() - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End Sub Sub Refresh_Selected_Table() Dim table As New DataTable @@ -6585,7 +6611,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") CURRENT_FORMVIEW_ID = FORMVIEW_ID Refresh_Selected_Table() frmWM_ChangeDoctype.ShowDialog() - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End Sub Private Sub NeuToolStripMenuItem_MouseHover(sender As Object, e As EventArgs) Handles NeuToolStripMenuItem.MouseHover Display_Filename() @@ -6617,7 +6643,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") End If End If Cursor = Cursors.Default - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) ContextMenuStripResultFiles.Close() End If Catch ex As Exception @@ -6641,7 +6667,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If CMDoc_TextBoxRenameDisplay.Text <> "" Then If ClassFileResult.Set_Displayname(CMDoc_TextBoxRenameDisplay.Text) Then Cursor = Cursors.WaitCursor - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) ContextMenuStripResultFiles.Close() End If End If @@ -6653,7 +6679,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Private Sub DateienDiesemUndToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiNodedownSearch.Click CURRENT_SEARCH_TYPE = "NODE_DOWN" - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End Sub Private Sub EnitätssucheToolStripMenuItem_Click(sender As Object, e As EventArgs) @@ -6900,7 +6926,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") End If frmWM_FulltextChoice.ShowDialog() If CURRENT_FULLTEXT_PATTERN <> "" Then - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If End Sub @@ -7004,6 +7030,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") If ERROR_WHILE_SAVING = True Then Column_Row_Handler("StrgS") End If + ElseIf e.KeyCode.Escape Then + If IsNothing(taskToken) Then + 'taskToken.Cancel() + End If End If End Sub @@ -7157,7 +7187,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Dim oupd = $"UPDATE TBPMO_DOC_USER_REFRESH_VIEW SET REFRESHED_WHEN = GETDATE() WHERE GUID = {oDTGUID.Rows(0).Item(0)}" If ClassDatabase.Execute_non_Query(oupd, False) = True Then MsgBox("Attention: The docID of one document changed! The DocSearch will be refreshed!", MsgBoxStyle.Information) - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End If End If @@ -7428,7 +7458,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") End Sub Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmDocSearch.ItemClick - RUN_WDSEARCH_GRID() + RUN_WDSEARCH_GRID(True) End Sub Private Sub BarButtonItem16_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick