diff --git a/app/DD-Record-Organizer/App.config b/app/DD-Record-Organizer/App.config index f0d42be..ecfcfaf 100644 --- a/app/DD-Record-Organizer/App.config +++ b/app/DD-Record-Organizer/App.config @@ -10,7 +10,9 @@ - + @@ -62,9 +64,6 @@ Dokument-ID - - True - True @@ -75,6 +74,9 @@ sDigital Data - windream-Benutzer + + False + diff --git a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb index e3509d2..ad4903c 100644 --- a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -89,8 +89,18 @@ Public Class ClassDocGrid Return oSelectedRows.Count = 0 End Function - Public Shared Function GetSelectedDocuments(pGridView As GridView) As List(Of clsWMDoc) - Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList() + Public Shared Function GetSelectedDocuments(pGridView As GridView, Optional pGetFirst As Boolean = False) As List(Of clsWMDoc) + Dim oSelectedRows As List(Of Integer) + If pGridView.RowCount = 0 Then + Return Nothing + End If + If pGetFirst = True Then + pGridView.FocusedRowHandle = 0 + oSelectedRows = New List(Of Integer) From {0} + Else + oSelectedRows = pGridView.GetSelectedRows().ToList() + End If + Dim oDocuments As New List(Of clsWMDoc) For Each oRowHandle In oSelectedRows diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb index b3b4931..834eca0 100644 --- a/app/DD-Record-Organizer/Classes/ClassHelper.vb +++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb @@ -7,18 +7,23 @@ Public Class ClassHelper Private Shared BW_DocID As Integer Public Shared Function FORMAT_WM_PATH(WMpath As String) Try - Dim ochanged As Boolean = False - If WMpath.StartsWith("W:") Then - WMpath = WMpath.Replace("W:", WMPATH_PREFIX) - ochanged = True - ElseIf WMpath.StartsWith("\") Then - If WMpath.StartsWith(WMPATH_PREFIX) = False Then - WMpath = WMPATH_PREFIX & WMpath + If Not IsNothing(WMpath) Then + Dim ochanged As Boolean = False + If WMpath.StartsWith("W:") Then + WMpath = WMpath.Replace("W:", WMPATH_PREFIX) ochanged = True + ElseIf WMpath.StartsWith("\") Then + If WMpath.StartsWith(WMPATH_PREFIX) = False Then + WMpath = WMPATH_PREFIX & WMpath + ochanged = True + End If End If + LOGGER.Debug("WMpath is: " & WMpath) + Return WMpath + Else + Return Nothing End If - LOGGER.Debug("WMpath is: " & WMpath) - Return WMpath + Catch ex As Exception Return WMpath End Try diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index 4bfd22a..7903fc2 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -11,24 +11,29 @@ Public Class ClassInit Public Sub InitLoggerANDConfig() Try Dim oLocalUserAppDataPath As String = Application.LocalUserAppDataPath - LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, oLocalUserAppDataPath & "\Log", Nothing, + LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, + oLocalUserAppDataPath & "\Log", Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName) LOGGER = LOGCONFIG.GetLogger() LOGGER.Info("orgFLOW started") Dim oUserAppDataPath As String = Application.UserAppDataPath + Dim oLegacyAppDataPath As String = Application.UserAppDataPath Dim oCommonAppDataPath = Application.CommonAppDataPath + LOGGER.Debug($"oCommonAppDataPath: {oCommonAppDataPath}") Dim oStartupPath = Application.StartupPath ' If AppConfig from Startup Path should be forced, rewrite the common app data path - If My.Settings.UseAppConfigConString = True Then + If My.Settings.UseAppConfig = True Then oCommonAppDataPath = oStartupPath + LOGGER.Info($"Achtung: Anstatt ComputerConfig wird AppConfig-/Startup-Path ({oCommonAppDataPath}) benutzt! (UseAppConfig in Appdata)") End If CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath) - LOGGER.Info("Config loaded") - + LOGGER.Debug("Config loaded") + LOGGER.Debug($"oUserAppDataPath: {oUserAppDataPath}") + LOGGER.Debug($"oCommonAppDataPath: {oCommonAppDataPath}") Try If CONFIG.Config.ConnectionString <> String.Empty Then LOGGER.Debug("Connection String loaded") diff --git a/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb b/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb index 957248c..a9b09a4 100644 --- a/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb +++ b/app/DD-Record-Organizer/Classes/ClassSQLEditor.vb @@ -1,7 +1,9 @@ Imports System.ComponentModel +Imports System.Data.SqlClient Imports System.Drawing.Design Imports System.Windows.Forms Imports System.Windows.Forms.Design +Imports DigitalData.GUIs.Common Public Class ClassSQLEditor Inherits UITypeEditor @@ -14,19 +16,26 @@ Public Class ClassSQLEditor Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object 'Return MyBase.EditValue(context, provider, value) Dim svc As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService) - Dim SQLSTring As String = DirectCast(value, SQLValue).Value + Dim SQLString As String = DirectCast(value, SQLValue).Value - 'If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then - ' Using Form As New frmSQLEditor() - ' Form.Value = SQLSTring - ' If svc.ShowDialog(Form) = DialogResult.OK Then - ' Dim sql As New SQLValue(Form.Value) - ' value = sql - ' End If - ' End Using - 'End If + If svc IsNot Nothing AndAlso SQLString IsNot Nothing Then + Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, MYDB_ECM) With { + .SQLCommand = SQLString + } + + Dim oResult = oForm2.ShowDialog() + If oResult = DialogResult.OK Then + Dim oSql As New SQLValue(oForm2.SQLCommand) + value = oSql + SQLString = oForm2.SQLCommand + End If + End If + If Not IsNothing(value) Then + Return value + Else + Return Nothing + End If - Return "" End Function End Class diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 5f9da46..2e9431f 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/My Project/Settings.Designer.vb b/app/DD-Record-Organizer/My Project/Settings.Designer.vb index 73ecbb9..8d0eb31 100644 --- a/app/DD-Record-Organizer/My Project/Settings.Designer.vb +++ b/app/DD-Record-Organizer/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -267,16 +267,13 @@ Namespace My End Get End Property - _ - Public Property UseAppConfigConString() As Boolean + Global.System.Configuration.DefaultSettingValueAttribute("False")> _ + Public ReadOnly Property UseAppConfig() As Boolean Get - Return CType(Me("UseAppConfigConString"),Boolean) + Return CType(Me("UseAppConfig"),Boolean) End Get - Set - Me("UseAppConfigConString") = value - End Set End Property Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True - - True + + False True diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 4de1e60..65c9465 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -176,6 +176,9 @@ False ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index d9c06ae..2ad942a 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -5,7 +5,7 @@ Imports DevExpress.XtraGrid.Columns Public Class frmDocRecordLink - Public Property Documents As New List(Of ClassDocGrid.clsWMDoc) + Public Property myDocuments As New List(Of ClassDocGrid.clsWMDoc) Private CURRENT_LINK_ENTITY_ID As Integer = 0 Private ENTITY_LOAD_ACTIVE As Boolean = False @@ -75,7 +75,7 @@ Public Class frmDocRecordLink End Sub Private Sub frmDocRecordLink_Load(sender As Object, e As EventArgs) Handles Me.Load ' OLD WAY - If Documents.Count = 0 Then + If myDocuments.Count = 0 Then ENTITY_LOAD_ACTIVE = True If ClassDocGrid.DT_RESULTFILES.Rows.Count = 1 Then txtFileInfo.Text = ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH") @@ -139,12 +139,12 @@ Public Class frmDocRecordLink End If - If Documents.Count > 0 Then + If myDocuments.Count > 0 Then ENTITY_LOAD_ACTIVE = True - If Documents.Count = 1 Then - txtFileInfo.Text = Documents.First.DocPath + If myDocuments.Count = 1 Then + txtFileInfo.Text = myDocuments.First.DocPath Else - txtFileInfo.Text = String.Format("{0} files selected for linking to record", Documents.Count) + txtFileInfo.Text = String.Format("{0} files selected for linking to record", myDocuments.Count) End If Try If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then diff --git a/app/DD-Record-Organizer/frmEntities.Designer.vb b/app/DD-Record-Organizer/frmEntities.Designer.vb index d7c3884..5010509 100644 --- a/app/DD-Record-Organizer/frmEntities.Designer.vb +++ b/app/DD-Record-Organizer/frmEntities.Designer.vb @@ -414,7 +414,6 @@ Partial Class frmEntities ' 'ProgressPanel1 ' - Me.ProgressPanel1.Appearance.BackColor = CType(resources.GetObject("ProgressPanel1.Appearance.BackColor"), System.Drawing.Color) Me.ProgressPanel1.Appearance.Options.UseBackColor = True Me.ProgressPanel1.AppearanceCaption.Options.UseTextOptions = True resources.ApplyResources(Me.ProgressPanel1, "ProgressPanel1") diff --git a/app/DD-Record-Organizer/frmEntities.resx b/app/DD-Record-Organizer/frmEntities.resx index e7068df..b8ca5ad 100644 --- a/app/DD-Record-Organizer/frmEntities.resx +++ b/app/DD-Record-Organizer/frmEntities.resx @@ -482,9 +482,6 @@ 11 - - 17, 17 - 1104, 17 @@ -512,9 +509,6 @@ 2 - - 1104, 17 - Segoe UI, 9.75pt @@ -650,105 +644,6 @@ 17, 56 - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 3 - - - SINGLE_RECORDCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 4 - - - NumericUpDown1 - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 5 - - - ENTITY_IDTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 7 - - - ComboBox1 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 10 - - - SHOW_FORM_CONSTRUCTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 11 - - - Segoe UI, 9.75pt, style=Bold - - - 328, 53 - - - 424, 368 - - - 23 - - - Entity Properties: - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - True @@ -882,9 +777,6 @@ diese Entität angelegt werden. 10 - - 255, 56 - Segoe UI, 9.75pt @@ -912,6 +804,33 @@ diese Entität angelegt werden. 11 + + Segoe UI, 9.75pt, style=Bold + + + 328, 53 + + + 424, 368 + + + 23 + + + Entity Properties: + + + GroupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + Top, Bottom, Left @@ -1191,7 +1110,7 @@ diese Entität angelegt werden. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + wgAADsIBFShKgAAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= @@ -1267,7 +1186,7 @@ welche die links dargestellte TreeView-Struktur umsetzt. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI + wgAADsIBFShKgAAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI FHS03z8bVllcEsFJJq7z/7xFORHRX9aGe/w5sKZpMtlPNrEjES7E2WU51wFi3/fJsixK0xRL1zk/t20b h2FIQRC84TpAJAG2bVNVVbjtnmXZ6DiOUoZ0AKPrutx1XQHBJ27FeV2GvgDQGrJVhrYA5mEAL3lFUYzL n4AyzkmSAOKJxVkKADeUZSn+PFnGkyCXEMz5u3gzkAJomkYp930/8rKJRUDwBJgvcwVQ1/WIMpYA46Ub @@ -1307,9 +1226,6 @@ welche die links dargestellte TreeView-Struktur umsetzt. 0 - - Transparent - Procedure is executing ...... @@ -1343,7 +1259,7 @@ welche die links dargestellte TreeView-Struktur umsetzt. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih + wQAADsEBuJFr7QAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih yBh8VLWJnwa2daegAzJMhXz/PjDOS3ljwG/gMQAJggd8pwNRjhE6kCNRBlQAQMwyoAM1qoEWboEeLv3N iJxnTngNYdMDJwAAAABJRU5ErkJggg== @@ -1384,7 +1300,7 @@ welche die links dargestellte TreeView-Struktur umsetzt. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE + wgAADsIBFShKgAAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE xzCAVEx9F6ArIMTHMIBUjGIAuRhsACUYqyDx+D8DAGWb3TPY4bxVAAAAAElFTkSuQmCC diff --git a/app/DD-Record-Organizer/frmEntities.vb b/app/DD-Record-Organizer/frmEntities.vb index 38af1db..821644c 100644 --- a/app/DD-Record-Organizer/frmEntities.vb +++ b/app/DD-Record-Organizer/frmEntities.vb @@ -48,8 +48,8 @@ Public Class frmEntities End Sub Sub Load_TreeView() Try - Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _ - "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 1 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) + Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & + "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID IN (1,6) AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) LOGGER.Debug(Now.ToString & "Level 0 >>" & DT_SQL, False) Dim DT As DataTable = MYDB_ECM.GetDatatable(DT_SQL) diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 38dcfcf..7bfd77d 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -207,7 +207,7 @@ Public Class frmMain ElseIf ERROR_INIT = "INVALID USER" Then End If - Load_TasksforUser() + 'Load_TasksforUser() End Sub Sub LoggedIn() Try @@ -545,7 +545,7 @@ Public Class frmMain End Sub Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles TimerTasks.Tick - Refresh_TaskReminder() + ' Refresh_TaskReminder() End Sub @@ -563,7 +563,7 @@ Public Class frmMain If Task_Popup_minutes <> 0 Then TimerTasks.Start() - Refresh_TaskReminder() + 'Refresh_TaskReminder() End If RUN_TIMER() diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 7477fc3..569d04c 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -24,7 +24,7 @@ Partial Class frmNodeNavigation Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNodeNavigation)) - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Me.ribbonNodeNavigation = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.bbtnitmRecEdit = New DevExpress.XtraBars.BarButtonItem() Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() @@ -44,6 +44,7 @@ Partial Class frmNodeNavigation Me.checkShowPreview = New DevExpress.XtraBars.BarCheckItem() Me.btnCreateNewNode = New DevExpress.XtraBars.BarButtonItem() Me.tsitmDMSReadOnly = New DevExpress.XtraBars.BarStaticItem() + Me.bsiNotification = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupRecord = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupDocResult = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -66,14 +67,15 @@ Partial Class frmNodeNavigation Me.tsmiFileInWork = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiFileLink_Add = New System.Windows.Forms.ToolStripMenuItem() - Me.tsmiFileLink_ShowAll = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileLinkRemove = New System.Windows.Forms.ToolStripMenuItem() + Me.tsmiFileLink_ShowAll = New System.Windows.Forms.ToolStripMenuItem() + Me.LinkPerMailVersendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiFileRename = New System.Windows.Forms.ToolStripMenuItem() 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.tsmiFileVersion = 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() @@ -97,9 +99,6 @@ Partial Class frmNodeNavigation Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() - Me.Bar1 = New DevExpress.XtraBars.Bar() - Me.Bar2 = New DevExpress.XtraBars.Bar() - Me.Bar3 = New DevExpress.XtraBars.Bar() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() @@ -114,13 +113,13 @@ Partial Class frmNodeNavigation Me.BarButtonItem12 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem() - Me.PopupMenu2 = New DevExpress.XtraBars.PopupMenu(Me.components) - Me.PopupMenu3 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.BarButtonItem15 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem16 = New DevExpress.XtraBars.BarButtonItem() - Me.PopupMenu4 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.BarButtonItem17 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem18 = New DevExpress.XtraBars.BarButtonItem() + Me.PopupMenu2 = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.PopupMenu3 = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.PopupMenu4 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.PopupMenu5 = New DevExpress.XtraBars.PopupMenu(Me.components) CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() @@ -159,9 +158,9 @@ Partial Class frmNodeNavigation 'ribbonNodeNavigation ' Me.ribbonNodeNavigation.ExpandCollapseItem.Id = 0 - Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly}) - Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 41) - Me.ribbonNodeNavigation.MaxItemId = 25 + Me.ribbonNodeNavigation.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonNodeNavigation.ExpandCollapseItem, Me.ribbonNodeNavigation.SearchEditItem, Me.bbtnitmRecEdit, Me.bsiInfo, Me.bbtnitmRecSave, Me.bsiDocID, Me.bsitmRecordID, Me.bbtnitmDocResultExport, Me.bbtnitmDocResultLayoutSave, Me.bbtnitmDocResultLayoutReset, Me.bbtnitmDocResultRefresh, Me.BarStaticItemLocked, Me.bsitmtInfoDoc, Me.BarButtonItem1, Me.bbtnitmReloadView, Me.BbtnitmNodeReorder, Me.bbtnItm_TV_Collape_Expand, Me.checkShowPreview, Me.btnCreateNewNode, Me.tsitmDMSReadOnly, Me.bsiNotification}) + Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 0) + Me.ribbonNodeNavigation.MaxItemId = 26 Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation" Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.ribbonNodeNavigation.PopupMenuAlignment = DevExpress.XtraBars.PopupMenuAlignment.Left @@ -170,7 +169,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(1443, 146) + Me.ribbonNodeNavigation.Size = New System.Drawing.Size(966, 147) Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1 Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False ' @@ -307,6 +306,15 @@ Partial Class frmNodeNavigation Me.tsitmDMSReadOnly.Name = "tsitmDMSReadOnly" Me.tsitmDMSReadOnly.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'bsiNotification + ' + Me.bsiNotification.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.bsiNotification.Id = 25 + Me.bsiNotification.ItemAppearance.Normal.BackColor = System.Drawing.Color.Yellow + Me.bsiNotification.ItemAppearance.Normal.Options.UseBackColor = True + Me.bsiNotification.Name = "bsiNotification" + Me.bsiNotification.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupRecord, Me.RibbonPageGroupDocResult, Me.RibbonPageGroup1, Me.RPGNodes}) @@ -353,13 +361,14 @@ Partial Class frmNodeNavigation Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmRecordID) + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiNotification) Me.RibbonStatusBar1.ItemLinks.Add(Me.tsitmDMSReadOnly) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 769) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 787) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1443, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(966, 23) ' 'RibbonPage2 ' @@ -381,8 +390,8 @@ Partial Class frmNodeNavigation ' Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch) Me.SplitContainerTreeList.Panel2.Text = "Panel2" - Me.SplitContainerTreeList.Size = New System.Drawing.Size(969, 582) - Me.SplitContainerTreeList.SplitterPosition = 289 + Me.SplitContainerTreeList.Size = New System.Drawing.Size(799, 640) + Me.SplitContainerTreeList.SplitterPosition = 229 Me.SplitContainerTreeList.TabIndex = 2 ' 'TreeListDevexpress @@ -423,7 +432,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, 582) + Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 640) Me.TreeListDevexpress.StateImageList = Me.ImageCollection1 Me.TreeListDevexpress.TabIndex = 1 ' @@ -447,7 +456,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch) Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2" - Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(670, 582) + Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(558, 640) Me.SplitContainerDocumentSearch.SplitterPosition = 246 Me.SplitContainerDocumentSearch.TabIndex = 1 ' @@ -458,7 +467,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(670, 246) + Me.pnlControls.Size = New System.Drawing.Size(558, 246) Me.pnlControls.TabIndex = 0 ' 'GridControlDocSearch @@ -467,141 +476,149 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFileDetail Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode2.RelationName = "Level1" - Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) + GridLevelNode1.RelationName = "Level1" + Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) 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(670, 326) + Me.GridControlDocSearch.Size = New System.Drawing.Size(558, 382) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) ' 'cmsResultFileDetail ' - Me.cmsResultFileDetail.ImageScalingSize = New System.Drawing.Size(24, 24) - 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.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) + Me.cmsResultFileDetail.ImageScalingSize = New System.Drawing.Size(18, 18) + 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.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles" - Me.cmsResultFileDetail.Size = New System.Drawing.Size(248, 394) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(242, 346) ' 'tsmiFileProperties ' Me.tsmiFileProperties.Image = CType(resources.GetObject("tsmiFileProperties.Image"), System.Drawing.Image) Me.tsmiFileProperties.Name = "tsmiFileProperties" - Me.tsmiFileProperties.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileProperties.Size = New System.Drawing.Size(241, 24) Me.tsmiFileProperties.Text = "Eigenschaften" ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(244, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(238, 6) ' 'tsmiFileOpen ' Me.tsmiFileOpen.Image = CType(resources.GetObject("tsmiFileOpen.Image"), System.Drawing.Image) Me.tsmiFileOpen.Name = "tsmiFileOpen" - Me.tsmiFileOpen.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileOpen.Size = New System.Drawing.Size(241, 24) Me.tsmiFileOpen.Text = "Datei öffnen" ' 'tsmiFileFolderOpen ' Me.tsmiFileFolderOpen.Image = CType(resources.GetObject("tsmiFileFolderOpen.Image"), System.Drawing.Image) Me.tsmiFileFolderOpen.Name = "tsmiFileFolderOpen" - Me.tsmiFileFolderOpen.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileFolderOpen.Size = New System.Drawing.Size(241, 24) Me.tsmiFileFolderOpen.Text = "Ordner öffnen" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(244, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(238, 6) ' 'tsmiFileInWork ' Me.tsmiFileInWork.Image = CType(resources.GetObject("tsmiFileInWork.Image"), System.Drawing.Image) Me.tsmiFileInWork.Name = "tsmiFileInWork" - Me.tsmiFileInWork.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileInWork.Size = New System.Drawing.Size(241, 24) Me.tsmiFileInWork.Text = "Datei in Bearbeitung nehmen" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(244, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(238, 6) ' 'tsmiFileLink_Add ' Me.tsmiFileLink_Add.Image = CType(resources.GetObject("tsmiFileLink_Add.Image"), System.Drawing.Image) Me.tsmiFileLink_Add.Name = "tsmiFileLink_Add" - Me.tsmiFileLink_Add.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileLink_Add.Size = New System.Drawing.Size(241, 24) Me.tsmiFileLink_Add.Text = "Datei mit Datensatz verknüpfen" ' - 'tsmiFileLink_ShowAll - ' - Me.tsmiFileLink_ShowAll.Image = CType(resources.GetObject("tsmiFileLink_ShowAll.Image"), System.Drawing.Image) - Me.tsmiFileLink_ShowAll.Name = "tsmiFileLink_ShowAll" - Me.tsmiFileLink_ShowAll.Size = New System.Drawing.Size(247, 30) - Me.tsmiFileLink_ShowAll.Text = "Verknüpfungen anzeigen" - ' 'tsmiFileLinkRemove ' Me.tsmiFileLinkRemove.Image = CType(resources.GetObject("tsmiFileLinkRemove.Image"), System.Drawing.Image) Me.tsmiFileLinkRemove.Name = "tsmiFileLinkRemove" - Me.tsmiFileLinkRemove.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileLinkRemove.Size = New System.Drawing.Size(241, 24) Me.tsmiFileLinkRemove.Text = "Entferne Dateilink" ' + 'tsmiFileLink_ShowAll + ' + Me.tsmiFileLink_ShowAll.Image = CType(resources.GetObject("tsmiFileLink_ShowAll.Image"), System.Drawing.Image) + Me.tsmiFileLink_ShowAll.Name = "tsmiFileLink_ShowAll" + Me.tsmiFileLink_ShowAll.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileLink_ShowAll.Text = "Verknüpfungen anzeigen" + ' + 'LinkPerMailVersendenToolStripMenuItem + ' + Me.LinkPerMailVersendenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go + Me.LinkPerMailVersendenToolStripMenuItem.Name = "LinkPerMailVersendenToolStripMenuItem" + Me.LinkPerMailVersendenToolStripMenuItem.Size = New System.Drawing.Size(241, 24) + Me.LinkPerMailVersendenToolStripMenuItem.Text = "Link per Mail versenden" + Me.LinkPerMailVersendenToolStripMenuItem.Visible = False + ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(244, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(238, 6) ' 'tsmiFileRename ' Me.tsmiFileRename.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileRenameFilename, Me.tsmiFileRenameDisplayname}) Me.tsmiFileRename.Name = "tsmiFileRename" - Me.tsmiFileRename.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileRename.Size = New System.Drawing.Size(241, 24) Me.tsmiFileRename.Text = "Umbenennen" ' 'tsmiFileRenameFilename ' Me.tsmiFileRenameFilename.Name = "tsmiFileRenameFilename" - Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(180, 22) + Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(142, 22) Me.tsmiFileRenameFilename.Text = "Dateiname" ' 'tsmiFileRenameDisplayname ' Me.tsmiFileRenameDisplayname.Name = "tsmiFileRenameDisplayname" - Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(180, 22) + Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(142, 22) Me.tsmiFileRenameDisplayname.Text = "Displayname" ' + 'DokumentartÄndernToolStripMenuItem + ' + Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" + Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(241, 24) + Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" + ' 'tsmiFileVersion ' Me.tsmiFileVersion.Image = CType(resources.GetObject("tsmiFileVersion.Image"), System.Drawing.Image) Me.tsmiFileVersion.Name = "tsmiFileVersion" - Me.tsmiFileVersion.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileVersion.Size = New System.Drawing.Size(241, 24) Me.tsmiFileVersion.Text = "Datei versionieren" ' - 'DokumentartÄndernToolStripMenuItem - ' - Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" - Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(247, 30) - Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" - ' 'tsmiFileRightsShow ' Me.tsmiFileRightsShow.Image = CType(resources.GetObject("tsmiFileRightsShow.Image"), System.Drawing.Image) Me.tsmiFileRightsShow.Name = "tsmiFileRightsShow" - Me.tsmiFileRightsShow.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileRightsShow.Size = New System.Drawing.Size(241, 24) Me.tsmiFileRightsShow.Text = "Dateirechte für User anzeigen" ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(244, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(238, 6) ' 'tsmiFileDelete ' Me.tsmiFileDelete.Image = CType(resources.GetObject("tsmiFileDelete.Image"), System.Drawing.Image) Me.tsmiFileDelete.Name = "tsmiFileDelete" - Me.tsmiFileDelete.Size = New System.Drawing.Size(247, 30) + Me.tsmiFileDelete.Size = New System.Drawing.Size(241, 24) Me.tsmiFileDelete.Text = "Datei löschen" ' 'GridViewDoc_Search @@ -668,7 +685,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 187) + Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 147) Me.SplitContainerDocView.Name = "SplitContainerDocView" ' 'SplitContainerDocView.Panel1 @@ -680,8 +697,8 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer) Me.SplitContainerDocView.Panel2.Text = "Panel2" - Me.SplitContainerDocView.Size = New System.Drawing.Size(1443, 582) - Me.SplitContainerDocView.SplitterPosition = 969 + Me.SplitContainerDocView.Size = New System.Drawing.Size(966, 640) + Me.SplitContainerDocView.SplitterPosition = 799 Me.SplitContainerDocView.TabIndex = 0 ' 'DocumentViewer @@ -690,7 +707,7 @@ Partial Class frmNodeNavigation Me.DocumentViewer.FileLoaded = False Me.DocumentViewer.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer.Name = "DocumentViewer" - Me.DocumentViewer.Size = New System.Drawing.Size(464, 582) + Me.DocumentViewer.Size = New System.Drawing.Size(155, 640) Me.DocumentViewer.TabIndex = 0 ' 'XtraSaveFileDialog1 @@ -730,16 +747,13 @@ Partial Class frmNodeNavigation ' 'BarManager1 ' - Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.Bar1, Me.Bar2, Me.Bar3}) Me.BarManager1.DockControls.Add(Me.barDockControlTop) Me.BarManager1.DockControls.Add(Me.barDockControlBottom) Me.BarManager1.DockControls.Add(Me.barDockControlLeft) Me.BarManager1.DockControls.Add(Me.barDockControlRight) Me.BarManager1.Form = Me Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarSubItem1, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18}) - Me.BarManager1.MainMenu = Me.Bar2 Me.BarManager1.MaxItemId = 18 - Me.BarManager1.StatusBar = Me.Bar3 ' 'barDockControlTop ' @@ -747,58 +761,31 @@ Partial Class frmNodeNavigation Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) Me.barDockControlTop.Manager = Me.BarManager1 - Me.barDockControlTop.Size = New System.Drawing.Size(1443, 41) + Me.barDockControlTop.Size = New System.Drawing.Size(966, 0) ' 'barDockControlBottom ' Me.barDockControlBottom.CausesValidation = False Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.barDockControlBottom.Location = New System.Drawing.Point(0, 791) + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 810) Me.barDockControlBottom.Manager = Me.BarManager1 - Me.barDockControlBottom.Size = New System.Drawing.Size(1443, 19) + Me.barDockControlBottom.Size = New System.Drawing.Size(966, 0) ' 'barDockControlLeft ' Me.barDockControlLeft.CausesValidation = False Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.barDockControlLeft.Location = New System.Drawing.Point(0, 41) + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) Me.barDockControlLeft.Manager = Me.BarManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 750) + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 810) ' 'barDockControlRight ' Me.barDockControlRight.CausesValidation = False Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right - Me.barDockControlRight.Location = New System.Drawing.Point(1443, 41) + Me.barDockControlRight.Location = New System.Drawing.Point(966, 0) Me.barDockControlRight.Manager = Me.BarManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 750) - ' - 'Bar1 - ' - Me.Bar1.BarName = "Befehle" - Me.Bar1.DockCol = 0 - Me.Bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top - Me.Bar1.Text = "Befehle" - ' - 'Bar2 - ' - Me.Bar2.BarName = "Hauptmenü" - Me.Bar2.DockCol = 0 - Me.Bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top - Me.Bar2.OptionsBar.MultiLine = True - Me.Bar2.OptionsBar.UseWholeRow = True - Me.Bar2.Text = "Hauptmenü" - ' - 'Bar3 - ' - Me.Bar3.BarName = "Statusleiste" - Me.Bar3.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Bottom - Me.Bar3.DockCol = 0 - Me.Bar3.DockStyle = DevExpress.XtraBars.BarDockStyle.Bottom - Me.Bar3.OptionsBar.AllowQuickCustomization = False - Me.Bar3.OptionsBar.DrawDragBorder = False - Me.Bar3.OptionsBar.UseWholeRow = True - Me.Bar3.Text = "Statusleiste" + Me.barDockControlRight.Size = New System.Drawing.Size(0, 810) ' 'BarButtonItem2 ' @@ -955,17 +942,6 @@ Partial Class frmNodeNavigation Me.BarButtonItem14.Name = "BarButtonItem14" Me.BarButtonItem14.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' - 'PopupMenu2 - ' - Me.PopupMenu2.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem3, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem4), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem5, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarSubItem1, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem11), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem12), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem13), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14, True)}) - Me.PopupMenu2.Manager = Me.BarManager1 - Me.PopupMenu2.Name = "PopupMenu2" - ' - 'PopupMenu3 - ' - Me.PopupMenu3.Manager = Me.BarManager1 - Me.PopupMenu3.Name = "PopupMenu3" - ' 'BarButtonItem15 ' Me.BarButtonItem15.AccessibleName = "DateiÖffnenToolStripMenuItem" @@ -988,12 +964,6 @@ Partial Class frmNodeNavigation Me.BarButtonItem16.Name = "BarButtonItem16" Me.BarButtonItem16.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' - 'PopupMenu4 - ' - Me.PopupMenu4.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem15), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem16)}) - Me.PopupMenu4.Manager = Me.BarManager1 - Me.PopupMenu4.Name = "PopupMenu4" - ' 'BarButtonItem17 ' Me.BarButtonItem17.AccessibleName = "KnotenLöschenadminToolStripMenuItem" @@ -1016,6 +986,23 @@ Partial Class frmNodeNavigation Me.BarButtonItem18.Name = "BarButtonItem18" Me.BarButtonItem18.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'PopupMenu2 + ' + Me.PopupMenu2.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem3, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem4), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem5, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarSubItem1, True), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem11), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem12), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem13), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14, True)}) + Me.PopupMenu2.Manager = Me.BarManager1 + Me.PopupMenu2.Name = "PopupMenu2" + ' + 'PopupMenu3 + ' + Me.PopupMenu3.Manager = Me.BarManager1 + Me.PopupMenu3.Name = "PopupMenu3" + ' + 'PopupMenu4 + ' + Me.PopupMenu4.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem15), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem16)}) + Me.PopupMenu4.Manager = Me.BarManager1 + Me.PopupMenu4.Name = "PopupMenu4" + ' 'PopupMenu5 ' Me.PopupMenu5.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem17), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem18)}) @@ -1026,7 +1013,7 @@ Partial Class frmNodeNavigation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1443, 810) + Me.ClientSize = New System.Drawing.Size(966, 810) Me.Controls.Add(Me.SplitContainerDocView) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.ribbonNodeNavigation) @@ -1144,9 +1131,6 @@ Partial Class frmNodeNavigation Friend WithEvents KnotenVerschiebenToolStripMenuItem As ToolStripMenuItem Friend WithEvents PopupMenu1 As DevExpress.XtraBars.PopupMenu Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager - Friend WithEvents Bar1 As DevExpress.XtraBars.Bar - Friend WithEvents Bar2 As DevExpress.XtraBars.Bar - Friend WithEvents Bar3 As DevExpress.XtraBars.Bar Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl @@ -1173,4 +1157,6 @@ Partial Class frmNodeNavigation Friend WithEvents PopupMenu3 As DevExpress.XtraBars.PopupMenu Friend WithEvents PopupMenu4 As DevExpress.XtraBars.PopupMenu Friend WithEvents PopupMenu5 As DevExpress.XtraBars.PopupMenu + Friend WithEvents bsiNotification As DevExpress.XtraBars.BarStaticItem + Friend WithEvents LinkPerMailVersendenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index 7c64cfe..8bbbe86 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -528,12 +528,6 @@ 17, 17 - - 483, 17 - - - 17, 17 - @@ -542,6 +536,9 @@ ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL + + 483, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -595,6 +592,21 @@ LK9Xq2nG9vvHr73/r+mcAtLHwAD016bT1579z2+aewio4Er9tC1X+DR9fnOquP+HYV2XlGcwuSnLjxzq mLPzv4x5BMQFpV3LQ5umrn++csf5/yeuvf6/+/TT//VTN/+3DCp+7pPS3IdLDuhdSBiAiIj8Xl+PhPqF QH891nROfgw0faGgji84pPHJwQ2gBGMVJAVjFSQFYxUkHv9nAAD1UMkwC2hGngAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAH1SURBVDhPpY5BiFJhFIWN5wRNq3ZDEDGLhBZCuok2 + mjONC/UlunmuguiJpbYwq9EUSsFZCAYq6CoXrUTQVoXGGGhuIrKVhYs3gxQhRRo0jTaZp/+6eJU8COmH + Dy7nnnP+qwLwXyiKi6AoLoKiuAjyYDAYjnq93luJRGJQKBQQjUZ7fr//LGOFzRJptCMPef8q0Ov1h202 + WzKdTqPf70OSJDQaDcRisZ1IJNLsdrtj0lqtFshDXsrIBTqd7mIwGPzS6XQGLpfridVqnbjdbmQyGYTD + YdBMGu2KxWKPvJT584JkPB4fZbNZj91uXzYajV/r9Tra7TaazSbK5TJIox15yEsZuUCr1V7zeDzDXC53 + 0+l01kwm04HZbIbD4ZhBM2m0Iw95KSMXnGaP5/m3qVRqWCqVPlcqFeTzeQQCAYRCodlc3fLimXDy5/ba + Eh6Zlw8emo7clws0Gg3HTjxjsVh2RVHc8/l8I8Z3QRAuMdZzl83j18FzGD1OYfqmim/FG3jp006erquv + zwr+Re0CJ+2zMDI8sHkM2FrFp+R5MH1HMTDP9pp6On1VYePvN7y7AtIVA/PUNrh3ew+uACw0vq3CgNG7 + yoHp7xUD8zwXjt97IZ768WFzFR/DS5DEQ6jz6kl1g7ujGFCiJZwIsR936Wy6iMIAVL8AJPOUchRWzukA + AAAASUVORK5CYII= @@ -612,21 +624,6 @@ t7ez9jjA8c6F8vK7cLvdNFYEXq8Xc3NzUKlU36qqqm4wQGdn5wUHMNGVaevr67NNTU0cYHzylADlUKvV qK6u5mJxaWnpz5qaGhcD6PX6/BWA6TZ9RD/s7++/nJ6exvz8PL3IMTQ3N6OlpYXHLEejfqH3ka+srNz9 A1BUVHSdWizWaDTphoaG79TNBelHbW3tQ9Idir+yHPvHPCqVqvg3IL7f2GaRecUAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAH1SURBVDhPpY5BiFJhFIWN5wRNq3ZDEDGLhBZCuok2 - mjONC/UlunmuguiJpbYwq9EUSsFZCAYq6CoXrUTQVoXGGGhuIrKVhYs3gxQhRRo0jTaZp/+6eJU8COmH - Dy7nnnP+qwLwXyiKi6AoLoKiuAjyYDAYjnq93luJRGJQKBQQjUZ7fr//LGOFzRJptCMPef8q0Ov1h202 - WzKdTqPf70OSJDQaDcRisZ1IJNLsdrtj0lqtFshDXsrIBTqd7mIwGPzS6XQGLpfridVqnbjdbmQyGYTD - YdBMGu2KxWKPvJT584JkPB4fZbNZj91uXzYajV/r9Tra7TaazSbK5TJIox15yEsZuUCr1V7zeDzDXC53 - 0+l01kwm04HZbIbD4ZhBM2m0Iw95KSMXnGaP5/m3qVRqWCqVPlcqFeTzeQQCAYRCodlc3fLimXDy5/ba - Eh6Zlw8emo7clws0Gg3HTjxjsVh2RVHc8/l8I8Z3QRAuMdZzl83j18FzGD1OYfqmim/FG3jp006erquv - zwr+Re0CJ+2zMDI8sHkM2FrFp+R5MH1HMTDP9pp6On1VYePvN7y7AtIVA/PUNrh3ew+uACw0vq3CgNG7 - yoHp7xUD8zwXjt97IZ768WFzFR/DS5DEQ6jz6kl1g7ujGFCiJZwIsR936Wy6iMIAVL8AJPOUchRWzukA - AAAASUVORK5CYII= @@ -738,19 +735,22 @@ 779, 17 - 943, 17 - - 17, 54 + + 174, 54 + - 158, 54 + 315, 54 - 323, 54 + 480, 54 - 449, 54 + 606, 54 + + + 182 @@ -1074,15 +1074,15 @@ - 573, 54 + 730, 54 - 699, 54 + 856, 54 - 825, 54 + 17, 91 - 951, 54 + 143, 91 \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 17c8a38..562f833 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -1,22 +1,23 @@ -Imports DevExpress.XtraTreeList -Imports DevExpress.XtraTreeList.Columns -Imports DevExpress.XtraTreeList.Nodes.Operations -Imports DevExpress.XtraTreeList.Nodes -Imports DevExpress.XtraSplashScreen -Imports DevExpress.XtraScheduler +Imports System.IO +Imports System.Text +Imports System.Threading Imports DevExpress.Data +Imports DevExpress.Data.Filtering +Imports DevExpress.Utils Imports DevExpress.XtraEditors +Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraPrinting -Imports System.Threading -Imports System.Text -Imports System.IO -Imports DigitalData.Modules.Base -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Database Imports DevExpress.XtraRichEdit.API.Native -Imports DevExpress.Data.Filtering -Imports DevExpress.XtraGrid +Imports DevExpress.XtraScheduler +Imports DevExpress.XtraSplashScreen +Imports DevExpress.XtraTreeList +Imports DevExpress.XtraTreeList.Columns +Imports DevExpress.XtraTreeList.Nodes +Imports DevExpress.XtraTreeList.Nodes.Operations +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" @@ -40,6 +41,7 @@ Public Class frmNodeNavigation Private Property DT_RESULTLIST_OPTIONS As DataTable Private Property DT_RESULTLIST_VARIABLE_VALUE As DataTable Private Property DT_ENTITY_DATA As DataTable + Private Property ENTITY_TYPE As String = "" Private Property DT_TBPMO_FORM_VIEW As DataTable Private Property DT_CONSTRUCT_VIEW As DataTable Private Property COUNT_RO_CONTROLS As Integer = 0 @@ -77,6 +79,8 @@ Public Class frmNodeNavigation Private Property ClassNodeCommands As ClassNodeCommands Private Property ViewerInit As Boolean = False + Private PA_NODE_GUID_STAMM As Integer = 0 + Private Debug As Boolean = False Public Enum EditState @@ -368,7 +372,8 @@ Public Class frmNodeNavigation CurrentNodeConfigId = oNodeConfigId AvailableConfigNodes.Clear() - If btnCreateNewNode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Then + If btnCreateNewNode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always And + Not IsNothing(NODE_CONFIGURABLE_NODES_DT) Then Dim oNodeConfigList = NODE_CONFIGURABLE_NODES_DT.Select($"PARENT_NODE = {oNodeConfigId}"). Cast(Of DataRow). Select(Function(row) New frmNewNode.NodeConfig() With { @@ -403,7 +408,7 @@ Public Class frmNodeNavigation ClassControlValues.LoadControlValuesListWithPlaceholders(_EntityId, CURRENT_RECORD_ID, 0, CtrlBuilder.AllControls, _EntityId) CtrlBuilder.WatchRecordChanges = True Await Show_Selected_Record_Data(CURRENT_RECORD_ID) - Show_SelectedDoc() + Show_SelectedDoc(True) ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, _EntityId) CONTROL_HANDLING() @@ -570,6 +575,24 @@ Public Class frmNodeNavigation bsiInfo.ItemAppearance.Normal.BackColor = Color.LightGray End Select End Sub + Public Sub Update_Notification_Label(visible As Boolean, pMessage As String, pColor As String) + bsiNotification.Caption = pMessage + If visible = True Then + bsiNotification.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bsiNotification.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If + + + Select Case pColor + Case "Yellow" + bsiNotification.ItemAppearance.Normal.BackColor = Color.Yellow + Case "Blue" + bsiNotification.ItemAppearance.Normal.BackColor = Color.LightBlue + Case Else + bsiNotification.ItemAppearance.Normal.BackColor = Color.Transparent + End Select + End Sub Public Sub Update_DocID_Label(visible As Boolean, Optional text As String = "", Optional state As EditState = EditState.None) bsiDocID.Caption = text If visible = True Then @@ -730,13 +753,17 @@ Public Class frmNodeNavigation CONTROL_DOCTYPE_MATCH = oRow.Item("CONTROL_DOCTYPE_MATCH") SQL_RECORD_AND_FILE_READ_ONLY = oRow.Item("SQL_RIGHT_READ_AND_VIEW_ONLY") SQL_DOC_READ_ONLY = oRow.Item("SQL_RIGHT_WINDREAM_VIEW") + ENTITY_TYPE = oRow.Item("FORM_TYPE") Try ADD_RECORDS_CONSTR = oRow.Item("ADD_RECORDS") Catch ex As Exception LOGGER.Error(ex) ADD_RECORDS_CONSTR = True End Try - + If ENTITY_TYPE = "Personal file" Then + Dim oSQL = "SELECT CAT_STRING FROM TBDD_CATALOG WHERE CAT_TITLE = 'PA_NODE_GUID_STAMM'" + PA_NODE_GUID_STAMM = MYDB_ECM.GetScalarValue(oSQL) + End If expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", _EntityId, USER_LANGUAGE) @@ -1150,10 +1177,15 @@ Public Class frmNodeNavigation End Sub Private Sub TreeListDevexpress_ParseFindPanelText(sender As Object, e As ParseFindPanelTextEventArgs) Handles TreeListDevexpress.ParseFindPanelText ' Exit if the search text is empty - If String.IsNullOrWhiteSpace(e.FindPanelText) Then Return + If String.IsNullOrWhiteSpace(e.FindPanelText) Then + + Return + End If + + Dim oInput As String = e.FindPanelText ' Split the search text into individual criteria - Dim criteriaStrings As String() = e.FindPanelText.Split(New Char() {" "c}, StringSplitOptions.RemoveEmptyEntries) + Dim criteriaStrings As String() = New String() {oInput} '.Split(New Char() {" "c}, StringSplitOptions.RemoveEmptyEntries) ' Construct the filter string by searching in the desired fields Dim filterConditions As IEnumerable(Of String) = criteriaStrings.Select(Function(str) _ @@ -1167,7 +1199,7 @@ Public Class frmNodeNavigation ' Set the find criteria for the TreeList e.SetFindCriteria(findCriteria) - + ' TreeListDevexpress.ActiveFilterCriteria = findCriteria ' Mark the event as handled e.Handled = True End Sub @@ -1721,7 +1753,7 @@ Public Class frmNodeNavigation If USER_LANGUAGE <> "de-De" Then oText = $"The entity-wide search will be started in background. The result will be displayed when ready." End If - Update_Status_Label(True, oText, EditState.Insert) + Update_Notification_Label(True, oText, "Yellow") CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@ENTITY_ID", _EntityId) CURRENT_DOCSEARCH_SQL = CURRENT_DOCSEARCH_SQL.Replace("@USER_LANGUAGE", USER_LANGUAGE) @@ -1742,6 +1774,8 @@ Public Class frmNodeNavigation End Sub) myformThread.SetApartmentState(ApartmentState.STA) myformThread.Start() + myformThread.Join() + Update_Notification_Label(False, "", "") Else MsgBox("Please config the entity-search properly! " & vbNewLine & oSQL, vbOKOnly, "Information") End If @@ -1942,12 +1976,17 @@ Public Class frmNodeNavigation End Sub Sub Refresh_DocID() Dim oDocuments = Current_DocList.SelectedDocuments - If oDocuments.Count <> 0 Then - Dim omsg = "Doc-ID: " & oDocuments.First.DocId - Update_DocID_Label(True, omsg, EditState.Update) + If Not IsNothing(oDocuments) Then + If oDocuments.Count <> 0 Then + Dim omsg = "Doc-ID: " & oDocuments.First.DocId + Update_DocID_Label(True, omsg, EditState.Update) + Else + Update_DocID_Label(True, "DocRow not selected", EditState.None) + End If Else - Update_DocID_Label(True, "DocRow not selected", EditState.None) + Update_DocID_Label(False) End If + End Sub Sub Save_DocGrid_Layout() Try @@ -1956,9 +1995,9 @@ Public Class frmNodeNavigation GridViewDoc_Search.SaveLayoutToXml(XMLPath) - Update_Status_Label(True, "Grid Layout Saved") + Update_Notification_Label(True, "Grid Layout Saved", "") Else - Update_Status_Label(True, "Could not store layout") + Update_Notification_Label(True, "Could not store layout", "Yellow") End If Catch ex As Exception @@ -2030,10 +2069,10 @@ Public Class frmNodeNavigation If WM_READ_ONLY = False Then ClassDragDrop.Drag_enter(e) Else - Update_Status_Label(True, "READ ONLY ACCESS", EditState.Insert) + Update_Notification_Label(True, "READ ONLY ACCESS", "") End If Else - Update_Status_Label(True, "No entity selected", EditState.Insert) + Update_Notification_Label(True, "No entity selected", "Yellow") End If End Sub Private Async Function Drag_Drop(e As DragEventArgs) As Task @@ -2259,7 +2298,7 @@ Public Class frmNodeNavigation EDIT_STATE = EditState.Update NEW_RECORD_ID = 0 If RECORD_CHANGED = False Then - Update_Status_Label(True, "NO CHANGES in Record.") + Update_Notification_Label(True, "NO CHANGES in Record.", "") DisableEditMode() EDIT_STATE = EditState.None @@ -2311,7 +2350,7 @@ Public Class frmNodeNavigation INSERT_IN_ACTION = False 'Jetzt den Record nochmal laden ' Show_Selected_Record_Data(SELECTED_RECORD_ID) - Update_Status_Label(True, "Record saved - " & Now, EditState.Update) + Update_Notification_Label(True, "Record saved - " & Now, "") Update_Record_Label(CURRENT_RECORD_ID) Catch ex As Exception @@ -2764,7 +2803,7 @@ Public Class frmNodeNavigation End If Refresh_Selected_Table() - Dim oForm As New frmDocRecordLink With {.Documents = oDocuments} + Dim oForm As New frmDocRecordLink With {.myDocuments = oDocuments} oForm.Show() Catch ex As Exception @@ -3089,7 +3128,7 @@ Public Class frmNodeNavigation Await ReloadTreeView() MyTreeListViewState.LoadState() TreeListDevexpress.FocusedNode = MyFocusedNode - Update_Status_Label(True, "Nodes reordered") + Update_Notification_Label(True, "Nodes reordered", "") End If Cursor = Cursors.Default @@ -3122,25 +3161,33 @@ Public Class frmNodeNavigation End Sub Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged - Show_SelectedDoc() + Show_SelectedDoc(False) End Sub - Private Sub Show_SelectedDoc() - Dim oSelectedDocs = ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search) - If ViewerInit Then - If oSelectedDocs.Count = 1 Then - Refresh_DocID() - Close_Document_Viewer() + Private Sub Show_SelectedDoc(AfterNodeChange As Boolean) + Dim oSelectedDocs = ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search, AfterNodeChange) + If Not IsNothing(oSelectedDocs) Then + If ViewerInit Then + If oSelectedDocs.Count >= 1 Then + Refresh_DocID() + Close_Document_Viewer() - System.Threading.Thread.Sleep(400) - Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDocs.First() - Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath) + System.Threading.Thread.Sleep(400) + Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDocs.First() + Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath) - DocumentViewer.LoadFile(oPath) + DocumentViewer.LoadFile(oPath) + Else + LOGGER.Debug("Show_SelectedDoc - oSelectedDocs.Count not >= 1 ") + Close_Document_Viewer() + End If Else - Close_Document_Viewer() + LOGGER.Info("DocumentViewer not inited. No Show_SelectedDoc") End If + Else + LOGGER.Debug("Show_SelectedDoc - oSelectedDocs is nothing") End If + End Sub Private Sub Close_Document_Viewer() Try @@ -3290,16 +3337,16 @@ Public Class frmNodeNavigation If oDElWMFile = True Then If WMMOD.RemoveFile(oDoc.DocPath) Then - Update_Status_Label(True, Now.ToLongTimeString & " - File successfully deleted", EditState.Insert) + Update_Notification_Label(True, Now.ToLongTimeString & " - File successfully deleted", "Yellow") ClassHelper.InsertEssential_Log(oDoc.DocId, "DOC-ID", "FILE DELETED BY USER") End If Else ClassHelper.InsertEssential_Log(oDoc.DocId, "DOC-ID", "FILE LINK DELETED BY USER") - Update_Status_Label(True, Now.ToLongTimeString & " - File-links successfully deleted", EditState.Insert) + Update_Notification_Label(True, Now.ToLongTimeString & " - File-links successfully deleted", "Yellow") End If Else - Update_Status_Label(True, Now.ToLongTimeString & " - Error deleting file - Check log", EditState.Delete) + Update_Notification_Label(True, Now.ToLongTimeString & " - Error deleting file - Check log", "Yellow") End If End If @@ -3397,4 +3444,6 @@ Public Class frmNodeNavigation Private Sub frmNodeNavigation_DragDrop(sender As Object, e As DragEventArgs) Handles Me.DragDrop End Sub + + End Class \ No newline at end of file diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index bca2fac..c351543 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -135,14 +135,21 @@ + - + + - + - + + + + + +