AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Funktionsprüfungen, benennung Parameter, neue GDPictureVersion

Browse Source
This commit is contained in:
Developer01
2025-05-19 15:07:42 +02:00
parent e8f3b68041
commit c2f02bf262
64 changed files with 225 additions and 392589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
View File

@@ -569,12 +569,12 @@ Public Class ClassDOC_SEARCH
Return "R"
End If
Dim sql = String.Format("SELECT dwAccessRight FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwObjectID = {0} and dwUserOrGroupID = {1}", DOC_ID, USERID_FK_INT_ECM)
Dim result = MYDB_ECM.GetScalarValue(sql)
If IsNothing(result) Or IsDBNull(result) Then
Dim odwAccessRight = MYDB_ECM.GetScalarValue(sql)
If IsNothing(odwAccessRight) Or IsDBNull(odwAccessRight) Then
Return Nothing
End If
LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{result}]")
Select Case result
LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{odwAccessRight}]")
Select Case odwAccessRight
Case 1
If USER_IS_ADMIN = False Then
Return "R"
@@ -592,8 +592,16 @@ Public Class ClassDOC_SEARCH
Case 263
Return "RWA"
Case WM_RWA
LOGGER.Debug($"odwAccessRight is equal WM_RWA [{WM_RWA}]")
Return "RWA"
Case WM_RWA1
LOGGER.Debug($"odwAccessRight is equal WM_RWA1 [{WM_RWA1}]")
Return "RWA"
Case WM_RWA2
LOGGER.Debug($"odwAccessRight is equal WM_RWA2 [{WM_RWA2}]")
Return "RWA"
Case Else
Return "R"
End Select

14
app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
View File

@@ -147,7 +147,7 @@ Public Class ClassImport_Windream
If oDYNAMIC_FOLDER <> String.Empty Then
If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
'myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
myLogger.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER)
If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
@@ -159,12 +159,11 @@ Public Class ClassImport_Windream
oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
End If
'End If
Else
MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
Return False
End If
Else
MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
Return False
End If
End If
@@ -183,9 +182,8 @@ Public Class ClassImport_Windream
Try
oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0)
If WMMOD.TestFolderExists(oWMTARGET_FOLDER) = False Then
oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("W:", "\\windream\objects")
oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0)
myLogger.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)))
If WMMOD.NewFolder(oWMTARGET_FOLDER) = False Then

2
app/DD-Record-Organizer/My Project/AssemblyInfo.vb
View File

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.3.0.2")>
<Assembly: AssemblyVersion("3.4.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")>

17
app/DD-Record-Organizer/My Project/licenses.licx
View File

@@ -1,11 +1,12 @@
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

64
app/DD-Record-Organizer/OrgFlow.vbproj
View File

@@ -208,70 +208,6 @@
<Reference Include="ERPConnect35">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\ERPConnect35.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Independentsoft.Msg">
<HintPath>..\..\3rdparty\lib\MSG.NET\Independentsoft.Msg.dll</HintPath>
</Reference>

7
app/DD-Record-Organizer/frmDocSearchResult.vb
View File

@@ -44,7 +44,12 @@ Public Class frmDocSearchResult
_Helper = New ClassHelper
Text = CURRENT_DOCSEARCH_CAPTION
DocumentViewer1.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY)
DocumentViewer1.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True,
.ShowRotateButton = True,
.ShowFlipButton = True,
.ShowSettingButton = True
})
End Sub
Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing

21
app/DD-Record-Organizer/frmFileRename.vb
View File

@@ -2,9 +2,11 @@
Public Class frmFileRename
Private ReadOnly oRenameType As String
Private OldDisplayName As String
Private DisplayName As String
Private FullFilename As String
Private DocID As Int64
Public Sub New(DocID As Integer, oldName As String, pRenameType As String)
Public Sub New(pDocID As Integer, oldName As String, pRenameType As String, pFullFilename As String)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
@@ -14,6 +16,8 @@ Public Class frmFileRename
lblOldFilename.Text = oldName
txtNewName.Text = oldName
oRenameType = pRenameType
FullFilename = pFullFilename
DocID = pDocID
End Sub
Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
@@ -50,26 +54,27 @@ Public Class frmFileRename
End Try
Else
Dim OldName, NewName, OnlyFilename As String
OldName = ClassDocGrid.SELECTED_DOC_PATH
OldName = FullFilename
' Define file names.
NewName = txtNewName.Text
OnlyFilename = NewName
Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassDocGrid.SELECTED_DOC_PATH)
Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(FullFilename)
Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName)
NewName &= Path.GetExtension(oFullFilename)
OnlyFilename &= Path.GetExtension(oFullFilename)
' Rename file.
LOGGER.Info($"Renaming Old: [{OldName}]")
LOGGER.Info($"Renaming Old: [{oFullFilename}]")
LOGGER.Info($"Renaming New: [{NewName}]")
My.Computer.FileSystem.RenameFile(OldName, NewName)
My.Computer.FileSystem.RenameFile(oFullFilename, NewName)
LOGGER.Info($"Renaming FileSystem done!")
Cursor = Cursors.WaitCursor
Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''"
Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {DocID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''"
If MYDB_ECM.ExecuteNonQuery(oEXEC) Then
Me.Close()
Else
MsgBox("Not succesfull - Check log", MsgBoxStyle.Critical)
End If
End If
End If
End Sub

1
app/DD-Record-Organizer/frmMain.vb
View File

@@ -241,6 +241,7 @@ Public Class frmMain
End Sub
Sub Load_TasksforUser()
Try
VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
Me.VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
CURRENT_TASKS_GENERAL = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE

130
app/DD-Record-Organizer/frmNodeNavigation.Designer.vb generated
View File

@@ -91,6 +91,15 @@ Partial Class frmNodeNavigation
Me.CMSAdmin_Treeview = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.KnotenLöschenadminToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.KnotenVerschiebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components)
Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
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()
CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -117,13 +126,15 @@ Partial Class frmNodeNavigation
Me.SplitContainerDocView.Panel2.SuspendLayout()
Me.SplitContainerDocView.SuspendLayout()
Me.CMSAdmin_Treeview.SuspendLayout()
CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'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, 0)
Me.ribbonNodeNavigation.Location = New System.Drawing.Point(0, 41)
Me.ribbonNodeNavigation.MaxItemId = 25
Me.ribbonNodeNavigation.Name = "ribbonNodeNavigation"
Me.ribbonNodeNavigation.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
@@ -133,7 +144,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, 158)
Me.ribbonNodeNavigation.Size = New System.Drawing.Size(1443, 146)
Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1
Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False
'
@@ -319,7 +330,7 @@ Partial Class frmNodeNavigation
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, 788)
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 769)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1443, 22)
@@ -344,7 +355,7 @@ Partial Class frmNodeNavigation
'
Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch)
Me.SplitContainerTreeList.Panel2.Text = "Panel2"
Me.SplitContainerTreeList.Size = New System.Drawing.Size(1433, 630)
Me.SplitContainerTreeList.Size = New System.Drawing.Size(969, 582)
Me.SplitContainerTreeList.SplitterPosition = 289
Me.SplitContainerTreeList.TabIndex = 2
'
@@ -386,7 +397,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, 630)
Me.TreeListDevexpress.Size = New System.Drawing.Size(289, 582)
Me.TreeListDevexpress.StateImageList = Me.ImageCollection1
Me.TreeListDevexpress.TabIndex = 1
'
@@ -410,7 +421,7 @@ Partial Class frmNodeNavigation
'
Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch)
Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2"
Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(1134, 630)
Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(670, 582)
Me.SplitContainerDocumentSearch.SplitterPosition = 246
Me.SplitContainerDocumentSearch.TabIndex = 1
'
@@ -421,7 +432,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(1134, 246)
Me.pnlControls.Size = New System.Drawing.Size(670, 246)
Me.pnlControls.TabIndex = 0
'
'GridControlDocSearch
@@ -435,7 +446,7 @@ Partial Class frmNodeNavigation
Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
Me.GridControlDocSearch.Name = "GridControlDocSearch"
Me.GridControlDocSearch.Size = New System.Drawing.Size(1134, 374)
Me.GridControlDocSearch.Size = New System.Drawing.Size(670, 326)
Me.GridControlDocSearch.TabIndex = 8
Me.GridControlDocSearch.TabStop = False
Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@@ -443,7 +454,7 @@ Partial Class frmNodeNavigation
'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.tsmiFileVersion, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete})
Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLink_ShowAll, Me.tsmiFileLinkRemove, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete})
Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles"
Me.cmsResultFileDetail.Size = New System.Drawing.Size(248, 394)
'
@@ -526,13 +537,13 @@ Partial Class frmNodeNavigation
'tsmiFileRenameFilename
'
Me.tsmiFileRenameFilename.Name = "tsmiFileRenameFilename"
Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(142, 22)
Me.tsmiFileRenameFilename.Size = New System.Drawing.Size(180, 22)
Me.tsmiFileRenameFilename.Text = "Dateiname"
'
'tsmiFileRenameDisplayname
'
Me.tsmiFileRenameDisplayname.Name = "tsmiFileRenameDisplayname"
Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(142, 22)
Me.tsmiFileRenameDisplayname.Size = New System.Drawing.Size(180, 22)
Me.tsmiFileRenameDisplayname.Text = "Displayname"
'
'tsmiFileVersion
@@ -629,10 +640,9 @@ Partial Class frmNodeNavigation
'
'SplitContainerDocView
'
Me.SplitContainerDocView.Collapsed = True
Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158)
Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 187)
Me.SplitContainerDocView.Name = "SplitContainerDocView"
'
'SplitContainerDocView.Panel1
@@ -644,7 +654,7 @@ Partial Class frmNodeNavigation
'
Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer)
Me.SplitContainerDocView.Panel2.Text = "Panel2"
Me.SplitContainerDocView.Size = New System.Drawing.Size(1443, 630)
Me.SplitContainerDocView.Size = New System.Drawing.Size(1443, 582)
Me.SplitContainerDocView.SplitterPosition = 969
Me.SplitContainerDocView.TabIndex = 0
'
@@ -654,7 +664,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(0, 0)
Me.DocumentViewer.Size = New System.Drawing.Size(464, 582)
Me.DocumentViewer.TabIndex = 0
'
'XtraSaveFileDialog1
@@ -687,6 +697,81 @@ Partial Class frmNodeNavigation
Me.KnotenVerschiebenToolStripMenuItem.Size = New System.Drawing.Size(201, 22)
Me.KnotenVerschiebenToolStripMenuItem.Text = "Knoten verschieben"
'
'PopupMenu1
'
Me.PopupMenu1.Name = "PopupMenu1"
Me.PopupMenu1.Ribbon = Me.ribbonNodeNavigation
'
'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.MainMenu = Me.Bar2
Me.BarManager1.StatusBar = Me.Bar3
'
'barDockControlTop
'
Me.barDockControlTop.CausesValidation = False
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)
'
'barDockControlBottom
'
Me.barDockControlBottom.CausesValidation = False
Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
Me.barDockControlBottom.Location = New System.Drawing.Point(0, 791)
Me.barDockControlBottom.Manager = Me.BarManager1
Me.barDockControlBottom.Size = New System.Drawing.Size(1443, 19)
'
'barDockControlLeft
'
Me.barDockControlLeft.CausesValidation = False
Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left
Me.barDockControlLeft.Location = New System.Drawing.Point(0, 41)
Me.barDockControlLeft.Manager = Me.BarManager1
Me.barDockControlLeft.Size = New System.Drawing.Size(0, 750)
'
'barDockControlRight
'
Me.barDockControlRight.CausesValidation = False
Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
Me.barDockControlRight.Location = New System.Drawing.Point(1443, 41)
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"
'
'frmNodeNavigation
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -695,6 +780,10 @@ Partial Class frmNodeNavigation
Me.Controls.Add(Me.SplitContainerDocView)
Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.ribbonNodeNavigation)
Me.Controls.Add(Me.barDockControlLeft)
Me.Controls.Add(Me.barDockControlRight)
Me.Controls.Add(Me.barDockControlBottom)
Me.Controls.Add(Me.barDockControlTop)
Me.IconOptions.SvgImage = CType(resources.GetObject("frmNodeNavigation.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.Name = "frmNodeNavigation"
Me.Ribbon = Me.ribbonNodeNavigation
@@ -726,6 +815,8 @@ Partial Class frmNodeNavigation
CType(Me.SplitContainerDocView, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerDocView.ResumeLayout(False)
Me.CMSAdmin_Treeview.ResumeLayout(False)
CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -797,4 +888,13 @@ Partial Class frmNodeNavigation
Friend WithEvents CMSAdmin_Treeview As ContextMenuStrip
Friend WithEvents KnotenLöschenadminToolStripMenuItem As ToolStripMenuItem
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
Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl
End Class

6
app/DD-Record-Organizer/frmNodeNavigation.resx
View File

@@ -743,6 +743,12 @@
<metadata name="CMSAdmin_Treeview.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>158, 54</value>
</metadata>
<metadata name="PopupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>323, 54</value>
</metadata>
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 54</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>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40

81
app/DD-Record-Organizer/frmNodeNavigation.vb
View File

@@ -75,6 +75,7 @@ Public Class frmNodeNavigation
Private Property ChildNodeGuid As Integer = 0
Private Property ClassNodeCommands As ClassNodeCommands
Private Property ViewerInit As Boolean = False
Private Debug As Boolean = False
@@ -130,8 +131,12 @@ Public Class frmNodeNavigation
If CONFIG.Config.DocumentSearchSplitterWidth > 0 Then
SplitContainerDocumentSearch.SplitterPosition = CONFIG.Config.DocumentSearchSplitterWidth
End If
If ViewerInit Then
SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
Else
SplitContainerDocView.Collapsed = True
End If
SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
checkShowPreview.Checked = CONFIG.Config.DocumentViewerShown
Catch ex As Exception
@@ -152,8 +157,18 @@ Public Class frmNodeNavigation
CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID))
Try
DocumentViewer.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY)
If DocumentViewer.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True,
.ShowRotateButton = True,
.ShowFlipButton = True,
.ShowSettingButton = True
}) = False Then
MsgBox("Viewer konnte nicht initialisiert werden. Bitte informieren Sie den Systembetreuer und prüfen Ihr Log.", MsgBoxStyle.Information)
SplitContainerDocView.Collapsed = True
DocumentViewer.Visible = False
Else
ViewerInit = True
End If
Catch ex As Exception
LOGGER.Warn($"Error while init DocumentViewer: {ex.Message}")
End Try
@@ -903,15 +918,19 @@ Public Class frmNodeNavigation
Dim oDocumentsFound = Await RUN_WDSEARCH_GRID(True)
If oDocumentsFound = 0 Then
Close_Document_Viewer()
RibbonPageGroupDocResult.Enabled = False
SplitContainerDocView.Collapsed = True
Else
RibbonPageGroupDocResult.Enabled = True
SplitContainerDocView.Collapsed = False
If ViewerInit Then
If oDocumentsFound = 0 Then
Close_Document_Viewer()
RibbonPageGroupDocResult.Enabled = False
SplitContainerDocView.Collapsed = True
Else
RibbonPageGroupDocResult.Enabled = True
SplitContainerDocView.Collapsed = False
End If
End If
Update_Document_Label(oDocumentsFound)
sw.Done()
@@ -2489,6 +2508,9 @@ Public Class frmNodeNavigation
Dim allow_Open As Boolean = False
Dim oDocuments = Current_DocList.SelectedDocuments
If oDocuments.Count = 0 Then
Exit Sub
End If
Dim Result = ClassDOC_SEARCH.Get_File_Rights(oDocuments.First.DocId)
@@ -2642,15 +2664,18 @@ Public Class frmNodeNavigation
Dim oDocuments = Current_DocList.SelectedDocuments
If oDocuments.Count = 1 Then
ClassFileResult.DocID = oDocuments.First.DocId
ClassFileResult.DocumentPath = oDocuments.First.DocPath
ClassFileResult.OldDisplayName = oDocuments.First.DisplayName
If oDocuments.First.DisplayName <> "" Then
If oDocuments.First.DisplayName <> "" And ClassFileResult.DocID > 0 Then
Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
Dim frm As New frmFileRename(ClassFileResult.DocID, oDocuments.First.DisplayName, "Displayname")
Dim frm As New frmFileRename(ClassFileResult.DocID, oDocuments.First.DisplayName, "Displayname", ClassFileResult.DocumentPath)
frm.ShowDialog()
Await RUN_WDSEARCH_GRID(True)
If Not IsNothing(oRowHandle) Then
GridViewDoc_Search.FocusedRowHandle = oRowHandle
End If
Else
MsgBox("Bitte eine Datei auswählen!", MsgBoxStyle.Information)
End If
End If
@@ -2684,11 +2709,11 @@ Public Class frmNodeNavigation
If RENAME_DOC_PATH <> "" Then
If RENAME_DOC_PATH <> "" And ClassFileResult.DocID > 0 Then
Dim FileToRename As String
FileToRename = Path.GetFileNameWithoutExtension(RENAME_DOC_PATH)
Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
Dim frm As New frmFileRename(ClassFileResult.DocID, FileToRename, "Filename")
Dim frm As New frmFileRename(ClassFileResult.DocID, FileToRename, "Filename", RENAME_DOC_PATH)
frm.ShowDialog()
Await RUN_WDSEARCH_GRID(True)
If Not IsNothing(oRowHandle) Then
@@ -3088,8 +3113,12 @@ Public Class frmNodeNavigation
If FORM_LOADED = False Then
Exit Sub
End If
If ViewerInit Then
SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
Else
SplitContainerDocView.Collapsed = True
End If
SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
End Sub
Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged
@@ -3097,19 +3126,21 @@ Public Class frmNodeNavigation
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()
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)
Else
Close_Document_Viewer()
DocumentViewer.LoadFile(oPath)
Else
Close_Document_Viewer()
End If
End If
End Sub
Private Sub Close_Document_Viewer()
Try

1
app/DD-Record-Organizer/packages.config
View File

@@ -3,7 +3,6 @@
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />