DocLoading

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)

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

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)

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
         '

app/DD-Record-Organizer/frmNodeNavigation.resx

@@ -777,7 +777,7 @@
     <value>606, 54</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>182</value>
+    <value>130</value>
   </metadata>
   <data name="frmNodeNavigation.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

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)

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

app/Setup_NoUpdaterVS19/Product.wxs

@@ -183,6 +183,8 @@
 			<!-- GDPicture und notwendige Lizenzen -->
 			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
         <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
+        <File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll" />
+        <File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll" />
         <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
         <File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
         <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
@@ -190,12 +192,18 @@
         <File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
         <File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
         <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML.64" Name="GdPicture.NET.14.Imaging.ML.64.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" />
+       
+        <File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
         <File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
         <File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
         <File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
         <File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
         <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
         <File Id="GdPicture.NET.14.RTF" Name="GdPicture.NET.14.RTF.dll" />
+         <File Id="GdPicture.NET.14.SVG" Name="GdPicture.NET.14.SVG.dll" />
         <File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" />
         <File Id="GdPicture.NET.14.OpenXML" Name="GdPicture.NET.14.OpenXML.dll" />
         <File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
@@ -205,34 +213,21 @@
         <File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" />
         <File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" />
         <File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" />
-        <File Id="Microsoft.Bcl.HashCode" Name="Microsoft.Bcl.HashCode.dll" />
-        <File Id="Office" Name="Office.dll" />
         <File Id="OpenMcdf" Name="OpenMcdf.dll" />
-        <File Id="protobuf-net.Core" Name="protobuf-net.Core.dll" />
+        <File Id="protobufnet.Core" Name="protobuf-net.Core.dll" />
-        <File Id="protobuf-net" Name="protobuf-net.dll" />
+        <File Id="protobufnet" Name="protobuf-net.dll" />
         <File Id="RtfPipe" Name="RtfPipe.dll" />
         <File Id="System.Buffers" Name="System.Buffers.dll" />
         <File Id="System.CodeDom" Name="System.CodeDom.dll" />
-        <File Id="System.Collections.Concurrent" Name="System.Collections.Concurrent.dll" />
-        <File Id="System.Collections" Name="System.Collections.dll" />
         <File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" />
-        <File Id="System.IO.FileSystem.DriveInfo" Name="System.IO.FileSystem.DriveInfo.dll" />
-        <File Id="System.IO.FileSystem.Primitives" Name="System.IO.FileSystem.Primitives.dll" />
-        <File Id="System.IO.FileSystem.Watcher" Name="System.IO.FileSystem.Watcher.dll" />
-        <File Id="System.IO.IsolatedStorage" Name="System.IO.IsolatedStorage.dll" />
-        <File Id="System.IO.MemoryMappedFiles" Name="System.IO.MemoryMappedFiles.dll" />
         <File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />
         <File Id="System.Memory" Name="System.Memory.dll" />
         <File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" />
         <File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" />
         <File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" />
         <File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" />
-        <File Id="System.Threading.Tasks" Name="System.Threading.Tasks.dll" />
         <File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" />
         <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
-        />
-        
-
       </Component>
 
 			<!-- DEVEXPRESS Bibliotheken -->