From 747d64cb8c5e655db304b5f58a687d783b5b0e6d Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 22 Sep 2023 08:27:43 +0200 Subject: [PATCH 1/9] Update Installer --- app/Setup_NoUpdaterVS19/Product.wxs | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index 11438a3..d3cd70b 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -140,7 +140,6 @@ - From ebe79ddb92e569bff5233bf41775f02106e84927 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 27 Sep 2023 15:01:04 +0200 Subject: [PATCH 2/9] Change Doc Type --- .../NodeNavigation/ClassDoctypeChange.vb | 29 +++ app/DD-Record-Organizer/OrgFlow.vbproj | 10 + .../frmChangeDocType.Designer.vb | 174 ++++++++++++++++++ app/DD-Record-Organizer/frmChangeDocType.resx | 139 ++++++++++++++ app/DD-Record-Organizer/frmChangeDocType.vb | 29 +++ .../frmNewNode.Designer.vb | 11 +- app/DD-Record-Organizer/frmNewNode.resx | 24 +++ .../frmNodeNavigation.Designer.vb | 34 ++-- app/DD-Record-Organizer/frmNodeNavigation.vb | 55 +++++- 9 files changed, 481 insertions(+), 24 deletions(-) create mode 100644 app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb create mode 100644 app/DD-Record-Organizer/frmChangeDocType.Designer.vb create mode 100644 app/DD-Record-Organizer/frmChangeDocType.resx create mode 100644 app/DD-Record-Organizer/frmChangeDocType.vb diff --git a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb new file mode 100644 index 0000000..51d7b0d --- /dev/null +++ b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb @@ -0,0 +1,29 @@ +Imports DD_LIB_Standards +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Logging + +Public Class ClassDoctypeChange + Inherits BaseClass + + Public Sub New(pLogConfig As LogConfig) + MyBase.New(pLogConfig) + End Sub + + Public Function ChangeDocType(pFilePaths As List(Of String), pNewDocTypeName As String, pObjectType As String) As Boolean + Try + For Each oPath As String In pFilePaths + Dim oResult As Boolean = clsWD_SET.IndexFile(oPath, "String 37", pNewDocTypeName, pObjectType) + If oResult = True Then + Logger.Debug("Successfully set doctype of file [{0}] to [{1}]", oPath, pNewDocTypeName) + Else + Logger.Warn("Could not set doctype of file [{0}]!", pNewDocTypeName) + End If + Next + + Return True + Catch ex As Exception + Logger.Error(ex) + + End Try + End Function +End Class diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 04def83..08c8407 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -307,6 +307,7 @@ + True @@ -322,6 +323,12 @@ Form + + frmChangeDocType.vb + + + Form + frmChooseParentRecord.vb @@ -803,6 +810,9 @@ frmCalendarEntity.vb + + frmChangeDocType.vb + frmChooseParentRecord.vb diff --git a/app/DD-Record-Organizer/frmChangeDocType.Designer.vb b/app/DD-Record-Organizer/frmChangeDocType.Designer.vb new file mode 100644 index 0000000..6b5b397 --- /dev/null +++ b/app/DD-Record-Organizer/frmChangeDocType.Designer.vb @@ -0,0 +1,174 @@ + _ +Partial Class frmChangeDocType + Inherits DevExpress.XtraEditors.XtraForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmChangeDocType)) + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.cmbDocType = New DevExpress.XtraEditors.ComboBoxEdit() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.txtDocuments = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbDocType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtDocuments.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.cmbDocType) + Me.LayoutControl1.Controls.Add(Me.SimpleButton1) + Me.LayoutControl1.Controls.Add(Me.txtDocuments) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(431, 131) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.EmptySpaceItem2, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(431, 131) + Me.Root.TextVisible = False + ' + 'cmbDocType + ' + Me.cmbDocType.Location = New System.Drawing.Point(114, 36) + Me.cmbDocType.Name = "cmbDocType" + Me.cmbDocType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbDocType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor + Me.cmbDocType.Size = New System.Drawing.Size(305, 20) + Me.cmbDocType.StyleController = Me.LayoutControl1 + Me.cmbDocType.TabIndex = 5 + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.cmbDocType + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 24) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(411, 24) + Me.LayoutControlItem2.Text = "Neue Dokumentart" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(90, 13) + ' + 'SimpleButton1 + ' + Me.SimpleButton1.DialogResult = System.Windows.Forms.DialogResult.OK + Me.SimpleButton1.Location = New System.Drawing.Point(299, 97) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(120, 22) + Me.SimpleButton1.StyleController = Me.LayoutControl1 + Me.SimpleButton1.TabIndex = 6 + Me.SimpleButton1.Text = "OK" + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.SimpleButton1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(287, 85) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(124, 26) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem1.TextVisible = False + ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 85) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(287, 26) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'EmptySpaceItem2 + ' + Me.EmptySpaceItem2.AllowHotTrack = False + Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 48) + Me.EmptySpaceItem2.Name = "EmptySpaceItem2" + Me.EmptySpaceItem2.Size = New System.Drawing.Size(411, 37) + Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) + ' + 'txtDocuments + ' + Me.txtDocuments.Location = New System.Drawing.Point(114, 12) + Me.txtDocuments.Name = "txtDocuments" + Me.txtDocuments.Properties.ReadOnly = True + Me.txtDocuments.Size = New System.Drawing.Size(305, 20) + Me.txtDocuments.StyleController = Me.LayoutControl1 + Me.txtDocuments.TabIndex = 7 + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.txtDocuments + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(411, 24) + Me.LayoutControlItem3.Text = "Dokument" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(90, 13) + ' + 'frmChangeDocType + ' + Me.AcceptButton = Me.SimpleButton1 + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(431, 131) + Me.Controls.Add(Me.LayoutControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmChangeDocType.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Name = "frmChangeDocType" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Dokumentart ändern" + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbDocType.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtDocuments.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents cmbDocType As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents txtDocuments As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem +End Class diff --git a/app/DD-Record-Organizer/frmChangeDocType.resx b/app/DD-Record-Organizer/frmChangeDocType.resx new file mode 100644 index 0000000..b76fe78 --- /dev/null +++ b/app/DD-Record-Organizer/frmChangeDocType.resx @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHECAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTXVsdGlwbGVfRG9jdW1lbnRzIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91 + bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDoj + NzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTMxLDhoLTVWNWMwLTAuNS0wLjUtMS0xLTFoLTVW + MWMwLTAuNS0wLjUtMS0xLTFIMUMwLjUsMCwwLDAuNSwwLDF2MjJjMCwwLjUsMC41LDEsMSwxaDV2M2Mw + LDAuNSwwLjUsMSwxLDEgIGg1djNjMCwwLjUsMC41LDEsMSwxaDE4YzAuNSwwLDEtMC41LDEtMVY5QzMy + LDguNSwzMS41LDgsMzEsOHogTTYsNXYxN0gyVjJoMTZ2Mkg3QzYuNSw0LDYsNC41LDYsNXogTTEyLDl2 + MTdIOFY2aDE2djJIMTMgIEMxMi41LDgsMTIsOC41LDEyLDl6IE0zMCwzMEgxNFYxMGgxNlYzMHoiIGNs + YXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs= + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmChangeDocType.vb b/app/DD-Record-Organizer/frmChangeDocType.vb new file mode 100644 index 0000000..7c7dce0 --- /dev/null +++ b/app/DD-Record-Organizer/frmChangeDocType.vb @@ -0,0 +1,29 @@ +Public Class frmChangeDocType + Public Property SelectedDocType As DocType + Public Property DocTypes As List(Of DocType) + Public Property FileNames As List(Of String) + + + Private Sub frmChangeDocType_Load(sender As Object, e As EventArgs) Handles MyBase.Load + cmbDocType.Properties.Items.AddRange(DocTypes) + + If FileNames.Count = 1 Then + txtDocuments.EditValue = FileNames.First() + Else + txtDocuments.EditValue = $"{FileNames.Count} Dokumente" + End If + End Sub + + Public Class DocType + Public Property Name As String + Public Property Id As Integer + + Public Overrides Function ToString() As String + Return Name + End Function + End Class + + Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click + SelectedDocType = cmbDocType.EditValue + End Sub +End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmNewNode.Designer.vb b/app/DD-Record-Organizer/frmNewNode.Designer.vb index 0c67dae..6c7cdd8 100644 --- a/app/DD-Record-Organizer/frmNewNode.Designer.vb +++ b/app/DD-Record-Organizer/frmNewNode.Designer.vb @@ -19,6 +19,7 @@ Partial Class frmNewNode 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNewNode)) Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.cmbNodeConfig = New DevExpress.XtraEditors.ComboBoxEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() @@ -56,19 +57,19 @@ Partial Class frmNewNode ' 'cmbNodeConfig ' - Me.cmbNodeConfig.Location = New System.Drawing.Point(73, 36) + Me.cmbNodeConfig.Location = New System.Drawing.Point(81, 36) Me.cmbNodeConfig.Name = "cmbNodeConfig" Me.cmbNodeConfig.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.cmbNodeConfig.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor - Me.cmbNodeConfig.Size = New System.Drawing.Size(356, 20) + Me.cmbNodeConfig.Size = New System.Drawing.Size(348, 20) Me.cmbNodeConfig.StyleController = Me.LayoutControl1 Me.cmbNodeConfig.TabIndex = 4 ' 'TextEdit1 ' - Me.TextEdit1.Location = New System.Drawing.Point(73, 12) + Me.TextEdit1.Location = New System.Drawing.Point(81, 12) Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(356, 20) + Me.TextEdit1.Size = New System.Drawing.Size(348, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 5 ' @@ -140,9 +141,11 @@ Partial Class frmNewNode Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(441, 125) Me.Controls.Add(Me.LayoutControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmNewNode.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmNewNode" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Neuen Knoten erstellen" CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) diff --git a/app/DD-Record-Organizer/frmNewNode.resx b/app/DD-Record-Organizer/frmNewNode.resx index 1af7de1..6bb6dd7 100644 --- a/app/DD-Record-Organizer/frmNewNode.resx +++ b/app/DD-Record-Organizer/frmNewNode.resx @@ -117,4 +117,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSW5zZXJ0VHJl + ZVZpZXciPg0KICAgIDxwYXRoIGQ9Ik0xMyw4SDVDNC40LDgsNCw3LjYsNCw3VjNjMC0wLjUsMC40LTEs + MS0xaDhjMC42LDAsMSwwLjUsMSwxdjRDMTQsNy42LDEzLjYsOCwxMyw4eiBNMjYsMTd2LTQgICBjMC0w + LjYtMC41LTEtMS0xaC04Yy0wLjUsMC0xLDAuNC0xLDF2NGMwLDAuNSwwLjUsMSwxLDFoOEMyNS41LDE4 + LDI2LDE3LjUsMjYsMTd6IE0yNiwyN3YtNGMwLTAuNS0wLjUtMS0xLTFoLThjLTAuNSwwLTEsMC41LTEs + MSAgIHY0YzAsMC41LDAuNSwxLDEsMWg4QzI1LjUsMjgsMjYsMjcuNSwyNiwyN3oiIGNsYXNzPSJZZWxs + b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs + MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2 + Zz4L + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index bc132eb..b040e80 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -85,6 +85,7 @@ Partial Class frmNodeNavigation Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) Me.SplitContainerDocView = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -124,7 +125,7 @@ Partial Class frmNodeNavigation Me.ribbonNodeNavigation.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[True] Me.ribbonNodeNavigation.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] Me.ribbonNodeNavigation.ShowToolbarCustomizeItem = False - Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1307, 147) + Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1307, 158) Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1 Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False ' @@ -305,10 +306,10 @@ Partial Class frmNodeNavigation Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmRecordID) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 667) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 668) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1307, 23) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1307, 22) ' 'RibbonPage2 ' @@ -330,7 +331,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainer1) Me.SplitContainerMain.Panel2.Text = "Panel2" - Me.SplitContainerMain.Size = New System.Drawing.Size(1295, 520) + Me.SplitContainerMain.Size = New System.Drawing.Size(1297, 510) Me.SplitContainerMain.SplitterPosition = 289 Me.SplitContainerMain.TabIndex = 2 ' @@ -368,7 +369,7 @@ Partial Class frmNodeNavigation Me.TreeListDevexpress.OptionsView.ShowVertLines = False Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark Me.TreeListDevexpress.ParentFieldName = "PARENT_GUID" - Me.TreeListDevexpress.Size = New System.Drawing.Size(289, 520) + Me.TreeListDevexpress.Size = New System.Drawing.Size(289, 510) Me.TreeListDevexpress.StateImageList = Me.ImageCollection1 Me.TreeListDevexpress.TabIndex = 1 ' @@ -391,8 +392,8 @@ Partial Class frmNodeNavigation 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlDocSearch) - Me.SplitContainer1.Size = New System.Drawing.Size(994, 520) - Me.SplitContainer1.SplitterDistance = 167 + Me.SplitContainer1.Size = New System.Drawing.Size(998, 510) + Me.SplitContainer1.SplitterDistance = 163 Me.SplitContainer1.TabIndex = 0 ' 'pnlControls @@ -402,7 +403,7 @@ Partial Class frmNodeNavigation Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(994, 167) + Me.pnlControls.Size = New System.Drawing.Size(998, 163) Me.pnlControls.TabIndex = 0 ' 'GridControlDocSearch @@ -415,7 +416,7 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" - Me.GridControlDocSearch.Size = New System.Drawing.Size(994, 349) + Me.GridControlDocSearch.Size = New System.Drawing.Size(998, 343) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) @@ -472,9 +473,9 @@ Partial Class frmNodeNavigation ' 'cmsResultFileDetail ' - Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLink_ShowAll, Me.tsmiFileLinkRemove, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) + Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLink_ShowAll, Me.tsmiFileLinkRemove, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.tsmiFileVersion, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles" - Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 276) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 320) ' 'tsmiFileProperties ' @@ -603,7 +604,7 @@ Partial Class frmNodeNavigation Me.SplitContainerDocView.Collapsed = True Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 147) + Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158) Me.SplitContainerDocView.Name = "SplitContainerDocView" ' 'SplitContainerDocView.Panel1 @@ -615,7 +616,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer) Me.SplitContainerDocView.Panel2.Text = "Panel2" - Me.SplitContainerDocView.Size = New System.Drawing.Size(1307, 520) + Me.SplitContainerDocView.Size = New System.Drawing.Size(1307, 510) Me.SplitContainerDocView.SplitterPosition = 969 Me.SplitContainerDocView.TabIndex = 0 ' @@ -628,6 +629,12 @@ Partial Class frmNodeNavigation Me.DocumentViewer.Size = New System.Drawing.Size(0, 0) Me.DocumentViewer.TabIndex = 0 ' + 'DokumentartÄndernToolStripMenuItem + ' + Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" + Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(239, 22) + Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" + ' 'frmNodeNavigation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -729,4 +736,5 @@ Partial Class frmNodeNavigation Friend WithEvents RibbonPageGroupView As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents checkShowPreview As DevExpress.XtraBars.BarCheckItem Friend WithEvents btnCreateNewNode As DevExpress.XtraBars.BarButtonItem + Friend WithEvents DokumentartÄndernToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index b62c49e..834258c 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -2938,15 +2938,56 @@ Public Class frmNodeNavigation Dim oParentNodeGuid As Integer = FocusedNode.Item("GUID") Dim oIsExpanded As Boolean = FocusedNode.Expanded Dim oNodeCreator = New ClassNodeCreator(LOGCONFIG, ImageCollection1) - oNodeCreator.AddNode(_EntityId, oForm.Title, oParentNodeGuid, oForm.Id, oCreateRecord) + Dim oSuccess = oNodeCreator.AddNode(_EntityId, oForm.Title, oParentNodeGuid, oForm.Id, oCreateRecord) - Await ReloadTreeView() + If oSuccess = True Then + Dim oMessage As String = "Der Knoten wurde erfolgreich angelegt! Wollen Sie die Sicht jetzt neu laden? Abhängig von der Anzahl der Knoten kann dies einige Sekunden dauern." + + If MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.Yes Then + Await ReloadTreeView() - Dim oNode = TreeListDevexpress.FindNodeByFieldValue("GUID", oParentNodeGuid) - Dim oNodeIndex = TreeListDevexpress.MakeNodeVisible(oNode) - TreeListDevexpress.SetFocusedNode(oNode) - If oIsExpanded Then - oNode.Expand() + Dim oNode = TreeListDevexpress.FindNodeByFieldValue("GUID", oParentNodeGuid) + Dim oNodeIndex = TreeListDevexpress.MakeNodeVisible(oNode) + TreeListDevexpress.SetFocusedNode(oNode) + If oIsExpanded Then + oNode.Expand() + End If + End If + Else + MsgBox("Fehler beim Anlegen des neuen Knotens!", MsgBoxStyle.Critical, Text) End If + + End Sub + + Private Sub DokumentartÄndernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DokumentartÄndernToolStripMenuItem.Click + + Try + Dim oSelectedDocs = ClassWindreamDocGrid.GetSelectedDocuments(GridViewDoc_Search) + + If oSelectedDocs.Count = 0 Then + Exit Sub + End If + + Dim oTable = MYDB_ECM.GetDatatable($"SELECT DOKUMENTTYPE_ID AS ID, DOKUMENTTYPE AS NAME FROM VWPMO_DOKUMENTTYPES WHERE FORM_ID = {CURRENT_ENTITY_ID}") + Dim oDocTypes = oTable.Rows.Cast(Of DataRow).Select(AddressOf ToDocType).ToList() + Dim oFileNames = oSelectedDocs.Select(Function(d) d.DisplayName).ToList() + + Dim oForm As New frmChangeDocType With {.DocTypes = oDocTypes, .FileNames = oFileNames} + + If oForm.ShowDialog() = DialogResult.OK Then + + End If + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub + + Private Function ToDocType(pRow As DataRow) As frmChangeDocType.DocType + Return New frmChangeDocType.DocType() With { + .Id = pRow.ItemEx("ID", 0), + .Name = pRow.ItemEx("NAME", "") + } + End Function + End Class \ No newline at end of file From b06a399eaaacb3f829e170a1dd9a9b19b7a69fae Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 08:29:18 +0200 Subject: [PATCH 3/9] rename solution --- app/{DD-Record-Organizer.sln => OrgFlow.sln} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/{DD-Record-Organizer.sln => OrgFlow.sln} (100%) diff --git a/app/DD-Record-Organizer.sln b/app/OrgFlow.sln similarity index 100% rename from app/DD-Record-Organizer.sln rename to app/OrgFlow.sln From a7dc6166901796c0b3ce605bec99b721f04a56f3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 10:49:14 +0200 Subject: [PATCH 4/9] Add config items, clear documents and controls when no record id is available --- .../Classes/ClassConfig.vb | 7 +- .../Classes/Controls/ClassControlValues.vb | 4 + app/DD-Record-Organizer/ModuleMySettings.vb | 12 - app/DD-Record-Organizer/frmConfig_Basic.vb | 18 +- app/DD-Record-Organizer/frmMain.vb | 2 +- .../frmNodeNavigation.Designer.vb | 135 ++--- app/DD-Record-Organizer/frmNodeNavigation.vb | 509 ++++++++---------- 7 files changed, 321 insertions(+), 366 deletions(-) diff --git a/app/DD-Record-Organizer/Classes/ClassConfig.vb b/app/DD-Record-Organizer/Classes/ClassConfig.vb index 7a4fecf..c172bba 100644 --- a/app/DD-Record-Organizer/Classes/ClassConfig.vb +++ b/app/DD-Record-Organizer/Classes/ClassConfig.vb @@ -5,7 +5,12 @@ Public Class ClassConfig ' Global Settings (from computerconfig, overridable by userconfig) Public Property ConnectionString As String = "" + ' Misc Settings Public Property DEBUG As Boolean = False - Public Property MyFormsDesign As String = "Office 2016 Colorful" + Public Property FormsDesign As String = "Office 2016 Colorful" + + Public Property DocumentViewerSplitterWidth As Integer = 0 + Public Property TreeListSplitterWidth As Integer = 0 + Public Property DocumentSearchSplitterWidth As Integer = 0 End Class diff --git a/app/DD-Record-Organizer/Classes/Controls/ClassControlValues.vb b/app/DD-Record-Organizer/Classes/Controls/ClassControlValues.vb index 8336bb6..8e1a1ff 100644 --- a/app/DD-Record-Organizer/Classes/Controls/ClassControlValues.vb +++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlValues.vb @@ -155,6 +155,10 @@ Public Class ClassControlValues Try Dim sw As New SW("LoadControlValues1") + If RecordId = 0 Then + Exit Sub + End If + 'Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE VALUE <> '' AND RECORD_ID = {0}", RecordId) Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordId) Dim DT_ControlValues As DataTable = MYDB_ECM.GetDatatable(SQL) diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index be0059b..66807db 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -10,7 +10,6 @@ Module ModuleMySettings Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig2.xml") Public MyConnectionString As String = "" - Public MyFormsDesign As String = "" Public DEBUG As Boolean = False Public Sett_TaskOverviewKeepInFront As Boolean = True @@ -221,10 +220,6 @@ Module ModuleMySettings Else MY_ADDON_PATH = Row.Item("Value") End If - Case "MyFormsDesign" - If Row.Item("Value") <> String.Empty Then - MyFormsDesign = Row.Item("Value") - End If Case "GridDocResult_BestFitColumns" GridDocResult_BestFitColumns = CBool(Row.Item("Value")) @@ -280,13 +275,6 @@ Module ModuleMySettings DT.Rows.Add(newRow) DT.WriteXml(ConfigPath) End If - If rowresult.Contains("MyFormsDesign") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "MyFormsDesign" - newRow("Value") = "" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If If rowresult.Contains("GridDocResult_BestFitColumns") = False Then Dim newRow As DataRow = DT.NewRow() newRow("ConfigName") = "GridDocResult_BestFitColumns" diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index 3630ee9..7c955af 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -165,7 +165,7 @@ Public Class frmConfig_Basic cmbConstructor.Enabled = False End If - cmbDesign.Text = MyFormsDesign + cmbDesign.Text = CONFIG.Config.FormsDesign 'Catch ex As Exception ' MsgBox("Fehler in FormLoad: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -536,23 +536,19 @@ Public Class frmConfig_Basic Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click If cmbDesign.SelectedIndex <> -1 Then UserLookAndFeel.Default.SetSkinStyle(cmbDesign.Text) - SaveMySettingsValue("MyFormsDesign", cmbDesign.Text, "ConfigMain") + CONFIG.Config.FormsDesign = cmbDesign.Text + CONFIG.Save() End If - - End Sub - - Private Sub cmbLanguage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbLanguage.SelectedIndexChanged - End Sub Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click - Dim exists + Dim oExists = False If rbUser.Checked Then - exists = clsWD_GET.WM_USER_EXISTS(txtObjectExists.Text) + oExists = clsWD_GET.WM_USER_EXISTS(txtObjectExists.Text) ElseIf rbGruppe.Checked Then - exists = clsWD_GET.WM_GROUP_EXISTS(txtObjectExists.Text) + oExists = clsWD_GET.WM_GROUP_EXISTS(txtObjectExists.Text) End If - If exists = True Then + If oExists = True Then MsgBox("Object exists in windream!") Else MsgBox("Object is not existing in windream!", MsgBoxStyle.Critical) diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 1ddc510..59d87fb 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -72,7 +72,7 @@ Public Class frmMain ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") Dim i = My.Application.UICulture.ToString() - UserLookAndFeel.Default.SetSkinStyle(MyFormsDesign) + UserLookAndFeel.Default.SetSkinStyle(CONFIG.Config.FormsDesign) ' GetIPv4Address() diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index b040e80..47038f3 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -51,10 +51,9 @@ Partial Class frmNodeNavigation Me.RPGNodes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() + Me.SplitContainerTreeList = New DevExpress.XtraEditors.SplitContainerControl() Me.TreeListDevexpress = New DevExpress.XtraTreeList.TreeList() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) - Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.pnlControls = New System.Windows.Forms.Panel() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -78,6 +77,7 @@ Partial Class frmNodeNavigation Me.tsmiFileRenameFilename = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileRenameDisplayname = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileVersion = New System.Windows.Forms.ToolStripMenuItem() + Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileRightsShow = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiFileDelete = New System.Windows.Forms.ToolStripMenuItem() @@ -85,20 +85,16 @@ Partial Class frmNodeNavigation Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) Me.SplitContainerDocView = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() - Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SplitContainerDocumentSearch = New DevExpress.XtraEditors.SplitContainerControl() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() - 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.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTreeList.Panel1.SuspendLayout() + CType(Me.SplitContainerTreeList.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTreeList.Panel2.SuspendLayout() + Me.SplitContainerTreeList.SuspendLayout() CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainer1.Panel1.SuspendLayout() - Me.SplitContainer1.Panel2.SuspendLayout() - Me.SplitContainer1.SuspendLayout() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsResultFilesBasic.SuspendLayout() @@ -109,6 +105,12 @@ Partial Class frmNodeNavigation CType(Me.SplitContainerDocView.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDocView.Panel2.SuspendLayout() Me.SplitContainerDocView.SuspendLayout() + CType(Me.SplitContainerDocumentSearch, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerDocumentSearch.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDocumentSearch.Panel1.SuspendLayout() + CType(Me.SplitContainerDocumentSearch.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDocumentSearch.Panel2.SuspendLayout() + Me.SplitContainerDocumentSearch.SuspendLayout() Me.SuspendLayout() ' 'ribbonNodeNavigation @@ -316,24 +318,24 @@ Partial Class frmNodeNavigation Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'SplitContainerMain + 'SplitContainerTreeList ' - Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0) - Me.SplitContainerMain.Name = "SplitContainerMain" + Me.SplitContainerTreeList.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerTreeList.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerTreeList.Name = "SplitContainerTreeList" ' - 'SplitContainerMain.Panel1 + 'SplitContainerTreeList.Panel1 ' - Me.SplitContainerMain.Panel1.Controls.Add(Me.TreeListDevexpress) - Me.SplitContainerMain.Panel1.Text = "Panel1" + Me.SplitContainerTreeList.Panel1.Controls.Add(Me.TreeListDevexpress) + Me.SplitContainerTreeList.Panel1.Text = "Panel1" ' - 'SplitContainerMain.Panel2 + 'SplitContainerTreeList.Panel2 ' - Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainer1) - Me.SplitContainerMain.Panel2.Text = "Panel2" - Me.SplitContainerMain.Size = New System.Drawing.Size(1297, 510) - Me.SplitContainerMain.SplitterPosition = 289 - Me.SplitContainerMain.TabIndex = 2 + Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch) + Me.SplitContainerTreeList.Panel2.Text = "Panel2" + Me.SplitContainerTreeList.Size = New System.Drawing.Size(1297, 510) + Me.SplitContainerTreeList.SplitterPosition = 289 + Me.SplitContainerTreeList.TabIndex = 2 ' 'TreeListDevexpress ' @@ -377,25 +379,6 @@ Partial Class frmNodeNavigation ' Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer) ' - 'SplitContainer1 - ' - Me.SplitContainer1.AllowDrop = True - Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) - Me.SplitContainer1.Name = "SplitContainer1" - Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal - ' - 'SplitContainer1.Panel1 - ' - Me.SplitContainer1.Panel1.Controls.Add(Me.pnlControls) - ' - 'SplitContainer1.Panel2 - ' - Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlDocSearch) - Me.SplitContainer1.Size = New System.Drawing.Size(998, 510) - Me.SplitContainer1.SplitterDistance = 163 - Me.SplitContainer1.TabIndex = 0 - ' 'pnlControls ' Me.pnlControls.AllowDrop = True @@ -403,7 +386,7 @@ Partial Class frmNodeNavigation Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(998, 163) + Me.pnlControls.Size = New System.Drawing.Size(998, 246) Me.pnlControls.TabIndex = 0 ' 'GridControlDocSearch @@ -416,7 +399,7 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" - Me.GridControlDocSearch.Size = New System.Drawing.Size(998, 343) + Me.GridControlDocSearch.Size = New System.Drawing.Size(998, 254) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) @@ -475,7 +458,7 @@ Partial Class frmNodeNavigation ' Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLink_ShowAll, Me.tsmiFileLinkRemove, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.tsmiFileVersion, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles" - Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 320) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 298) ' 'tsmiFileProperties ' @@ -572,6 +555,12 @@ Partial Class frmNodeNavigation Me.tsmiFileVersion.Size = New System.Drawing.Size(239, 22) Me.tsmiFileVersion.Text = "Datei versionieren" ' + 'DokumentartÄndernToolStripMenuItem + ' + Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" + Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(239, 22) + Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" + ' 'tsmiFileRightsShow ' Me.tsmiFileRightsShow.Image = CType(resources.GetObject("tsmiFileRightsShow.Image"), System.Drawing.Image) @@ -609,7 +598,7 @@ Partial Class frmNodeNavigation ' 'SplitContainerDocView.Panel1 ' - Me.SplitContainerDocView.Panel1.Controls.Add(Me.SplitContainerMain) + Me.SplitContainerDocView.Panel1.Controls.Add(Me.SplitContainerTreeList) Me.SplitContainerDocView.Panel1.Text = "Panel1" ' 'SplitContainerDocView.Panel2 @@ -629,11 +618,25 @@ Partial Class frmNodeNavigation Me.DocumentViewer.Size = New System.Drawing.Size(0, 0) Me.DocumentViewer.TabIndex = 0 ' - 'DokumentartÄndernToolStripMenuItem + 'SplitContainerDocumentSearch ' - Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" - Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(239, 22) - Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" + Me.SplitContainerDocumentSearch.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerDocumentSearch.Horizontal = False + Me.SplitContainerDocumentSearch.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerDocumentSearch.Name = "SplitContainerDocumentSearch" + ' + 'SplitContainerDocumentSearch.SplitContainerDocumentSearch_Panel1 + ' + Me.SplitContainerDocumentSearch.Panel1.Controls.Add(Me.pnlControls) + Me.SplitContainerDocumentSearch.Panel1.Text = "Panel1" + ' + 'SplitContainerDocumentSearch.SplitContainerDocumentSearch_Panel2 + ' + Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch) + Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2" + Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(998, 510) + Me.SplitContainerDocumentSearch.SplitterPosition = 246 + Me.SplitContainerDocumentSearch.TabIndex = 1 ' 'frmNodeNavigation ' @@ -649,18 +652,14 @@ Partial Class frmNodeNavigation Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "frmNodeNavigation" CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).EndInit() - 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.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTreeList.Panel1.ResumeLayout(False) + CType(Me.SplitContainerTreeList.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTreeList.Panel2.ResumeLayout(False) + CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTreeList.ResumeLayout(False) CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer1.Panel1.ResumeLayout(False) - Me.SplitContainer1.Panel2.ResumeLayout(False) - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer1.ResumeLayout(False) CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsResultFilesBasic.ResumeLayout(False) @@ -671,6 +670,12 @@ Partial Class frmNodeNavigation Me.SplitContainerDocView.Panel2.ResumeLayout(False) CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerDocView.ResumeLayout(False) + CType(Me.SplitContainerDocumentSearch.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocumentSearch.Panel1.ResumeLayout(False) + CType(Me.SplitContainerDocumentSearch.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocumentSearch.Panel2.ResumeLayout(False) + CType(Me.SplitContainerDocumentSearch, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDocumentSearch.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -681,8 +686,7 @@ Partial Class frmNodeNavigation Friend WithEvents RibbonPageGroupRecord As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents SplitContainer1 As SplitContainer + Friend WithEvents SplitContainerTreeList As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection Friend WithEvents TreeListDevexpress As DevExpress.XtraTreeList.TreeList Friend WithEvents bbtnitmRecEdit As DevExpress.XtraBars.BarButtonItem @@ -737,4 +741,5 @@ Partial Class frmNodeNavigation Friend WithEvents checkShowPreview As DevExpress.XtraBars.BarCheckItem Friend WithEvents btnCreateNewNode As DevExpress.XtraBars.BarButtonItem Friend WithEvents DokumentartÄndernToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SplitContainerDocumentSearch As DevExpress.XtraEditors.SplitContainerControl End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 834258c..40e9519 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -18,64 +18,57 @@ Imports DigitalData.Modules.Database Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" - Private DT_STRUCTURE_NODES As DataTable - Private DT_ADDING_USERS As DataTable - Private DT_VWPMO_CONSTRUCTOR_FORMS As DataTable - Private RunningTask As Task - Private RunningTaskTokenSource As New CancellationTokenSource - Private RunningTaskToken = RunningTaskTokenSource.Token - Private _EntityId As Short - Private oConstructID As Short - Private CONSTRUCTORID As Integer - Private CONSTRUCTOR_DETAIL_ID As Short - Private _FilterActive As Boolean = False - Private _RowReadOnly As Boolean = False - Private ADD_RECORDS_CONSTR As Boolean = True - Private TV_Collapse_ExpandState = "Collapse" - - Private WindowsEx As WindowsEx - - Private DT_CONTROLS_ENTITY As DataTable - Private DT_COLUMNS_GRID_ENTITY As DataTable - Private DT_DOCRESULT_DROPDOWN_ITEMS As DataTable - Private DT_RESULTLIST_OPTIONS As DataTable - Private DT_RESULTLIST_VARIABLE_VALUE As DataTable - Private DT_ENTITY_DATA As DataTable - Private DT_TBPMO_FORM_VIEW As DataTable - Private DT_CONSTRUCT_VIEW As DataTable - Private COUNT_RO_CONTROLS As Integer = 0 - Private SELECTED_NODE_RECORD_ID As Integer - Private SELECTED_NODE_CAPTION As String - Private ENTITY_RECORD_COUNT As Integer = 0 - Private FORMVIEW_ID As Integer - Private FORM_LOADED As Boolean = False - Private FORM_SHOWN As Boolean = False - Private SAVE_ROUTINE_ACTIVE As Boolean = False - - Private ENTITY_LOADING_PROCESS As Boolean = False - Private RECORD_ENABLED As Boolean = False - Private BACKGROUND_HELPER As ClassBackgroundHelper - Private Node_AfterSelect As Boolean = False - Private EDIT_STATE As EditState = EditState.None - Private POS_ENABLED As Boolean = False - Private ERROR_WHILE_SAVING As Boolean = False - Private taskToken As CancellationTokenSource - Private IW_USER As String - Private IW_COMMENT As String - Private INWORK_FILE As Boolean - Private CONTROL_DOCTYPE_MATCH As Integer = 0 - Private FocusedNode As TreeListNode - Private MyTreeListViewState As ClassTreeListViewState - - Private AvailableConfigNodes As New List(Of frmNewNode.NodeConfig) - Private CurrentNodeConfigId As Integer = 0 - - Private DocList As ClassWindreamDocGrid + Private Property DT_STRUCTURE_NODES As DataTable + Private Property DT_ADDING_USERS As DataTable + Private Property DT_VWPMO_CONSTRUCTOR_FORMS As DataTable + Private Property RunningTaskTokenSource As New CancellationTokenSource + Private Property _EntityId As Short + Private Property oConstructID As Short + Private Property CONSTRUCTORID As Integer + Private Property CONSTRUCTOR_DETAIL_ID As Short + Private Property _RowReadOnly As Boolean = False + Private Property ADD_RECORDS_CONSTR As Boolean = True + Private Property TV_Collapse_ExpandState = "Collapse" + + Private Property WindowsEx As WindowsEx + + Private Property DT_CONTROLS_ENTITY As DataTable + Private Property DT_COLUMNS_GRID_ENTITY As DataTable + Private Property DT_DOCRESULT_DROPDOWN_ITEMS As DataTable + Private Property DT_RESULTLIST_OPTIONS As DataTable + Private Property DT_RESULTLIST_VARIABLE_VALUE As DataTable + Private Property DT_ENTITY_DATA As DataTable + Private Property DT_TBPMO_FORM_VIEW As DataTable + Private Property DT_CONSTRUCT_VIEW As DataTable + Private Property COUNT_RO_CONTROLS As Integer = 0 + Private Property SELECTED_NODE_RECORD_ID As Integer + Private Property SELECTED_NODE_CAPTION As String + Private Property FORMVIEW_ID As Integer + Private Property FORM_LOADED As Boolean = False + Private Property FORM_SHOWN As Boolean = False + Private Property SAVE_ROUTINE_ACTIVE As Boolean = False + + Private Property ENTITY_LOADING_PROCESS As Boolean = False + Private Property RECORD_ENABLED As Boolean = False + Private Property Node_AfterSelect As Boolean = False + Private Property EDIT_STATE As EditState = EditState.None + Private Property ERROR_WHILE_SAVING As Boolean = False + Private Property IW_USER As String + Private Property IW_COMMENT As String + Private Property INWORK_FILE As Boolean + Private Property CONTROL_DOCTYPE_MATCH As Integer = 0 + Private Property FocusedNode As TreeListNode + Private Property MyTreeListViewState As ClassTreeListViewState + + Private Property AvailableConfigNodes As New List(Of frmNewNode.NodeConfig) + Private Property CurrentNodeConfigId As Integer = 0 + + Private Property DocList As ClassWindreamDocGrid Public CtrlBuilder As ClassControlBuilder Public CtrlCommandUI As ClassControlCommandsUI - Private ClassNodeCommands As ClassNodeCommands + Private Property ClassNodeCommands As ClassNodeCommands Private Debug As Boolean = False @@ -101,20 +94,13 @@ Public Class frmNodeNavigation ClassNodeCommands = New ClassNodeCommands(LOGCONFIG, MYDB_ECM) End Sub - Private Function Get_Splitter_Layout_Filename() - Dim Filename As String = String.Format("{0}-{1}-SplitterLayout.xml", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_DETAIL_ID.ToString) - Return Path.Combine(Application.UserAppDataPath(), Filename) - End Function - Sub Save_Splitter_Layout() Try - Dim XMLPath = Get_Splitter_Layout_Filename() - Dim layout As New ClassLayout(XMLPath) - Dim settings As New List(Of ClassSetting) From { - New ClassSetting("SplitViewDetailsSplitterPosition", SplitContainer1.SplitterDistance), - New ClassSetting("SplitViewMainSplitterPosition", SplitContainerMain.SplitterPosition) - } - layout.Save(settings) + + CONFIG.Config.TreeListSplitterWidth = SplitContainerTreeList.SplitterPosition + CONFIG.Config.DocumentViewerSplitterWidth = SplitContainerDocView.SplitterPosition + CONFIG.Config.DocumentSearchSplitterWidth = SplitContainerDocumentSearch.SplitterPosition + Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -122,31 +108,17 @@ Public Class frmNodeNavigation Sub Load_Splitter_Layout() Try - Dim XMLPath As String = Get_Splitter_Layout_Filename() - Dim layout As New ClassLayout(XMLPath) - Dim settings As System.Collections.Generic.List(Of ClassSetting) - settings = layout.Load() - - 'If settings.Count = 0 Then - ' settings.Add(New ClassSetting("SplitViewTopSplitterPosition", SplitContainerTop.SplitterPosition)) - ' If CONSTRUCTOR_DETAIL_ID > 0 Then - ' settings.Add(New ClassSetting("SplitViewMainSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerMain.SplitterPosition)) - ' Else - ' settings.Add(New ClassSetting("SplitViewMainSplitterPosition_0", SplitContainerMain.SplitterPosition)) - ' End If + If CONFIG.Config.TreeListSplitterWidth > 0 Then + SplitContainerTreeList.SplitterPosition = CONFIG.Config.TreeListSplitterWidth + End If - ' settings.Add(New ClassSetting("SplitViewDetailsSplitterPosition_" & CONSTRUCTOR_DETAIL_ID.ToString, SplitContainerDetails.SplitterPosition)) - ' layout.Save(settings) - 'End If + If CONFIG.Config.DocumentViewerSplitterWidth > 0 Then + SplitContainerDocView.SplitterPosition = CONFIG.Config.DocumentViewerSplitterWidth + End If - For Each setting As ClassSetting In settings - Select Case setting._name - Case "SplitViewMainSplitterPosition" - SplitContainerMain.SplitterPosition = Integer.Parse(setting._value) - Case "SplitViewDetailsSplitterPosition" - SplitContainer1.SplitterDistance = Integer.Parse(setting._value) - End Select - Next + If CONFIG.Config.DocumentSearchSplitterWidth > 0 Then + SplitContainerDocumentSearch.SplitterPosition = CONFIG.Config.DocumentSearchSplitterWidth + End If Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -326,6 +298,8 @@ Public Class frmNodeNavigation Dim oNodeId = e.Node.Id Console.Write($"Node ID: {oNodeId}") + + Dim oRowObject = TreeListDevexpress.GetRow(oNodeId) If TypeOf oRowObject IsNot DataRowView Then @@ -346,6 +320,11 @@ Public Class frmNodeNavigation Dim oIsConfigNode = (oNodeConfigId = 1000) Dim oParentNode = e.Node.ParentNode + CURRENT_NODE_GUID = oNodeId + CURRENT_RECORD_ID = oRecordId + CURRENT_ENTITY_ID = _EntityId + SELECTED_NODE_CAPTION = oNodeCaption + ' BEGIN NEW NODE Dim oConfigNodeChildren = FocusedNode.Nodes.Where(Function(n) n.Item("TYPE_NODE") = 1000) Dim oHasConfigNodeChildren = oConfigNodeChildren.Any() @@ -370,24 +349,12 @@ Public Class frmNodeNavigation If oHasRecordId Then Update_Status_Label(True, $"NodeGUID {oGuid} - RecordID {oRecordId}", EditState.None) - Else - Update_Status_Label(True, $"NodeGUID {oGuid}", EditState.None) - End If - If oHasRecordId Then - 'oNodeInfo += $" - RecordID {oRecordId}" Node_AfterSelect = True - 'Dim sw As New SW("TreeViewMain_AfterSelect1") - ' Dim swAll As New SW("TreeViewMain_AfterSelect") - DisableEditMode() - - ' ClassNodeNavigation.Check_NODE_CONFIG_ID(oEntityID, SelectedNode) - CURRENT_RECORD_ID = oRecordId ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID) - CURRENT_ENTITY_ID = _EntityId - CURRENT_NODE_GUID = oNodeId - SELECTED_NODE_CAPTION = oNodeCaption + + CURRENT_SEARCH_TYPE = "RECORD" DisableEditMode() ' muss vor show selected record data kommen, @@ -397,33 +364,30 @@ Public Class frmNodeNavigation CtrlBuilder.WatchRecordChanges = True Await Show_Selected_Record_Data(CURRENT_RECORD_ID) - ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, _EntityId) CONTROL_HANDLING() - - If CURRENT_RECORD_ID > 0 Then - If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then - If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then - bbtnitmRecEdit.Enabled = False - bbtnitmRecSave.Enabled = False - Else - bbtnitmRecEdit.Enabled = True - In_Visible_Record_Group(True) - End If - - End If - If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then + If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then + If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then bbtnitmRecEdit.Enabled = False bbtnitmRecSave.Enabled = False - btnCreateNewNode.Enabled = False Else bbtnitmRecEdit.Enabled = True In_Visible_Record_Group(True) - btnCreateNewNode.Enabled = True End If End If + + If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then + bbtnitmRecEdit.Enabled = False + bbtnitmRecSave.Enabled = False + btnCreateNewNode.Enabled = False + Else + bbtnitmRecEdit.Enabled = True + In_Visible_Record_Group(True) + btnCreateNewNode.Enabled = True + End If + If RIGHT_READ_ONLY_DOC = False Then Doc_ReadOnlyHandler(True) @@ -438,9 +402,89 @@ Public Class frmNodeNavigation 'swAll.Done() Node_AfterSelect = False + Else + Update_Status_Label(True, $"NodeGUID {oGuid}", EditState.None) + + ClassControlValues.ClearControlValues(pnlControls.Controls) + + Await Show_Selected_Record_Data(0) End If End Sub + Public Sub Update_Document_Label(pDocumentCount As Integer) + Dim oMessage + + If pDocumentCount = 0 Then + oMessage = "Keine Dateien für '" + + If CURRENT_SEARCH_TYPE = "ENTITY" Then + oMessage &= " Entität gefunden" + If USER_LANGUAGE <> "de-DE" Then + oMessage = "No files found for entity: " + End If + + ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then + + oMessage &= SELECTED_NODE_CAPTION & "' gefunden" + If USER_LANGUAGE <> "de-DE" Then + oMessage = "No files found for object '" & SELECTED_NODE_CAPTION & "'" + End If + + If USER_LANGUAGE <> "de-DE" Then + oMessage = "No files found for record " & SELECTED_NODE_RECORD_ID + End If + + ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then + oMessage = "Keine Dateien für Knotenunterstruktur gefunden" + If USER_LANGUAGE <> "de-DE" Then + oMessage = "No files found in Node-Substructure" + End If + + Else + oMessage = "Keine Dateien für Volltextsuche (" & CURRENT_FULLTEXT_PATTERN & ") gefunden" + If USER_LANGUAGE <> "de-DE" Then + oMessage = "No files found for fulltext-search (" & CURRENT_FULLTEXT_PATTERN & ")" + End If + + End If + Else + oMessage = "Dateien für Record: " & SELECTED_NODE_RECORD_ID + + If CURRENT_SEARCH_TYPE = "ENTITY" Then + + oMessage = "Dateien für Entität: " + If USER_LANGUAGE <> "de-DE" Then + oMessage = "files for entity: " + End If + oMessage &= " (" & pDocumentCount.ToString & ")" + + ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then + oMessage = String.Format("Dateien für Objekt '{0}' ", SELECTED_NODE_CAPTION) + If USER_LANGUAGE <> "de-DE" Then + oMessage = String.Format("Files for Object '{0}'", SELECTED_NODE_CAPTION) + End If + oMessage &= " (" & pDocumentCount.ToString & ")" + + ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then + oMessage = "Dateien für Knotenunterstruktur" + If USER_LANGUAGE <> "de-DE" Then + oMessage = "files found in Node-Substructure" + End If + oMessage &= " (" & pDocumentCount.ToString & ")" + + Else + oMessage = String.Format("Ergebnis der Volltextsuche") + If USER_LANGUAGE <> "de-DE" Then + oMessage = String.Format("Result of Fulltext-Search") + End If + oMessage &= " (" & pDocumentCount.ToString & ")" + + End If + End If + + GridViewDoc_Search.ViewCaption = oMessage + End Sub + Public Sub Update_Status_Label(visible As Boolean, Optional text As String = "", Optional state As EditState = EditState.None) bsiInfo.Caption = text If visible = True Then @@ -658,13 +702,9 @@ Public Class frmNodeNavigation Dim QuickViewSQL = query.Single().Item("SQL_QUICK_VIEW") CURRENT_ENTITYSQL = Get_Grid_Sql_NODE_NAV(CONSTRUCTORID, _EntityId, CURRENT_CONSTRUCTOR_DETAIL_ID, USER_GUID) - ' CURRENT_ENTITYSQL = GridSQL - 'Anzahl der Datensätze - ENTITY_RECORD_COUNT = MYDB_ECM.GetScalarValue("SELECT COUNT(*) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & _EntityId) ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_COLUMNS_GRID_ENTITY, _EntityId, SELECTED_NODE_RECORD_ID, True, True) - DT_TBPMO_FORM_VIEW = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_FORM_VIEW, "FORM_ID = " & _EntityId & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, "") CURRENT_ENTITYSTRING = DT_TBPMO_FORM_VIEW.Rows(0).Item("FORM_TITLE") @@ -706,12 +746,6 @@ Public Class frmNodeNavigation LOGGER.Warn("Could not set the primary Key(Record-ID): " & ex.Message) End Try - - - - - - CtrlBuilder.WatchRecordChanges = False ClassControlValues.LoadControlValuesList(_EntityId, CtrlBuilder.MasterPanel.Controls) CtrlBuilder.WatchRecordChanges = True @@ -720,8 +754,6 @@ Public Class frmNodeNavigation ENTITY_LOADING_PROCESS = True Dim RecLoaded As Boolean = False - - End If Load_Splitter_Layout() sw.Done() @@ -776,24 +808,22 @@ Public Class frmNodeNavigation End Try End Sub - Private Async Function Show_Selected_Record_Data(Rec_ID As Integer) As Threading.Tasks.Task + Private Async Function Show_Selected_Record_Data(pRecordId As Integer) As Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - LOGGER.Debug("Show_Selected_Record_Data: " & Rec_ID.ToString) + LOGGER.Debug("Show_Selected_Record_Data: " & pRecordId.ToString) Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form Where form.Item("GUID") = _EntityId).Single() 'Update_Status_Label(False, "") - LOGGER.Debug("RECORD ID: " & Rec_ID.ToString) + LOGGER.Debug("RECORD ID: " & pRecordId.ToString) 'Me.pnlControls.Visible = True - SELECTED_NODE_RECORD_ID = Rec_ID - + SELECTED_NODE_RECORD_ID = pRecordId CURRENT_PARENT_RECORD_ID = 0 - RIGHT_CONTROL_CHANGED = False ENTITY_RELOAD_AFT_CONTROL_LOAD = False @@ -808,12 +838,14 @@ Public Class frmNodeNavigation 'Refresh_Navpane() Update_Record_Label(SELECTED_NODE_RECORD_ID) - Dim oDocumentsFounnd = Await RUN_WDSEARCH_GRID(True) + Dim oDocumentsFound = Await RUN_WDSEARCH_GRID(True) - If oDocumentsFounnd = 0 Then + If oDocumentsFound = 0 Then DocumentViewer.CloseDocument() End If + Update_Document_Label(oDocumentsFound) + sw.Done() Catch ex As Exception @@ -821,7 +853,6 @@ Public Class frmNodeNavigation Finally SplashScreenManager.CloseOverlayForm(oHandle) End Try - End Function #Region "Controls" @@ -1011,84 +1042,84 @@ Public Class frmNodeNavigation LastFindFilterText = oFilterText End Sub - Private Async Sub LoadRecord(pRecord As Integer) - Try - CURRENT_RECORD_ID = pRecord - CURRENT_SEARCH_TYPE = "RECORD" - ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID) + 'Private Async Sub LoadRecord(pRecord As Integer) + ' Try + ' CURRENT_RECORD_ID = pRecord + ' CURRENT_SEARCH_TYPE = "RECORD" + ' ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID) - 'Wird jetzt bei BeforeRowChange überprüft + ' 'Wird jetzt bei BeforeRowChange überprüft - DisableEditMode() + ' DisableEditMode() - ' muss vor show selected record data kommen, - ' sodass die datasource für die angehakten werte existiert (checked list box) - CtrlBuilder.WatchRecordChanges = False + ' ' muss vor show selected record data kommen, + ' ' sodass die datasource für die angehakten werte existiert (checked list box) + ' CtrlBuilder.WatchRecordChanges = False - ClassControlValues.LoadControlValuesListWithPlaceholders(CURRENT_ENTITY_ID, CURRENT_RECORD_ID, 0, CtrlBuilder.AllControls, _EntityId) - CtrlBuilder.WatchRecordChanges = True - If CURRENT_RECORD_ID > 0 Then - Await Show_Selected_Record_Data(CURRENT_RECORD_ID) - End If + ' ClassControlValues.LoadControlValuesListWithPlaceholders(CURRENT_ENTITY_ID, CURRENT_RECORD_ID, 0, CtrlBuilder.AllControls, _EntityId) + ' CtrlBuilder.WatchRecordChanges = True + ' If CURRENT_RECORD_ID > 0 Then + ' Await Show_Selected_Record_Data(CURRENT_RECORD_ID) + ' End If - ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, _EntityId) - CONTROL_HANDLING() + ' ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, _EntityId) + ' CONTROL_HANDLING() - If CURRENT_RECORD_ID > 0 Then - If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then - If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then - bbtnitmRecEdit.Enabled = False - bbtnitmRecSave.Enabled = False - 'tsButtonDelete.Enabled = False - Else - ' bbtnitmEditRec.Enabled = True - End If + ' If CURRENT_RECORD_ID > 0 Then + ' If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then + ' If DT_CONTROLS_ENTITY.Rows.Count = COUNT_RO_CONTROLS Then + ' bbtnitmRecEdit.Enabled = False + ' bbtnitmRecSave.Enabled = False + ' 'tsButtonDelete.Enabled = False + ' Else + ' ' bbtnitmEditRec.Enabled = True + ' End If - End If - If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then - ' bbtniCopyRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' bbtniNewVariant2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' bbtniParentLink.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' bbtniWFTask.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - Else - ' bbtniCopyRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - ' bbtniNewVariant2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - ' bbtniParentLink.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - ' bbtniWFTask.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - End If + ' End If + ' If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then + ' ' bbtniCopyRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' ' bbtniNewVariant2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' ' bbtniParentLink.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' ' bbtniWFTask.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' Else + ' ' bbtniCopyRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + ' ' bbtniNewVariant2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + ' ' bbtniParentLink.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + ' ' bbtniWFTask.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + ' End If - 'tsButtonAdd.Enabled = False - 'MsgBox(SplitContainerFORM.Collapsed) - 'MsgBox(SplitContainerMain.Collapsed) - 'MsgBox(SplitContainerTop.Collapsed) + ' 'tsButtonAdd.Enabled = False + ' 'MsgBox(SplitContainerFORM.Collapsed) + ' 'MsgBox(SplitContainerMain.Collapsed) + ' 'MsgBox(SplitContainerTop.Collapsed) - End If - 'Liste der geänderten Control Values leeren - CtrlBuilder.ControlsChanged.Clear() + ' End If + ' 'Liste der geänderten Control Values leeren + ' CtrlBuilder.ControlsChanged.Clear() - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) - End Try - End Sub + ' Catch ex As Exception + ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) + ' End Try + 'End Sub Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click Open_File() End Sub Private Sub frmNodeNavigation_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - If TrySave_Automatic() = False Then - e.Cancel = True End If + Save_Splitter_Layout() + ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "NODE_NAVIGATION") CURRENT_OPEN_CONSTRUCTOR_FORMS.Remove(CONSTRUCTORID) @@ -1115,13 +1146,13 @@ Public Class frmNodeNavigation Private Sub GridControlDocSearch_MouseDown(sender As Object, e As MouseEventArgs) Handles GridControlDocSearch.MouseDown In_Visible_Record_Group(False) End Sub - Private Sub pnlControls_MouseDown(sender As Object, e As MouseEventArgs) Handles pnlControls.MouseDown - End Sub + Sub In_Visible_Record_Group(oBool As Boolean) RibbonPageGroupRecord.Visible = oBool RibbonPageGroupRecord.Enabled = oBool End Sub + Private Sub bbtnitmEditRec_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmRecEdit.ItemClick If RECORD_ENABLED = False Then EnableEditMode() @@ -1132,6 +1163,7 @@ Public Class frmNodeNavigation End If End If End Sub + Sub EnableEditMode() Dim EditingUser = ClassRecordState.IsRecordLocked(SELECTED_NODE_RECORD_ID) ' Überprüfen, ob der Record gerade bearbeitet wird @@ -1222,7 +1254,6 @@ Public Class frmNodeNavigation Lock_RecordControls(True) RECORD_ENABLED = False - POS_ENABLED = False CURRENT_RECORD_ENABLED = False @@ -1444,13 +1475,18 @@ Public Class frmNodeNavigation Dim oHandle As IOverlaySplashScreenHandle If pShowSplashscreen Then oHandle = SplashScreenManager.ShowOverlayForm(Me) - taskToken = New CancellationTokenSource() End If Dim sw As New SW("RUN_WDSEARCH_GRID") Dim oFilesFound As Integer = 0 Try + + If CURRENT_RECORD_ID = 0 Then + GridControlDocSearch.DataSource = Nothing + Return 0 + End If + bsitmtInfoDoc.Visibility = DevExpress.XtraBars.BarItemVisibility.Always If CURRENT_SEARCH_TYPE = "NODE_DOWN" Then @@ -1477,41 +1513,6 @@ Public Class frmNodeNavigation Else If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse - Dim msg = "Dateien für Record: " & SELECTED_NODE_RECORD_ID - If CURRENT_SEARCH_TYPE = "ENTITY" Then - - msg = "Dateien für Entität: " - If USER_LANGUAGE <> "de-DE" Then - msg = "files for entity: " - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - ElseIf CURRENT_SEARCH_TYPE = "RECORD" 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}' ", SELECTED_NODE_CAPTION) - If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("Files for Object '{0}'", SELECTED_NODE_CAPTION) - End If - msg &= " (" & DT_RESULT.Rows.Count.ToString & ")" - - ElseIf CURRENT_SEARCH_TYPE = "NODE_DOWN" Then - 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 GridViewDoc_Search.ShowFindPanel() @@ -1541,47 +1542,11 @@ Public Class frmNodeNavigation oFilesFound = DT_RESULT.Rows.Count Else - Dim msg = "Keine Dateien für '" - If CURRENT_SEARCH_TYPE = "ENTITY" Then - msg &= " Entität gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for entity: " - End If - ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then - - 'If NODE_TEXT.Contains(" (") Then - ' NODE_TEXT = NODE_TEXT.Substring(0, NODE_TEXT.IndexOf("(") - 1) - ' End If - msg &= SELECTED_NODE_CAPTION & "' gefunden" - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for object '" & SELECTED_NODE_CAPTION & "'" - End If - - - If USER_LANGUAGE <> "de-DE" Then - msg = "No files found for record " & SELECTED_NODE_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() - oFilesFound = 0 End If End If - Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Run WD-Search Database: ", ex.Message) Finally @@ -1779,13 +1744,6 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message) End Try End Sub - - Private Sub SplitContainer1_SplitterMoved(sender As Object, e As SplitterEventArgs) Handles SplitContainer1.SplitterMoved - If FORM_LOADED Then - Save_Splitter_Layout() - End If - - End Sub #Region "GridViewEvents" Private Sub GridViewDoc_Search_LayoutSave(sender As Object, e As EventArgs) Handles GridViewDoc_Search.ColumnFilterChanged, GridViewDoc_Search.ColumnWidthChanged, GridViewDoc_Search.ColumnPositionChanged Save_DocGrid_Layout() @@ -2091,11 +2049,11 @@ Public Class frmNodeNavigation Private Sub pnlControls_DragEnter(sender As Object, e As DragEventArgs) Handles pnlControls.DragEnter Drag_Enter(e) End Sub - Private Sub SplitContainer1_DragEnter(sender As Object, e As DragEventArgs) Handles SplitContainer1.DragEnter + Private Sub SplitContainer1_DragEnter(sender As Object, e As DragEventArgs) Drag_Enter(e) End Sub - Private Async Sub SplitContainer1_DragDrop(sender As Object, e As DragEventArgs) Handles SplitContainer1.DragDrop + Private Async Sub SplitContainer1_DragDrop(sender As Object, e As DragEventArgs) Await Drag_Drop(e) End Sub #End Region @@ -2989,5 +2947,4 @@ Public Class frmNodeNavigation .Name = pRow.ItemEx("NAME", "") } End Function - End Class \ No newline at end of file From f50442bf307e573abccf3f22803b226e04bebaac Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 12:06:39 +0200 Subject: [PATCH 5/9] clean up --- .../Classes/ClassFileResult.vb | 2 +- app/DD-Record-Organizer/OrgFlow.ruleset | 13 +++++ app/DD-Record-Organizer/OrgFlow.vbproj | 1 + .../frmConstructor_Main.resx | 54 +++++++++---------- app/DD-Record-Organizer/frmFileRename.vb | 11 ++-- 5 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 app/DD-Record-Organizer/OrgFlow.ruleset diff --git a/app/DD-Record-Organizer/Classes/ClassFileResult.vb b/app/DD-Record-Organizer/Classes/ClassFileResult.vb index d524a88..26f9258 100644 --- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb +++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb @@ -1,5 +1,5 @@ Public Class ClassFileResult - Public Shared DocID As Integer + Public Shared Property DocID As Integer Public Shared InWork As Boolean = False Public Shared Function Set_InWork(state As Integer, comment As String) Try diff --git a/app/DD-Record-Organizer/OrgFlow.ruleset b/app/DD-Record-Organizer/OrgFlow.ruleset new file mode 100644 index 0000000..aa1e315 --- /dev/null +++ b/app/DD-Record-Organizer/OrgFlow.ruleset @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 08c8407..5252a8c 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -1277,6 +1277,7 @@ + diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index c70a164..b5d410e 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -230,7 +230,7 @@ Knoten umbenennen - 216, 26 + 212, 22 Knotentext: @@ -242,7 +242,7 @@ 152, 23 - 213, 6 + 209, 6 @@ -253,7 +253,7 @@ - 216, 26 + 212, 22 Auf dieser Ebene @@ -268,7 +268,7 @@ - 216, 26 + 212, 22 Unterhalb @@ -322,7 +322,7 @@ Suche Knoten - 225, 257 + 225, 235 cmsTreeView @@ -496,7 +496,7 @@ 0, 0 - 908, 237 + 910, 237 2 @@ -592,7 +592,7 @@ 0, 0 - 699, 231 + 699, 223 4 @@ -634,7 +634,7 @@ 0, 0 - 486, 206 + 488, 198 5 @@ -681,10 +681,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 206 + 0, 198 - 486, 25 + 488, 25 0 @@ -720,7 +720,7 @@ 1 - 1201, 235 + 1201, 227 1 @@ -896,7 +896,7 @@ 1 - 1201, 262 + 1201, 254 Detailansicht @@ -914,7 +914,7 @@ 0 - 1203, 290 + 1203, 282 3 @@ -926,7 +926,7 @@ 0, 27 - 1201, 227 + 1201, 237 0 @@ -1183,7 +1183,7 @@ - 1201, 254 + 1201, 264 Positionen @@ -1239,7 +1239,7 @@ 0, 0 - 1201, 254 + 1201, 264 7 @@ -1257,7 +1257,7 @@ 0 - 1201, 254 + 1201, 264 Dateien @@ -1688,7 +1688,7 @@ 2 - 1201, 254 + 1201, 264 Wiedervorlage @@ -1790,7 +1790,7 @@ 5 - 1201, 227 + 1201, 237 90 @@ -1862,7 +1862,7 @@ 1 - 1201, 254 + 1201, 264 Vorgängervarianten @@ -1963,7 +1963,7 @@ 1 - 1203, 539 + 1203, 529 2 @@ -1987,7 +1987,7 @@ Fill - 0, 147 + 0, 158 Panel1 @@ -2020,7 +2020,7 @@ 1 - 1203, 539 + 1203, 529 4 @@ -2289,7 +2289,7 @@ Ansicht zurücksetzen - 256, 520 + 256, 542 ContextMenuStripResultFiles @@ -3085,13 +3085,13 @@ Funktionen - 1203, 147 + 1203, 158 - 0, 686 + 0, 687 - 1203, 23 + 1203, 22 RibbonStatusBar1 diff --git a/app/DD-Record-Organizer/frmFileRename.vb b/app/DD-Record-Organizer/frmFileRename.vb index d85acd0..a03c4c7 100644 --- a/app/DD-Record-Organizer/frmFileRename.vb +++ b/app/DD-Record-Organizer/frmFileRename.vb @@ -1,8 +1,9 @@ Imports System.IO Public Class frmFileRename - Dim oRenameType As String - Public Sub New(DocID As Int32, oldName As String, pRenameType As String) + Private ReadOnly oRenameType As String + + Public Sub New(DocID As Integer, oldName As String, pRenameType As String) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -43,7 +44,7 @@ Public Class frmFileRename OnlyFilename = NewName Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH) Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName) - NewName = NewName & Path.GetExtension(oFullFilename) + NewName &= Path.GetExtension(oFullFilename) OnlyFilename &= Path.GetExtension(oFullFilename) ' Rename file. LOGGER.Info($"Renaming Old: [{OldName}]") @@ -59,9 +60,5 @@ Public Class frmFileRename End If End If End If - - - - End Sub End Class \ No newline at end of file From ab75c5a6e39efe617216c479c7a67b721c7be3c6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 12:59:00 +0200 Subject: [PATCH 6/9] Version 3.1.0.1 --- app/DD-Record-Organizer/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index a3d1f88..4c83eed 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices - + @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file From 2d614ab73d22d7f086774e9f68bf9f58f7fae780 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 14:40:15 +0200 Subject: [PATCH 7/9] fix copyright --- app/DD-Record-Organizer/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 4c83eed..3a4e17e 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices - + From 94b10c74b13af5373fc2707a7ca1aa7657cdf2e3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 15:47:11 +0200 Subject: [PATCH 8/9] add logging --- app/DD-Record-Organizer/frmNodeNavigation.vb | 55 ++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 40e9519..6205dd6 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -85,6 +85,9 @@ Public Class frmNodeNavigation ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + LOGGER.Debug("Loading NodeNavigation for Entity [{0}]", pEntityID) + _EntityId = pEntityID oConstructID = pConstructID @@ -102,6 +105,7 @@ Public Class frmNodeNavigation CONFIG.Config.DocumentSearchSplitterWidth = SplitContainerDocumentSearch.SplitterPosition Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -120,10 +124,13 @@ Public Class frmNodeNavigation SplitContainerDocumentSearch.SplitterPosition = CONFIG.Config.DocumentSearchSplitterWidth End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Private Async Function frmNodeNavigation_Load(sender As Object, e As EventArgs) As Task Handles Me.Load + LOGGER.Debug("Loading NodeNavigation") + CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID DT_VWPMO_CONSTRUCTOR_FORMS = ClassFormCommands.LoadConstructorForms(CURRENT_SCREEN_ID, oConstructID, USER_LANGUAGE) @@ -168,6 +175,7 @@ Public Class frmNodeNavigation FORM_LOADED = True Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 4") End Try @@ -175,6 +183,8 @@ Public Class frmNodeNavigation End Function Private Async Function Load_nodes() As Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + LOGGER.Debug("Loading nodes for entity [{0}]", CURRENT_ENTITY_ID) + Try Dim oTable = Await ClassNodeCommands.LoadNodes(CURRENT_ENTITY_ID) DT_STRUCTURE_NODES = oTable @@ -207,6 +217,7 @@ Public Class frmNodeNavigation Dim oNodeImage = ByteArrayToBitmap(bimage) ImageCollection1.AddImage(oNodeImage, row.Item("GUID")) Catch ex As Exception +LOGGER.Error(ex) End Try Next @@ -532,6 +543,7 @@ Public Class frmNodeNavigation Dim oSql = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", oConstructID) DT_ADDING_USERS = MYDB_ECM.GetDatatable(oSql) Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Adding_users") End Try End Sub @@ -540,10 +552,13 @@ Public Class frmNodeNavigation Dim oSql = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", oConstructID) NODE_CONFIGURABLE_NODES_DT = MYDB_ECM.GetDatatable(oSql) Catch ex As Exception +LOGGER.Error(ex) + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Configurable_Nodes") End Try End Sub Sub Load_Datafor_Entity() + LOGGER.Debug("Loading Data for Entity [{0}]", _EntityId) Try @@ -602,6 +617,7 @@ Public Class frmNodeNavigation Try PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString()) Catch ex As Exception + LOGGER.Error(ex) LOGGER.Warn("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted") PWplainText = "" End Try @@ -612,6 +628,7 @@ Public Class frmNodeNavigation Load_Entity_Data_CONTROLS_RECORDS() Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) End Try @@ -659,6 +676,7 @@ Public Class frmNodeNavigation Try ADD_RECORDS_CONSTR = oRow.Item("ADD_RECORDS") Catch ex As Exception + LOGGER.Error(ex) ADD_RECORDS_CONSTR = True End Try @@ -720,6 +738,7 @@ Public Class frmNodeNavigation End While CURRENT_DT_ENTITY_RECORDS = async.dt Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Async EntitySQL", ex.Message, ex.StackTrace) End Try @@ -743,6 +762,7 @@ Public Class frmNodeNavigation primaryKey(0) = CURRENT_DT_ENTITY_RECORDS.Columns("Record-ID") CURRENT_DT_ENTITY_RECORDS.PrimaryKey = primaryKey Catch ex As Exception + LOGGER.Error(ex) LOGGER.Warn("Could not set the primary Key(Record-ID): " & ex.Message) End Try @@ -759,6 +779,7 @@ Public Class frmNodeNavigation sw.Done() Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_Entity_Data", ex.Message, ex.StackTrace) Finally 'Me.Cursor = Cursors.Default @@ -804,6 +825,7 @@ Public Class frmNodeNavigation bsitmRecordID.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End If Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try @@ -849,6 +871,7 @@ Public Class frmNodeNavigation sw.Done() Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in SelectedRecord_ShowData: ", ex.Message) Finally SplashScreenManager.CloseOverlayForm(oHandle) @@ -923,6 +946,7 @@ Public Class frmNodeNavigation End If Return state Catch ex As Exception + LOGGER.Error(ex) Return state End Try End Function @@ -991,6 +1015,7 @@ Public Class frmNodeNavigation Dim ctrl As Windows.Forms.Control = sender ClassFunctionCommandsUI.NewEditAppointment(ctrl.Name, _EntityId, SELECTED_NODE_RECORD_ID, pnlControls.Controls) Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1007,6 +1032,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception + LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1105,6 +1131,7 @@ Public Class frmNodeNavigation ' Catch ex As Exception + 'LOGGER.Error(ex) ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) ' End Try 'End Sub @@ -1129,6 +1156,7 @@ Public Class frmNodeNavigation Try CURRENT_DOCVIEW.CloseView(CURRENT_DOCVIEW_PATH, 0) Catch ex As Exception +LOGGER.Error(ex) End Try @@ -1356,6 +1384,7 @@ Public Class frmNodeNavigation Return False End If Catch ex As Exception +LOGGER.Error(ex) MessageBox.Show("Error in TrySave_User: " & vbNewLine & ex.Message) Return False End Try @@ -1450,6 +1479,7 @@ Public Class frmNodeNavigation Return True End If Catch ex As Exception +LOGGER.Error(ex) MessageBox.Show("Error in TrySave_Automatic: " & vbNewLine & ex.Message) Return False End Try @@ -1468,6 +1498,7 @@ Public Class frmNodeNavigation Next End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Customer_Run_Procedures: ", ex.Message) End Try End Sub @@ -1548,6 +1579,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Run WD-Search Database: ", ex.Message) Finally sw.Done() @@ -1597,6 +1629,7 @@ Public Class frmNodeNavigation Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error RUN_ENTITY_DOC_SEARCH", ex.Message, ex.StackTrace) End Try sw.Done() @@ -1629,6 +1662,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCBSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1644,6 +1678,7 @@ Public Class frmNodeNavigation Try validDate = Date.TryParse(DatePicker.OldEditValue, oldValue) Catch ex As Exception +LOGGER.Error(ex) oldValue = Date.MinValue End Try @@ -1677,6 +1712,7 @@ Public Class frmNodeNavigation ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, SELECTED_NODE_RECORD_ID) End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnDateSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1711,6 +1747,7 @@ Public Class frmNodeNavigation ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, SELECTED_NODE_RECORD_ID) End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnTextSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1741,6 +1778,7 @@ Public Class frmNodeNavigation ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, SELECTED_NODE_RECORD_ID) End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message) End Try End Sub @@ -1787,6 +1825,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1803,6 +1842,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1893,6 +1933,7 @@ Public Class frmNodeNavigation CURRENT_CONTROL_DOCTYPE_MATCH = "" CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(CURRENT_RECORD_ID, CONTROL_DOCTYPE_MATCH) Catch ex As Exception +LOGGER.Error(ex) CURRENT_CONTROL_DOCTYPE_MATCH = 0 CURRENT_CONTROL_DOCTYPE_MATCH = "" End Try @@ -1955,6 +1996,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) LOGGER.Warn("Unexpected Error in Drag_Drop: " & ex.Message) MsgBox("Unexpected Error in DragDrop - Please check the log for further information!", MsgBoxStyle.Exclamation) Finally @@ -2030,6 +2072,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Check_Dropped_Files: ", ex.Message) End Try @@ -2129,6 +2172,7 @@ Public Class frmNodeNavigation Update_Record_Label(CURRENT_RECORD_ID) Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Saving Record", ex.Message, ex.StackTrace) Return False End Try @@ -2230,6 +2274,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Opening DocContextMenu: ", ex.Message) e.Cancel = True Finally @@ -2362,6 +2407,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception +LOGGER.Error(ex) LOGGER.Error(ex) IW_USER = "" IW_COMMENT = "" @@ -2389,6 +2435,7 @@ Public Class frmNodeNavigation End If tsmiFileInWork.Text = displ Catch ex As Exception +LOGGER.Error(ex) LOGGER.Warn("Unexpected Error in File-Work Info: " & ex.Message) tsmiFileInWork.Enabled = False End Try @@ -2459,6 +2506,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Unexpected Error in getting the Displayname: ", ex.Message) End Try End Sub @@ -2469,6 +2517,7 @@ Public Class frmNodeNavigation Try RENAME_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH")) Catch ex As Exception +LOGGER.Error(ex) LOGGER.Warn("Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message) RENAME_DOC_PATH = Nothing End Try @@ -2492,6 +2541,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception +LOGGER.Error(ex) MsgBox("Unexpected Error in getting the filename: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -2543,6 +2593,7 @@ Public Class frmNodeNavigation oForm.Show() Catch ex As Exception +LOGGER.Error(ex) LOGGER.Error(ex) MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -2589,6 +2640,7 @@ Public Class frmNodeNavigation oForm.Show() oForm.BringToFront() Catch ex As Exception +LOGGER.Error(ex) MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -2621,6 +2673,7 @@ Public Class frmNodeNavigation Next Catch ex As Exception +LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Removing links from file:", ex.Message) End Try End If @@ -2665,6 +2718,7 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message) End If Catch ex As Exception +LOGGER.Error(ex) LOGGER.Error(ex) End Try End If @@ -2809,6 +2863,7 @@ Public Class frmNodeNavigation ' End If ' Catch ex As Exception + ' LOGGER.Error(ex) ' LOGGER.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message) ' End Try From 67cec07fe79422921e076ec68b59e6b3b26536f2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 28 Sep 2023 16:32:41 +0200 Subject: [PATCH 9/9] Version 3.1.0.2 --- app/DD-Record-Organizer/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 3a4e17e..6474a2b 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices - + @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file