diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index b7884c1..9f33c38 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -1,6 +1,7 @@ Imports System.IO Imports DD_LIB_Standards Imports DevExpress.DataAccess.Native +Imports DevExpress.XtraRichEdit.API.Native Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging @@ -16,7 +17,7 @@ Public Class ClassInit My.Application.Info.CompanyName, My.Application.Info.ProductName) LOGGER = LOGCONFIG.GetLogger() - LOGGER.Info("OrgFlow started") + LOGGER.Info("orgFLOW started") Dim oUserAppDataPath As String = Application.UserAppDataPath Dim oLegacyAppDataPath As String = Application.UserAppDataPath @@ -238,7 +239,13 @@ Public Class ClassInit For Each oRow As DataRow In oDTFF_CHANGE.Rows FILE_FORMATS_CHANGE_DURING_EDIT.Add(oRow.Item("FILE_EXT")) Next - + oSql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE" + Dim oDTTBPMO_WD_OBJECTTYPE = MYDB_ECM.GetDatatable(oSql) + If oDTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then + WMOBJECTTYPE = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("OBJECT_TYPE").ToString + WMINDEX_DOCTYPE = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString + WMINDEX_RELATION = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString + End If Catch ex As Exception LOGGER.Error(ex) MsgBox("Unexpected Error in InitBasics2:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -350,11 +357,10 @@ Public Class ClassInit LOGGER.Info($"User configured as an admin, but SHAREDRIVE ACTIVE - So WM_READ_ONLY = False!") WM_READ_ONLY = False End If - End If - If oMODULE_ACCES = False Then + If oMODULE_ACCES = False Then LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using OrgFlow!") 'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") diff --git a/app/DD-Record-Organizer/Classes/ClassWDRights.vb b/app/DD-Record-Organizer/Classes/ClassWDRights.vb index 25dbe3e..861d966 100644 --- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb +++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb @@ -73,7 +73,6 @@ Public Class ClassWDRights Dim DT_USER_RIGHT As DataTable Dim DT_GROUP_RIGHT As DataTable Dim oSession - ' Dim oWMObject As WINDREAMLib.WMObject Dim UserGroupRelation Dim UserOrGroup Dim oUSer diff --git a/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb index 7e5c5de..e3a3405 100644 --- a/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb @@ -13,6 +13,7 @@ Public Class ClassWindreamDocGrid Public Class WindreamDoc Public Property DocId As Integer Public Property DocPath As String + Public Property Filename As String Public Property DisplayName As String Public Property DocType As String End Class @@ -96,13 +97,15 @@ Public Class ClassWindreamDocGrid Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID") Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname") Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH") - Dim oDocType = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") + Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") + Dim oFilename = pGridView.GetRowCellValue(oRowHandle, "Dateiname") oDocuments.Add(New WindreamDoc With { .DocId = oDocId, .DocPath = oDocPath, - .DocType = oDocType, - .DisplayName = oDisplayName + .DocType = oObjecttype, + .DisplayName = oDisplayName, + .Filename = oFilename }) Next diff --git a/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb b/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb index 87f58df..328e85e 100644 --- a/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb +++ b/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb @@ -23,7 +23,8 @@ Public Class ClassNodeCommands T.PARENT_GUID, T.SEQUENCE, T.TYPE_NODE, - T.CREATE_RECORD + T.CREATE_RECORD, + T.NAVIGATION_PATH FROM VWPMO_STRUCTURE_NODES T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index ac7e43e..4c4fd7f 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -22,6 +22,9 @@ Module ModuleMySettings Public WD_UNICODE As Boolean = False Public WMDriveLetter As String Public WMPATH_PREFIX As String = "" + Public WMOBJECTTYPE As String = "" + Public WMINDEX_DOCTYPE As String = "" + Public WMINDEX_RELATION As String = "" Public WMPATH_via_WMA As Boolean = False Public DTTBPMO_SERVICE_RIGHT_CONFIG As DataTable Public WMMOD As Windream diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 2f3b249..1fdd6e9 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/frmChangeDocType.vb b/app/DD-Record-Organizer/frmChangeDocType.vb index 7c7dce0..2fc9689 100644 --- a/app/DD-Record-Organizer/frmChangeDocType.vb +++ b/app/DD-Record-Organizer/frmChangeDocType.vb @@ -6,11 +6,14 @@ Private Sub frmChangeDocType_Load(sender As Object, e As EventArgs) Handles MyBase.Load cmbDocType.Properties.Items.AddRange(DocTypes) - + Dim oTitle = "Dateien" + If USER_LANGUAGE <> "de-DE" Then + oTitle = "Documents" + End If If FileNames.Count = 1 Then txtDocuments.EditValue = FileNames.First() Else - txtDocuments.EditValue = $"{FileNames.Count} Dokumente" + txtDocuments.EditValue = $"{FileNames.Count} {oTitle}" End If End Sub diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 591feec..2a71d79 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -432,9 +432,9 @@ Partial Class frmConstructor_Main 'tstxtRenameNode ' Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control - resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode") Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText Me.tstxtRenameNode.Name = "tstxtRenameNode" + resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode") ' 'tsmiNodeNew ' @@ -450,8 +450,8 @@ Partial Class frmConstructor_Main 'tsmINewText ' Me.tsmINewText.BackColor = System.Drawing.Color.Yellow - resources.ApplyResources(Me.tsmINewText, "tsmINewText") Me.tsmINewText.Name = "tsmINewText" + resources.ApplyResources(Me.tsmINewText, "tsmINewText") ' 'ToolStripSeparator15 ' @@ -1322,8 +1322,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameFile ' Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange - resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile" + resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") ' 'DisplaynameUmbenennenToolStripMenuItem ' @@ -1334,8 +1334,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameDisplay ' Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange - resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay" + resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") ' 'ToolStripSeparator22 ' diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 1db23fe..9f6f214 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -210,9 +210,6 @@ 221, 6 - - Segoe UI, 9pt - 200, 23 @@ -235,9 +232,6 @@ Knotentext: - - Segoe UI, 9pt - 152, 23 @@ -496,7 +490,7 @@ 0, 0 - 908, 237 + 910, 237 2 @@ -592,7 +586,7 @@ 0, 0 - 699, 231 + 699, 223 4 @@ -634,7 +628,7 @@ 0, 0 - 486, 206 + 488, 198 5 @@ -681,10 +675,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 206 + 0, 198 - 486, 25 + 488, 25 0 @@ -720,7 +714,7 @@ 1 - 1201, 235 + 1201, 227 1 @@ -896,7 +890,7 @@ 1 - 1201, 262 + 1201, 254 Detailansicht @@ -914,7 +908,7 @@ 0 - 1203, 290 + 1203, 282 3 @@ -926,7 +920,7 @@ 0, 27 - 1201, 227 + 1201, 237 0 @@ -1022,9 +1016,6 @@ False - - Segoe UI, 9pt - 50, 23 @@ -1183,7 +1174,7 @@ - 1201, 254 + 1201, 264 Positionen @@ -1688,7 +1679,7 @@ 2 - 1201, 254 + 1201, 264 Wiedervorlage @@ -1790,7 +1781,7 @@ 5 - 1201, 227 + 1201, 237 90 @@ -1862,7 +1853,7 @@ 1 - 1201, 254 + 1201, 264 Vorgängervarianten @@ -1889,7 +1880,7 @@ 0, 0 - 1201, 254 + 1201, 264 301, 17 @@ -1918,7 +1909,7 @@ 0 - 1201, 254 + 1201, 264 NodeNavigation(beta) @@ -1963,7 +1954,7 @@ 1 - 1203, 539 + 1203, 529 2 @@ -1987,7 +1978,7 @@ Fill - 0, 147 + 0, 158 Panel1 @@ -2020,7 +2011,7 @@ 1 - 1203, 539 + 1203, 529 4 @@ -2120,9 +2111,6 @@ Verknüpfungen anzeigen - - Segoe UI, 9pt - 152, 23 @@ -2135,9 +2123,6 @@ Dateinamen umbenennen - - Segoe UI, 9pt - 152, 23 @@ -3085,13 +3070,13 @@ Funktionen - 1203, 147 + 1203, 158 - 0, 686 + 0, 687 - 1203, 23 + 1203, 22 RibbonStatusBar1 diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 514b676..e885d60 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -365,17 +365,19 @@ Partial Class frmNodeNavigation Me.TreeListDevexpress.AppendNode(New Object(-1) {}, 0) Me.TreeListDevexpress.EndUnboundLoad() Me.TreeListDevexpress.OptionsBehavior.Editable = False + Me.TreeListDevexpress.OptionsBehavior.PopulateServiceColumns = True Me.TreeListDevexpress.OptionsBehavior.ReadOnly = True + Me.TreeListDevexpress.OptionsFilter.ColumnFilterPopupMode = DevExpress.XtraTreeList.ColumnFilterPopupMode.Excel Me.TreeListDevexpress.OptionsFilter.ExpandNodesOnFiltering = True Me.TreeListDevexpress.OptionsFind.AlwaysVisible = True Me.TreeListDevexpress.OptionsFind.FindDelay = 300 - Me.TreeListDevexpress.OptionsFind.FindFilterColumns = "NODE_CAPTION;ID1" + Me.TreeListDevexpress.OptionsFind.FindFilterColumns = "NODE_CAPTION;NAVIGATION_PATH" Me.TreeListDevexpress.OptionsFind.ShowCloseButton = False Me.TreeListDevexpress.OptionsFind.ShowFindButton = False Me.TreeListDevexpress.OptionsLayout.AddNewColumns = False - Me.TreeListDevexpress.OptionsMenu.ShowExpandCollapseItems = False Me.TreeListDevexpress.OptionsSelection.EnableAppearanceFocusedCell = False Me.TreeListDevexpress.OptionsView.ShowColumns = False + Me.TreeListDevexpress.OptionsView.ShowFilterPanelMode = DevExpress.XtraTreeList.ShowFilterPanelMode.Never Me.TreeListDevexpress.OptionsView.ShowFirstLines = False Me.TreeListDevexpress.OptionsView.ShowHorzLines = False Me.TreeListDevexpress.OptionsView.ShowIndentAsRowStyle = True diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 4b73939..e8f367c 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -15,6 +15,8 @@ Imports DD_LIB_Standards Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Database +Imports DevExpress.XtraRichEdit.API.Native +Imports DevExpress.Data.Filtering Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" @@ -57,7 +59,8 @@ Public Class frmNodeNavigation 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 MyFocusedNode As TreeListNode + Private Property oCollapseInAction As Boolean = False Private Property MyTreeListViewState As ClassTreeListViewState Private Property AvailableConfigNodes As New List(Of frmNewNode.NodeConfig) @@ -171,11 +174,6 @@ Public Class frmNodeNavigation 'Die Standards ein/ausblenden End If - 'Dim sql_ResultList = "select T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP " & - ' "FROM TBPMO_WORKFLOW T,TBPMO_WORKFLOW_ENTITY_STATE T1 " & - ' "WHERE T.GUID = T1.WF_ID " & - ' "GROUP BY T1.ENTITY_ID,T.GUID,T.TITLE,T.MANUALLY,T.CREATE_ON_REC_CREATE,T.CREATE_ON_FOLL_UP" - 'DT_WORKFLOWS_MANUAL = MYDB_ECM.GetDatatable(sql_ResultList) Load_Datafor_Entity() If WM_READ_ONLY Then tsitmDMSReadOnly.Visibility = DevExpress.XtraBars.BarItemVisibility.Always @@ -197,22 +195,6 @@ Public Class frmNodeNavigation Try Dim oTable = Await ClassNodeCommands.LoadNodes(CURRENT_ENTITY_ID) DT_STRUCTURE_NODES = oTable - 'Dim oToken = RunningTaskTokenSource.Token - 'Dim oStructureNodeSql = $"SELECT - ' T.GUID, - ' T.RECORD_ID, - ' T.NODE_CONFIG_ID, - ' T.NODE_CAPTION, - ' T.ID1, - ' T.BACK_COLOR, - ' T.PARENT_GUID, - ' T.SEQUENCE, - ' T.TYPE_NODE - ' FROM - ' VWPMO_STRUCTURE_NODES T - 'INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID - 'WHERE T.ENTITY_ID = {CURRENT_ENTITY_ID}" - 'DT_STRUCTURE_NODES = MYDB_ECM.GetDatatable(oStructureNodeSql) Dim oNodeConfigSql = String.Format("select T.* from TBPMO_STRUCTURE_NODES_CONFIGURATION T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T.ENTITY_ID = {0}", CURRENT_ENTITY_ID) Dim DT_TREEVIEW_CONFIGURATION = MYDB_ECM.GetDatatable(oNodeConfigSql) @@ -236,7 +218,7 @@ Public Class frmNodeNavigation TreeListDevexpress.Columns("SEQUENCE").SortOrder = SortOrder.Ascending TreeListDevexpress.StateImageList = ImageCollection1 - Dim oVisibleColumns = New List(Of String) From {"NODE_CAPTION"} + Dim oVisibleColumns = New List(Of String) From {"NODE_CAPTION"} ', "NAVIGATION_PATH"} For Each oColumn In TreeListDevexpress.Columns If oVisibleColumns.Contains(oColumn.FieldName) = False Then oColumn.Visible = False @@ -296,10 +278,10 @@ Public Class frmNodeNavigation End Class Private Async Sub TreeListDevexpress_FocusedNodeChanged(sender As Object, e As FocusedNodeChangedEventArgs) Handles TreeListDevexpress.FocusedNodeChanged - If FORM_SHOWN = False Then + If FORM_SHOWN = False Or oCollapseInAction Then Exit Sub End If - FocusedNode = Nothing + MyFocusedNode = Nothing If btnCreateNewNode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Then btnCreateNewNode.Enabled = False End If @@ -316,7 +298,7 @@ Public Class frmNodeNavigation 'For Each treeListNode As TreeListNode In TreeListDevexpress.Selection 'FocusedNode = TreeListNode - FocusedNode = e.Node + MyFocusedNode = e.Node RPGNodes.Enabled = True @@ -351,7 +333,7 @@ Public Class frmNodeNavigation SELECTED_NODE_CAPTION = oNodeCaption ' BEGIN NEW NODE - Dim oConfigNodeChildren = FocusedNode.Nodes.Where(Function(n) n.Item("TYPE_NODE") = 1000) + Dim oConfigNodeChildren = MyFocusedNode.Nodes.Where(Function(n) n.Item("TYPE_NODE") = 1000) Dim oHasConfigNodeChildren = oConfigNodeChildren.Any() Dim oConfigNodeChildrenList = oConfigNodeChildren.ToList() @@ -945,7 +927,7 @@ Public Class frmNodeNavigation Case GetType(System.Windows.Forms.GroupBox) Lock_Record_Controls_Recursive(state, DirectCast(Control, GroupBox).Controls) Case GetType(System.Windows.Forms.TextBox) - Dim txt As TextBox = CType(Control, TextBox) + Dim txt As System.Windows.Forms.TextBox = CType(Control, System.Windows.Forms.TextBox) txt.ReadOnly = CHECK_CONTROL_CONFIGURED_RO(controlId, state) Case Else Control.Enabled = Not CHECK_CONTROL_CONFIGURED_RO(controlId, state) 'state @@ -1080,30 +1062,78 @@ Public Class frmNodeNavigation Private Sub TreeListDevexpress_ColumnFilterChanged_1(sender As Object, e As EventArgs) Handles TreeListDevexpress.ColumnFilterChanged 'oFilterActive = True + 'If TreeListDevexpress.FindFilterText <> "" Then Dim oFilterText As String = TreeListDevexpress.FindFilterText - Dim oNode = TreeListDevexpress.FocusedNode + 'Dim oNode = TreeListDevexpress.FocusedNode If LastFindFilterText <> "" And oFilterText = "" Then - TreeListDevexpress.FocusedNode = FocusedNode - TreeListDevexpress.MakeNodeVisible(FocusedNode) - End If - If SQL_OF_NODE_SEARCH <> String.Empty Then - Dim oSQL_SEARCH As String = SQL_OF_NODE_SEARCH - oSQL_SEARCH = oSQL_SEARCH.Replace("@ENTITY_ID", CURRENT_ENTITY_ID) - oSQL_SEARCH = oSQL_SEARCH.Replace("@VALUE", oFilterText) - Dim oDT As DataTable = MYDB_ECM.GetDatatable(oSQL_SEARCH) - If Not IsNothing(oDT) Then - If oDT.Rows.Count > 1 Then - - ElseIf oDT.Rows.Count = 1 Then - Dim oResult As String - oResult = oDT.Rows(0).Item(0) - End If + If Not IsNothing(MyFocusedNode) Then + oCollapseInAction = True + TreeListDevexpress.CollapseAll() + TreeListDevexpress.FocusedNode = MyFocusedNode + TreeListDevexpress.MakeNodeVisible(MyFocusedNode) + oCollapseInAction = False End If + ElseIf oFilterText <> "" Then + TreeListDevexpress.OptionsView.ShowFilterPanelMode = ShowFilterPanelMode.ShowAlways + ElseIf oFilterText = "" Then + TreeListDevexpress.OptionsView.ShowFilterPanelMode = ShowFilterPanelMode.Never + End If + 'If SQL_OF_NODE_SEARCH <> String.Empty Then + ' Dim oSQL_SEARCH As String = SQL_OF_NODE_SEARCH + ' oSQL_SEARCH = oSQL_SEARCH.Replace("@ENTITY_ID", CURRENT_ENTITY_ID) + ' oSQL_SEARCH = oSQL_SEARCH.Replace("@VALUE", oFilterText) + ' Dim oDT As DataTable = MYDB_ECM.GetDatatable(oSQL_SEARCH) + ' ' If Not IsNothing(oDT) Then + ' ' If oDT.Rows.Count > 1 Then + + ' ' ElseIf oDT.Rows.Count = 1 Then + ' ' Dim oResult As String + ' ' oResult = oDT.Rows(0).Item(0) + ' ' End If + ' ' End If + 'End If LastFindFilterText = oFilterText + ' End If 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 + + ' Split the search text into individual criteria + Dim criteriaStrings As String() = e.FindPanelText.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) _ + $"Contains([NODE_CAPTION], '{str}') OR Contains([NAVIGATION_PATH], '{str}')") + + ' Join the conditions with OR + Dim filterString As String = String.Join(" OR ", filterConditions) + + ' Parse the filter string into a CriteriaOperator + Dim findCriteria As CriteriaOperator = CriteriaOperator.Parse(filterString) + + ' Set the find criteria for the TreeList + e.SetFindCriteria(findCriteria) + + ' Mark the event as handled + e.Handled = True + End Sub + 'Private Sub TreeListDevexpress_DoubleClick(sender As Object, e As EventArgs) Handles TreeListDevexpress.DoubleClick + ' If TreeListDevexpress.FindFilterText <> "" Then + ' TreeListDevexpress.FindFilterText = "" + ' End If + ' MyFocusedNode = Nothing + ' Dim oMyTreeList As TreeList = sender + ' Dim oTlHI As TreeListHitInfo = oMyTreeList.CalcHitInfo(oMyTreeList.PointToClient(MousePosition)) + ' If Not IsNothing(oTlHI.Node) Then + ' MyFocusedNode = sender + ' End If + + + 'End Sub 'Private Async Sub LoadRecord(pRecord As Integer) ' Try ' CURRENT_RECORD_ID = pRecord @@ -2855,8 +2885,8 @@ Public Class frmNodeNavigation Cursor = Cursors.WaitCursor Dim oSQL = $"EXEC PRCUST_REORDER_CHILD_NODES " Dim oNodeGUID As Integer = 0 - Dim oID = FocusedNode.Id - Dim PID = FocusedNode.ParentNode + Dim oID = MyFocusedNode.Id + Dim PID = MyFocusedNode.ParentNode Dim Column_pRecord As TreeListColumn = TreeListDevexpress.Columns("RECORD_ID") Dim Column_Caption As TreeListColumn = TreeListDevexpress.Columns("NODE_CAPTION") @@ -2867,7 +2897,7 @@ Public Class frmNodeNavigation MYDB_ECM.ExecuteNonQuery(oSQL) Await ReloadTreeView() MyTreeListViewState.LoadState() - TreeListDevexpress.FocusedNode = FocusedNode + TreeListDevexpress.FocusedNode = MyFocusedNode End If @@ -2977,8 +3007,8 @@ Public Class frmNodeNavigation Cursor = Cursors.WaitCursor Dim oSQL = $"EXEC PRCUST_REORDER_CHILD_NODES " Dim oNodeGUID As Integer = 0 - Dim oID = FocusedNode.Id - Dim PID = FocusedNode.ParentNode + Dim oID = MyFocusedNode.Id + Dim PID = MyFocusedNode.ParentNode Dim Column_pRecord As TreeListColumn = TreeListDevexpress.Columns("RECORD_ID") Dim Column_Caption As TreeListColumn = TreeListDevexpress.Columns("NODE_CAPTION") @@ -2989,7 +3019,7 @@ Public Class frmNodeNavigation MYDB_ECM.ExecuteNonQuery(oSQL) Await ReloadTreeView() MyTreeListViewState.LoadState() - TreeListDevexpress.FocusedNode = FocusedNode + TreeListDevexpress.FocusedNode = MyFocusedNode Update_Status_Label(True, "Nodes reordered") End If @@ -3045,8 +3075,8 @@ Public Class frmNodeNavigation Dim oRow = NODE_CONFIGURABLE_NODES_DT.Select($"GUID = {oForm.Id}").First() Dim oCreateRecord = oRow.Item("CREATE_RECORD") - Dim oParentNodeGuid As Integer = FocusedNode.Item("GUID") - Dim oIsExpanded As Boolean = FocusedNode.Expanded + Dim oParentNodeGuid As Integer = MyFocusedNode.Item("GUID") + Dim oIsExpanded As Boolean = MyFocusedNode.Expanded Dim oNodeCreator = New ClassNodeCreator(LOGCONFIG, ImageCollection1) Dim oSuccess = oNodeCreator.AddNode(_EntityId, oForm.Title, oParentNodeGuid, oForm.Id, oCreateRecord) @@ -3079,14 +3109,38 @@ Public Class frmNodeNavigation 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 oTable = MYDB_ECM.GetDatatable($"SELECT DOKUMENTTYPE_ID AS ID, DOKUMENTTYPE AS NAME FROM VWPMO_DOKUMENTTYPES WHERE FORM_ID = {CURRENT_ENTITY_ID} ORDER BY DOKUMENTTYPE") Dim oDocTypes = oTable.Rows.Cast(Of DataRow).Select(AddressOf ToDocType).ToList() - Dim oFileNames = oSelectedDocs.Select(Function(d) d.DisplayName).ToList() + Dim oFileNames = oSelectedDocs.Select(Function(d) d.Filename).ToList() Dim oForm As New frmChangeDocType With {.DocTypes = oDocTypes, .FileNames = oFileNames} - + 'For Each oDoc As ClassWindreamDocGrid.WindreamDoc In oSelectedDocs + ' oForm.FileNames = Nothing + ' If oDoc.DocPath <> "" Then + ' oForm.FileNames.Add(oDoc.DocPath) + ' End If + 'Next If oForm.ShowDialog() = DialogResult.OK Then + If Not IsNothing(oForm.SelectedDocType) Then + For Each oDoc As ClassWindreamDocGrid.WindreamDoc In oSelectedDocs + If oDoc.DocPath <> "" Then + Dim oWMObject As WINDREAMLib.WMObject + Dim oReldocpath = ClassHelper.GetRelPath(oDoc.DocPath) + LOGGER.Info("oReldocpath: " & oReldocpath) + oWMObject = WMMOD.GetFileByPath(oReldocpath) + If Not IsNothing(oWMObject) Then + WMMOD.SetFileIndex(oReldocpath, WMINDEX_DOCTYPE, oForm.SelectedDocType.ToString, WMOBJECTTYPE) + Dim oupd = $"UPDATE TBPMO_DOCRESULT_LIST SET DOCTYPE = '{oForm.SelectedDocType.ToString}', CHANGED_WHO = '{USER_USERNAME}',Change_DateTime = GETDATE(),CHANGED_WHEN = GETDATE() WHERE DocID = {oDoc.DocId}" + MYDB_ECM.ExecuteNonQuery(oupd) + End If + + End If + Next + RUN_WDSEARCH_GRID(True) + + + End If End If Catch ex As Exception LOGGER.Error(ex) @@ -3201,4 +3255,6 @@ Public Class frmNodeNavigation LOGGER.Warn($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!") End Try End Sub + + End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmSplash.resx b/app/DD-Record-Organizer/frmSplash.resx index 632eb7b..9d344c4 100644 --- a/app/DD-Record-Organizer/frmSplash.resx +++ b/app/DD-Record-Organizer/frmSplash.resx @@ -7476,100 +7476,103 @@ iVBORw0KGgoAAAANSUhEUgAAAyAAAADICAYAAAAQj4UaAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAACxEAAAsRAX9kX5EAABWqSURBVHhe7d1dqGVnfcfxXEiLUhGJto62El9oSGtihmir - bR2pWjBga1ATM2m9KkoHsVIo+HJTkbbU9CJCi0wxHamkCNoX0lZMjSjSBqGxbYKJUjBeSC5ahArNhbaE - nM5vn1mTPfv811779Tl77fO5+JAza6299tpnzsle31nrefZVf/ny0wcAAGP2bx8+ffB//1qvi6uuuqqJ - Bz977US1Lj5xy23l8W1CXn++D9W6PG91PNtw8M3+7/db3vim8vg2Jc9dLY8Pnv2N8pg27fd/+9TB/zz4 - ynJd5Diq49uEsfweCBAAYPQEiAAJASJAAACaECACJASIAAEAaEKACJAQIAIEAKAJASJAQoAIEACAJgSI - AAkBIkAAAJoQIAIkBIgAAQBoQoAIkBAgAgQAoAkBIkBCgAgQAIAmBIgACQEiQAAAmhAgAiQEiAABAGhC - gAiQECACBACgCQEiQEKACBAAgCYEiAAJASJAAACaECACJASIAAEAaEKACJAQIAIEAKAJASJAQoAIEACA - JgSIAAkBIkAAAJoQIAIkBIgAAQBoQoAIkBAgAgQAoAkBIkBCgAgQAIAmBIgACQEiQAAAmhAgAiQEiAAB - AGhi6MTrl179c/WJ0IYJEAEiQAQIAHACDJ145cS3PBHaMAEiQASIAAEATgABIkBCgAgQAIAmBIgACQEi - QAAAmhAgAiQEiAABAGhCgAiQECACBACgCQEiQEKACBAAgCYEiAAJASJAAACaECACJASIAAEAaEKACJAQ - IAIEAKAJASJAQoAIEACAJgSIAAkBIkAAAJoQIAIkBIgAAQBoQoAIkBAgAgQAoAkBIkBCgAgQAIAmBIgA - CQEiQAAAmhAgAiQEiAABAGhCgAiQECACBACgCQEiQEKACBAAgCYEiAAJASJAAACaECACJASIAAEAaEKA - CJAQIAIEAKAJASJAQoAIEACAJgSIAAkBIkAAAJoQIAIkBIgAAQBoQoAIkBAgAgQAoAkBIkBCgAgQAIAm - BIgACQEiQAAAmhAgAiQEiAABAGhCgAiQECACBACgCQEiQEKACBAAgCYEiAAJASJAAACaECACJASIAAEA - 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 - bAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAACxEAAAsRAX9kX5EAABZcSURBVHhe7d1vqG15XcfxeRCFUoiY1e2PjCYN1sw4l9HS + yiupgQOWgzrjzJSPQukiJUGQ+iSRirQHIxgyoV1JDEH7w1TinxFFahAasxkcRwL1gcyDQkhoHmgxzO5+ + 9rnrumad79p7n/3nd/ba5/XgxdzZa+111t33nLvX+/7W77ev+evnnp8BAEzZl95+fvZ//1Zvi2uuuaaJ + Bz563Vy1Ld536+3l+W1Dfv95Hapt+brV+ezC7JHx1/tVL39FeX7bkq9dPR5vvfM3y3Patj/63XOz/3ng + +eW2yHlU57cNU/k5ECAAwOQJEAESAkSAAAA0IUAESAgQAQIA0IQAESAhQAQIAEATAkSAhAARIAAATQgQ + ARICRIAAADQhQARICBABAgDQhAARICFABAgAQBMCRICEABEgAABNCBABEgJEgAAANCFABEgIEAECANCE + ABEgIUAECABAEwJEgIQAESAAAE0IEAESAkSAAAA0IUAESAgQAQIA0IQAESAhQAQIAEATAkSAhAARIAAA + TQgQARICRIAAADQhQARICBABAgDQhAARICFABAgAQBMCRICEABEgAABNCBABEgJEgAAANCFABEgIEAEC + ANDEsguvX37hz9cXQlsmQASIABEgAMAZsOzCKxe+5YXQlgkQASJABAgAcAYIEAESAkSAAAA0IUAESAgQ + AQIA0IQAESAhQAQIAEATAkSAhAARIAAATQgQARICRIAAADQhQARICBABAgDQhAARICFABAgAQBMCRICE + ABEgAABNCBABEgJEgAAANCFABEgIEAECANCEABEgIUAECABAEwJEgIQAESAAAE0IEAESAkSAAAA0IUAE + SAgQAQIA0IQAESAhQAQIAEATAkSAhAARIAAATQgQARICRIAAADQhQARICBABAgDQhAARICFABAgAQBMC + RICEABEgAABNCBABEgJEgAAANCFABEgIEAECANCEABEgIUAECABAEwJEgIQAESAAAE0IEAESAkSAAAA0 + IUAESAgQAQIA0IQAESAhQAQIAEATAkSAhAARIAAATQgQARICRIAAADQhQARICBABAgDQhAARICFABAgA + QBMCRICEABEgAABNCBABEgJEgAAANCFABEgIEAECANCEABEgIUAECABAEwJEgIQAESAAAE0IEAESAkSA + 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 + AAAASUVORK5CYII= diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index 1fbf1fa..fe97598 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -12,7 +12,6 @@ Public Class frmWM_IndexFile Dim formloaded As Boolean = False Dim DTVWPMO_DOKUMENTTYPES As DataTable Dim _wm As Windream - Dim oWMObjecttype As String Public Class SW Public label As String @@ -60,7 +59,7 @@ Public Class frmWM_IndexFile msg = "There is already a file with the same name! Would You like to replace the file?" & vbNewLine & "All versions will also be deleted!" End If Dim result As MsgBoxResult - result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + result = MessageBox.Show(msg, "File already exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then If _wm.RemoveFile(CURRENT_NEWFILENAME) Then 'clsWM_SET.Delete_WDFile(CURRENT_NEWFILENAME) = False Then swWORK_FILE.Done() @@ -123,40 +122,26 @@ Public Class frmWM_IndexFile End Try Dim indexierung_erfolgreich As Boolean = True - 'Erst die Objekttyp-Indices indexieren - 'den Entity-Key auslesen - Dim DTTBPMO_WD_OBJECTTYPE As DataTable - sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE" ' where Upper(object_type) = Upper('" & clsWM.MY_WDOBJECTTYPE & "')" - DTTBPMO_WD_OBJECTTYPE = MYDB_ECM.GetDatatable(sql) - If Not DTTBPMO_WD_OBJECTTYPE Is Nothing Then - If DTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then - oWMObjecttype = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("OBJECT_TYPE").ToString - Dim indexname - 'den Doctype auslesen - indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString - LOGGER.Debug("Doctype: " & vDokart.ToString) - indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, indexname, vDokart, oWMObjecttype) ' clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & indexname & "') - Check logfile!") - sw.Done() - swWORK_FILE.Done() - Return False - End If - - indexname = DTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString - indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", oWMObjecttype) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) - If indexierung_erfolgreich = False Then - err = True - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & indexname & "') - Check logfile!") - sw.Done() - swWORK_FILE.Done() - Return False - End If - - End If - End If + LOGGER.Debug("Doctype: " & vDokart.ToString) + indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, WMINDEX_DOCTYPE, vDokart, WMOBJECTTYPE) ' clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, vDokart, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) + If indexierung_erfolgreich = False Then + err = True + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing Doctype '" & WMINDEX_DOCTYPE & "') - Check logfile!") sw.Done() + swWORK_FILE.Done() + Return False + End If + + indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, WMINDEX_RELATION, "ADDI-RELATION", WMOBJECTTYPE) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, "ADDI-RELATION", oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) + If indexierung_erfolgreich = False Then + err = True + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in WorkFile-indexing AddiRelation '" & WMINDEX_RELATION & "') - Check logfile!") + sw.Done() + swWORK_FILE.Done() + Return False + End If + + sw.Done() If DT_AUTO_INDEXE Is Nothing = False Then 'CHECK DD If DT_AUTO_INDEXE.Rows.Count > 0 Then Dim Count As Integer = 0 @@ -218,7 +203,7 @@ Public Class frmWM_IndexFile End If LOGGER.Debug($"Autovalue used for Indexing: '" & oAutoIndexValue.ToString & "'") Count += 1 - indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, oAutoIndexname, oAutoIndexValue, oWMObjecttype) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) + indexierung_erfolgreich = _wm.SetFileIndex(CURRENT_FILEIN_WD, oAutoIndexname, oAutoIndexValue, WMOBJECTTYPE) 'clsWM_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, oWMObjecttype) 'clsWM.MY_WDOBJECTTYPE) If indexierung_erfolgreich = False Then MsgBox("Unexpected Error in indexing file - See log", MsgBoxStyle.Critical) err = True