From 1cd15786080e0fea9721a74d7b8a39d07e650a6d Mon Sep 17 00:00:00 2001 From: Developer01 Date: Fri, 19 Sep 2025 15:14:19 +0200 Subject: [PATCH] DocLoading --- .../Classes/ClassDocGrid.vb | 1 + .../Classes/ClassFileResult.vb | 2 ++ .../Classes/ClassImport_Windream.vb | 2 +- .../frmNodeNavigation.Designer.vb | 4 ++- .../frmNodeNavigation.resx | 2 +- app/DD-Record-Organizer/frmNodeNavigation.vb | 23 +++++++++++++++-- .../frmWM_CreateVersion.vb | 2 +- app/Setup_NoUpdaterVS19/Product.wxs | 25 ++++++++----------- 8 files changed, 40 insertions(+), 21 deletions(-) diff --git a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb index 692944f..e32384b 100644 --- a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -160,6 +160,7 @@ Public Class ClassDocGrid End Function Public Shared Sub GetDocItems(gridView As GridView) + _Helper = New ClassHelper If Init_Table() = True Then Console.WriteLine("gridView.SelectedRowsCount: " & gridView.SelectedRowsCount.ToString) diff --git a/app/DD-Record-Organizer/Classes/ClassFileResult.vb b/app/DD-Record-Organizer/Classes/ClassFileResult.vb index 94d7f80..99df158 100644 --- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb +++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb @@ -1,6 +1,8 @@ 'Imports DD_LIB_Standards Public Class ClassFileResult Public Shared Property DocID As Integer + Public Shared Property ParentID As Integer + Public Shared Property FileName As String Public Shared Property OldDisplayName As String Public Shared Property DocumentPath As String Public Shared InWork As Boolean = False diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 5dbde05..24cf1de 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -22,7 +22,7 @@ Public Class ClassImport_Windream 'Die Datei nach windream importieren Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE, True) If streamresult = True Then - Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE FULL_FILENAME = '{0}' AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) + Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE()) AND FULL_FILENAME = '{0}'", CURRENT_FILEIN_WD) CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql) sql = $"SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = {DOCTYPE_ID} AND ENTITY_ID = {CURRENT_ENTITY_ID}" Dim dt As DataTable = MYDB_ECM.GetDatatable(sql) diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 18e86da..9fb7046 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -418,7 +418,7 @@ Partial Class frmNodeNavigation Me.TreeListDevexpress.OptionsFilter.ColumnFilterPopupMode = DevExpress.XtraTreeList.ColumnFilterPopupMode.Excel Me.TreeListDevexpress.OptionsFilter.ExpandNodesOnFiltering = True Me.TreeListDevexpress.OptionsFind.AlwaysVisible = True - Me.TreeListDevexpress.OptionsFind.FindDelay = 600 + Me.TreeListDevexpress.OptionsFind.FindDelay = 900 Me.TreeListDevexpress.OptionsFind.FindFilterColumns = "NODE_CAPTION;NAVIGATION_PATH" Me.TreeListDevexpress.OptionsFind.ShowCloseButton = False Me.TreeListDevexpress.OptionsFind.ShowFindButton = False @@ -720,12 +720,14 @@ Partial Class frmNodeNavigation ' 'DocumentViewer ' + Me.DocumentViewer.BackColor = System.Drawing.SystemColors.ControlLightLight Me.DocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer.FileLoaded = False Me.DocumentViewer.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer.Name = "DocumentViewer" Me.DocumentViewer.Size = New System.Drawing.Size(1406, 1147) Me.DocumentViewer.TabIndex = 0 + Me.DocumentViewer.Viewer_ForceTemporaryMode = False ' 'XtraSaveFileDialog1 ' diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index 0c5242c..dc89f20 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -777,7 +777,7 @@ 606, 54 - 182 + 130 diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 80938e7..774eb29 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -979,7 +979,12 @@ Public Class frmNodeNavigation SplitContainerDocView.Collapsed = True Else RibbonPageGroupDocResult.Enabled = True - SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown + If Node_AfterSelect = False Then + SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown + Else + SplitContainerDocView.Collapsed = True + End If + End If End If @@ -2004,6 +2009,13 @@ Public Class frmNodeNavigation If FORM_SHOWN = False Then Return 0 End If + If Node_AfterSelect = True Then + SplitContainerDocView.Collapsed = True + GridViewDoc_Search.ClearSelection() + GridViewDoc_Search.FocusedRowHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle + + Return 0 + End If Update_DocID_Label(False) Update_Notification_Label(False, "", "") If GridViewDoc_Search.FocusedRowHandle >= 0 Then @@ -2013,6 +2025,9 @@ Public Class frmNodeNavigation Update_DocID_Label(True, omsg, EditState.Update) If SELECTED_DOC_ID <> oDocID Then SELECTED_DOC_ID = oDocID + If SplitContainerDocView.Collapsed Then + SplitContainerDocView.Collapsed = False + End If DocView_DisplaySelectedDoc(False) End If Update_DocID_Label(True, omsg, EditState.Update) @@ -2956,7 +2971,8 @@ Public Class frmNodeNavigation Dim oDocuments = Current_DocList.SelectedDocuments If oDocuments.Count = 1 Then ClassFileResult.DocID = oDocuments.First.DocId - ClassFileResult.DocumentPath = oDocuments.First.DocPath + ClassFileResult.ParentID = oDocuments.First.ParentID + ClassFileResult.FileName = oDocuments.First.Filename frmWM_CreateVersion.ShowDialog() Await RUN_DOCSEARCH(True) Else @@ -3228,6 +3244,9 @@ Public Class frmNodeNavigation DocView_DisplaySelectedDoc(False) End Sub Private Async Sub DocView_DisplaySelectedDoc(AfterNodeChange As Boolean) + If AfterNodeChange Then + Exit Sub + End If Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try Dim oSelectedDoc = ClassDocGrid.GetSingleSelectedDocument(GridViewDoc_Search) diff --git a/app/DD-Record-Organizer/frmWM_CreateVersion.vb b/app/DD-Record-Organizer/frmWM_CreateVersion.vb index 76dbba5..ffd4fe6 100644 --- a/app/DD-Record-Organizer/frmWM_CreateVersion.vb +++ b/app/DD-Record-Organizer/frmWM_CreateVersion.vb @@ -13,7 +13,7 @@ Public Class frmWM_CreateVersion 'Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql) 'Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,DOC_PATH) VALUES ({USER_GUID},'{ProcID.ToString}',{odwVersionId},{BW_DocID},'{BW_DocPath}')" 'MYDB_ECM.ExecuteNonQuery(oInsert) - Dim sql = $"SELECT DocID from VWPMO_DOC_SYNC Where FULL_FILENAME = '{ClassFileResult.DocumentPath}'" + Dim sql = $"SELECT DocID from VWPMO_DOC_SYNC Where dwParentID = {ClassFileResult.ParentID} and Filename = '{ClassFileResult.FileName}'" Dim VERSION = MYDB_ECM.GetScalarValue(sql) If Not IsNothing(VERSION) Then VERSION = VERSION + 1 diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index 0184768..aac5b0e 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -183,6 +183,8 @@ + + @@ -190,12 +192,18 @@ + + + + + + @@ -205,34 +213,21 @@ - - - - + + - - - - - - - - - /> - -