diff --git a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb index bccd156..efbfa2a 100644 --- a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -12,6 +12,8 @@ Public Class ClassDocGrid Public Class clsWMDoc Public Property DocId As Integer + + Public Property ParentID As Integer Public Property DocPath As String Public Property Filename As String Public Property DisplayName As String @@ -107,6 +109,8 @@ Public Class ClassDocGrid For Each oRowHandle In oSelectedRows Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID") + Dim oSQL = $"Select dwParentID FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}" + Dim odwParentID = MYDB_ECM.GetScalarValue(oSQL) Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname") Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH") Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") @@ -115,6 +119,7 @@ Public Class ClassDocGrid Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "in work User") oDocuments.Add(New clsWMDoc With { .DocId = oDocId, + .ParentID = odwParentID, .DocPath = oDocPath, .DocType = oObjecttype, .DisplayName = oDisplayName, @@ -145,7 +150,13 @@ Public Class ClassDocGrid SELECTED_DOC_ID = DOC_ID newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID") Else - Continue For + If Not IsNothing(DOC_ID) Then + SELECTED_DOC_ID = DOC_ID + Else + Continue For + End If + + End If Catch ex As Exception diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb index 834eca0..4680fcf 100644 --- a/app/DD-Record-Organizer/Classes/ClassHelper.vb +++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb @@ -5,6 +5,8 @@ Imports System.ComponentModel Public Class ClassHelper Private Shared BW_DocPath As String Private Shared BW_DocID As Integer + Private Shared BW_ParentID As Integer + Private Shared BW_Filename As String Public Shared Function FORMAT_WM_PATH(WMpath As String) Try If Not IsNothing(WMpath) Then @@ -174,9 +176,15 @@ Public Class ClassHelper Return System.Text.RegularExpressions.Regex.Replace( sFilename, "[?*^""<>|]", REPLACEChar) End Function - Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String) + Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String, pParentID As Integer) Try + Dim oFileName = Path.GetFileName(RESULT_DOC_PATH) + BW_Filename = oFileName RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH) + If pParentID = 0 Then + Dim sql = String.Format("SELECT dwParentID FROM TBPMO_DOCRESULT_LIST WHERE DocID = {0}", DocID) + pParentID = MYDB_ECM.GetScalarValue(sql) + End If If SHARE_DRIVE_ACTIVE Then If RESULT_DOC_PATH.ToString.StartsWith(constWMOBJECTS) Then RESULT_DOC_PATH = RESULT_DOC_PATH.ToString.Replace(constWMOBJECTS, WMPATH_PREFIX) @@ -184,7 +192,7 @@ Public Class ClassHelper End If - CURRENT_OFFICE_FILE_CHANGED = False + CURRENT_OFFICE_FILE_CHANGED = False If RESULT_DOC_PATH <> Nothing Then 'Dim EXT = Path.GetExtension(RESULT_DOC_PATH) 'EXT = EXT.Replace(".", "") @@ -196,7 +204,7 @@ Public Class ClassHelper ' OPEN_DOCVIEW(RESULT_DOC_PATH, DocID) ' End Select ' Else - File_SYSOPEN(RESULT_DOC_PATH, DocID) + File_SYSOPEN(RESULT_DOC_PATH, DocID, pParentID) 'End If Return True Else @@ -237,20 +245,22 @@ Public Class ClassHelper Catch ex As Exception MsgBox("Unexpected Error in DocView Open:" & vbNewLine & ex.Message & vbNewLine & Doc_Path & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical) LOGGER.Warn("Error in DocView Open: " & ex.Message & vbNewLine & " - Path: " & Doc_Path & " - DocID: " & DocID) - File_SYSOPEN(Doc_Path, DocID) + File_SYSOPEN(Doc_Path, DocID, 0) End Try End Sub - Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String) + Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String, pParentID As Integer) Try If RESULT_DOC_PATH <> Nothing Then BW_DocPath = RESULT_DOC_PATH BW_DocID = DocID + BW_ParentID = pParentID Dim BWFileHandler As New BackgroundWorker AddHandler BWFileHandler.DoWork, AddressOf BWFileHandler_DoWork BWFileHandler.RunWorkerAsync() - + Else + LOGGER.Warn("File_SYSOPEN RESULT_DOC_PATH is nothing") End If Catch ex As Exception MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical) @@ -275,15 +285,21 @@ Public Class ClassHelper oExtension = Path.GetExtension(BW_DocPath).ToLower LOGGER.Debug($"Checking oExtension [{oExtension}]...") If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then - oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}" - Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql) - If Not IsNothing(odwVersionId) Then - 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) - End If - End If + oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} and [Filename] = '{BW_Filename}'" + Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql) + + If Not IsNothing(oDTNEWDoc) Then + If oDTNEWDoc.Rows.Count = 1 Then + + Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID, DOC_PATH) VALUES ( + {USER_GUID},'{ProcID.ToString}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")}, '{BW_DocPath}')" + MYDB_ECM.ExecuteNonQuery(oInsert) + End If + + + End If + End If - 'oMyProcess.WaitForExit() Catch ex As Exception LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID) MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation) diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 631f8b5..5dbde05 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -20,7 +20,7 @@ Public Class ClassImport_Windream End If 'Die Datei nach windream importieren - Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE) + 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) CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql) diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index d735511..a269ebe 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -199,6 +199,8 @@ Public Class ClassInit ElseIf oRow.Item("TITLE") = "OF_NODE_SEARCH" Then SQL_OF_NODE_SEARCH = oRow.Item("SQL_COMMAND") + ElseIf oRow.Item("TITLE") = "LIC_COUNT_NAMED" Then + SQL_LIC_NAMED_USER = oRow.Item("SQL_COMMAND") End If @@ -470,22 +472,30 @@ Public Class ClassInit MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical) End Try - oFNSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'Record-Organizer' AND CLIENT_ID = {0}", CLIENT_SELECTED) + + If SQL_LIC_NAMED_USER <> "" Then + SQL_LIC_NAMED_USER = SQL_LIC_NAMED_USER.Replace("@MODULE", "Record-Organizer") + SQL_LIC_NAMED_USER = SQL_LIC_NAMED_USER.Replace("@CLIENT", CLIENT_SELECTED.ToString) + oFNSQL = SQL_LIC_NAMED_USER + Else + oFNSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'Record-Organizer' AND CLIENT_ID = {0}", CLIENT_SELECTED) + End If + Dim anzahl = MYDB_ECM.GetScalarValue(oFNSQL) - USERS_LOGGED_IN = CInt(anzahl) - LOGGER.Info("User# logged in: " & anzahl.ToString) + LICENSES_USED = CInt(anzahl) + LOGGER.Info("NamedUser in TimeSpan#: " & anzahl.ToString) LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString) '#### - If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) And LICENSE_EXPIRED = False Then - Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") + If LICENSE_COUNT <= (LICENSES_USED) And LICENSE_EXPIRED = False Then + Dim msg = String.Format("Die Anzahl der aktuell verbrauchten Lizenzen (" & LICENSES_USED.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") If USER_LANGUAGE <> "de-DE" Then - msg = String.Format("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine & + msg = String.Format("The number of USED licenses (" & LICENSES_USED.ToString & ") exceeds the number of licenses." & vbNewLine & "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!") End If MsgBox(msg, MsgBoxStyle.Exclamation) - LOGGER.Warn("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ") + LOGGER.Warn("The number of USED licenses (" & LICENSES_USED.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ") If USER_IS_ADMIN = False Then 'Anmeldung wieder herausnehmen oFNSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'" @@ -493,6 +503,11 @@ Public Class ClassInit LOGGER.Warn(" - logged out the user") Return False End If + ElseIf LICENSE_EXPIRED = True Then + MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & LICENSE_DATE & vbNewLine & "Please contact your admin!", MsgBoxStyle.Exclamation) + oFNSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'" + MYDB_ECM.ExecuteNonQuery(oFNSQL) + Return False Else Try 'Die FolderWatch starten diff --git a/app/DD-Record-Organizer/Classes/ClassLicence.vb b/app/DD-Record-Organizer/Classes/ClassLicence.vb index 87eaa40..e095f6c 100644 --- a/app/DD-Record-Organizer/Classes/ClassLicence.vb +++ b/app/DD-Record-Organizer/Classes/ClassLicence.vb @@ -103,7 +103,7 @@ Public Class ClassLicence End Try End Sub - Public Shared Function license_is_Valid() + Public Shared Function license_is_Expired() If LICENSE_EXPIRED Then MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & LICENSE_DATE & vbNewLine & "Please contact Digital Data!", MsgBoxStyle.Exclamation) Return False diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 6d89f75..5fe07f2 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -55,7 +55,7 @@ Module ModuleMySettings Public USER_IS_ADMIN = False Public USER_IS_SUPERVISOR = False - Public USERS_LOGGED_IN = 0 + Public LICENSES_USED = 0 Public USER_USERNAME As String Public USER_PERSONIFIED_TEST As Boolean = False diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 80c3568..70bd0c1 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -201,6 +201,8 @@ Module ModuleRuntimeVariables Public SQL_DOC_RESULT_RECORD As String = "" Public SQL_GLOBAL_SEARCH As String = "" Public SQL_OF_NODE_SEARCH As String = "" + Public SQL_LIC_NAMED_USER As String = "" + Public SQL_LIC_NAMED_USER_WITH_PATTERN As String = "" Public CONF_SUPPORTPORTAL As String = "https://www.digitaldata.works/Support'" Public Property FILESYSTEM As FilesystemEx diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 2e9431f..e64c2a3 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/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index db56bdd..78766e9 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -6774,7 +6774,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Exit Sub End If For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows - If ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) = True Then + If ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"), 0) = True Then TimerFileHandle.Enabled = True End If diff --git a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb index 271babb..2ed653c 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmDocSearchResult _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult)) Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -46,12 +46,13 @@ Partial Class frmDocSearchResult Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.DateienVerknüpfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStripResultFiles.SuspendLayout() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() @@ -68,8 +69,8 @@ Partial Class frmDocSearchResult ' Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles 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" @@ -81,9 +82,9 @@ Partial Class frmDocSearchResult 'ContextMenuStripResultFiles ' Me.ContextMenuStripResultFiles.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator20, Me.docCM_Showlinks, Me.ToolStripSeparator22, Me.docCM_PropertiesFile, Me.ToolStripSeparator25}) + Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator20, Me.docCM_Showlinks, Me.DateienVerknüpfenToolStripMenuItem, Me.ToolStripSeparator22, Me.docCM_PropertiesFile, Me.ToolStripSeparator25}) Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles" - Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(256, 152) + Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(256, 200) ' 'docCM_Open ' @@ -232,6 +233,12 @@ Partial Class frmDocSearchResult Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Funktionen" ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.bchlitmPreview) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Datei" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID) @@ -281,11 +288,12 @@ Partial Class frmDocSearchResult Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" Me.XtraSaveFileDialog1.Filter = """xlsx-Dateien|*.xlsx""" ' - 'RibbonPageGroup2 + 'DateienVerknüpfenToolStripMenuItem ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.bchlitmPreview) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Datei" + Me.DateienVerknüpfenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link + Me.DateienVerknüpfenToolStripMenuItem.Name = "DateienVerknüpfenToolStripMenuItem" + Me.DateienVerknüpfenToolStripMenuItem.Size = New System.Drawing.Size(255, 26) + Me.DateienVerknüpfenToolStripMenuItem.Text = "Datei mit Datensatz verknüpfen" ' 'frmDocSearchResult ' @@ -343,4 +351,5 @@ Partial Class frmDocSearchResult Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents DateienVerknüpfenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD-Record-Organizer/frmDocSearchResult.vb b/app/DD-Record-Organizer/frmDocSearchResult.vb index e507778..5d49bb8 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.vb @@ -147,7 +147,7 @@ Public Class frmDocSearchResult MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation) Exit Sub End If - ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID) + ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID, 0) If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True) Else @@ -328,4 +328,23 @@ Public Class frmDocSearchResult LoadFile2Viewer() End If End Sub + + Private Sub DateienVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateienVerknüpfenToolStripMenuItem.Click + Try + ClassDocGrid.GetDocItems(GridViewDoc_Search) + + Dim oDocuments = ClassDocGrid.SELECTED_DOCUMENTS + + If oDocuments.Count = 0 Or ClassDocGrid.HasNoSelectedDocuments(GridViewDoc_Search) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + + Dim oForm As New frmDocRecordLink With {.myDocuments = oDocuments} + oForm.Show() + + Catch ex As Exception + MsgBox("Unexpected Error in Showing DocRecordLink-Form: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb index 228a4cf..2b3f5f5 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.Designer.vb @@ -36,6 +36,7 @@ Partial Class frmGlobalSearch Me.tslblDocView = New System.Windows.Forms.ToolStripLabel() Me.Label1 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.lblFT_Irregular = New System.Windows.Forms.Label() Me.txtSearch = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() @@ -61,7 +62,6 @@ Partial Class frmGlobalSearch Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DD_ECMAdmin1 = New DD_Record_Organizer.DD_ECMAdmin() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) - Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.Panel1.SuspendLayout() @@ -195,6 +195,13 @@ Partial Class frmGlobalSearch resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Name = "LabelControl1" + ' 'lblFT_Irregular ' resources.ApplyResources(Me.lblFT_Irregular, "lblFT_Irregular") @@ -306,18 +313,21 @@ Partial Class frmGlobalSearch ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.AllowTextClipping = False Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' 'RibbonPageGroupRecords ' + Me.RibbonPageGroupRecords.AllowTextClipping = False Me.RibbonPageGroupRecords.ItemLinks.Add(Me.BarButtonItem9) Me.RibbonPageGroupRecords.Name = "RibbonPageGroupRecords" resources.ApplyResources(Me.RibbonPageGroupRecords, "RibbonPageGroupRecords") ' 'RibbonPageGroupFiles ' + Me.RibbonPageGroupFiles.AllowTextClipping = False Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem6) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem7) Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem8) @@ -334,6 +344,7 @@ Partial Class frmGlobalSearch ' 'RibbonPageGroup3 ' + Me.RibbonPageGroup3.AllowTextClipping = False Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleSearchCombined) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleSearchRecord) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleFulltext) @@ -362,13 +373,6 @@ Partial Class frmGlobalSearch Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' - 'LabelControl1 - ' - Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) - Me.LabelControl1.Appearance.Options.UseFont = True - resources.ApplyResources(Me.LabelControl1, "LabelControl1") - Me.LabelControl1.Name = "LabelControl1" - ' 'frmGlobalSearch ' resources.ApplyResources(Me, "$this") diff --git a/app/DD-Record-Organizer/frmGlobalSearch.resx b/app/DD-Record-Organizer/frmGlobalSearch.resx index 937badf..51577d2 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.resx +++ b/app/DD-Record-Organizer/frmGlobalSearch.resx @@ -156,12 +156,6 @@ 17, 17 - - 0, 22 - - - 6, 25 - 0, 0 @@ -234,12 +228,6 @@ Tahoma, 9pt - - Segoe UI, 8.25pt, style=Bold, Italic - - - 0, 22 - 0, 0 @@ -300,6 +288,18 @@ 0 + + 0, 22 + + + 6, 25 + + + Segoe UI, 8.25pt, style=Bold, Italic + + + 0, 22 + True @@ -695,21 +695,6 @@ 0, 0 - - Aktionen - - - Datensatz - - - Dateien - - - Funktionen Tabelle - - - Suchvariante - Global Search @@ -746,6 +731,21 @@ 3 + + Aktionen + + + Datensatz + + + Dateien + + + Funktionen Tabelle + + + Suchvariante + RibbonPage2 diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 79699a6..e0dc776 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -428,7 +428,7 @@ Public Class frmGlobalSearch Exit Sub End If - ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID) + ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID, 0) Next Me.Cursor = Cursors.Default diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 7bfd77d..9a4f970 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -211,19 +211,24 @@ Public Class frmMain End Sub Sub LoggedIn() Try - Dim oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED) + Dim oSQL As String = "" + If SQL_LIC_NAMED_USER <> "" Then + oSQL = SQL_LIC_NAMED_USER + Else + oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED) + End If Dim anzahl = MYDB_ECM.GetScalarValue(oSQL) - USERS_LOGGED_IN = CInt(anzahl) + LICENSES_USED = CInt(anzahl) Catch ex As Exception End Try - Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() + Dim msg = "Anzahl verbrauchte Lizenzen: " & LICENSES_USED.ToString() If USER_LANGUAGE <> "de-DE" Then - msg = "#User logged in: " & USERS_LOGGED_IN.ToString() + msg = "#User logged in: " & LICENSES_USED.ToString() End If LabelLoggedIn.Caption = msg - LOGGER.Info(msg + "(+1)") + LOGGER.Debug(msg) End Sub Sub Display_ConString() Try @@ -413,7 +418,7 @@ Public Class frmMain End If Dim sql = "SELECT COUNT(GUID) FROM TBPMO_USER_GLOBAL_SEARCH WHERE USER_ID = " & USER_GUID - Dim Count = MYDB_ECM.GetScalarValue(SQL) + Dim Count = MYDB_ECM.GetScalarValue(sql) If Count = 0 Then btnGlobalSearch.Enabled = False groupSearchAllOver.Visible = False @@ -576,7 +581,7 @@ Public Class frmMain End If 'Lizenz abgellaufen, überprüfen ob User Admin ist - If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then + If LICENSE_COUNT <= (LICENSES_USED + 1) Then If USER_IS_ADMIN = True Then LOGGER.Info("User is Admin - Timer will be started") 'If USER_LANGUAGE = "de-DE" Then @@ -793,7 +798,7 @@ Public Class frmMain End Sub Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick - If LICENSE_EXPIRED = True Or LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then + If LICENSE_EXPIRED = True Or LICENSE_COUNT <= (LICENSES_USED + 1) Then 'If USER_LANGUAGE = "de-DE" Then ' MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information) 'Else diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 9133d3b..88bfb53 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -64,6 +64,8 @@ Partial Class frmNodeNavigation Me.tsmiFileOpen = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileFolderOpen = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.tsmiFileInWorkMultiple_Lock = New System.Windows.Forms.ToolStripMenuItem() + Me.tsmiFileInWorkMultiple_Free = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFileInWork = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiFileLink_Add = New System.Windows.Forms.ToolStripMenuItem() @@ -121,8 +123,7 @@ Partial Class frmNodeNavigation Me.PopupMenu3 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.PopupMenu4 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.PopupMenu5 = New DevExpress.XtraBars.PopupMenu(Me.components) - Me.tsmiFileInWorkMultiple_Free = New System.Windows.Forms.ToolStripMenuItem() - Me.tsmiFileInWorkMultiple_Lock = New System.Windows.Forms.ToolStripMenuItem() + Me.DD_DMSDataSet1 = New DD_Record_Organizer.DD_DMSDataSet() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -155,6 +156,7 @@ Partial Class frmNodeNavigation CType(Me.PopupMenu3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PopupMenu4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PopupMenu5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSDataSet1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ribbonNodeNavigation @@ -493,7 +495,7 @@ Partial Class frmNodeNavigation 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.tsmiFileInWorkMultiple_Lock, Me.tsmiFileInWorkMultiple_Free, 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(315, 416) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 394) ' 'tsmiFileProperties ' @@ -526,6 +528,20 @@ Partial Class frmNodeNavigation Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(311, 6) ' + 'tsmiFileInWorkMultiple_Lock + ' + Me.tsmiFileInWorkMultiple_Lock.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Lock.Image"), System.Drawing.Image) + Me.tsmiFileInWorkMultiple_Lock.Name = "tsmiFileInWorkMultiple_Lock" + Me.tsmiFileInWorkMultiple_Lock.Size = New System.Drawing.Size(314, 24) + Me.tsmiFileInWorkMultiple_Lock.Text = "Ausgewählte Dateien in Bearbeitung nehmen" + ' + 'tsmiFileInWorkMultiple_Free + ' + Me.tsmiFileInWorkMultiple_Free.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Free.Image"), System.Drawing.Image) + Me.tsmiFileInWorkMultiple_Free.Name = "tsmiFileInWorkMultiple_Free" + Me.tsmiFileInWorkMultiple_Free.Size = New System.Drawing.Size(314, 24) + Me.tsmiFileInWorkMultiple_Free.Text = "Ausgewählte Dateien wieder freigeben" + ' 'tsmiFileInWork ' Me.tsmiFileInWork.Image = CType(resources.GetObject("tsmiFileInWork.Image"), System.Drawing.Image) @@ -1011,19 +1027,10 @@ Partial Class frmNodeNavigation Me.PopupMenu5.Manager = Me.BarManager1 Me.PopupMenu5.Name = "PopupMenu5" ' - 'tsmiFileInWorkMultiple_Free + 'DD_DMSDataSet1 ' - Me.tsmiFileInWorkMultiple_Free.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Free.Image"), System.Drawing.Image) - Me.tsmiFileInWorkMultiple_Free.Name = "tsmiFileInWorkMultiple_Free" - Me.tsmiFileInWorkMultiple_Free.Size = New System.Drawing.Size(314, 24) - Me.tsmiFileInWorkMultiple_Free.Text = "Ausgewählte Dateien wieder freigeben" - ' - 'tsmiFileInWorkMultiple_Lock - ' - Me.tsmiFileInWorkMultiple_Lock.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Lock.Image"), System.Drawing.Image) - Me.tsmiFileInWorkMultiple_Lock.Name = "tsmiFileInWorkMultiple_Lock" - Me.tsmiFileInWorkMultiple_Lock.Size = New System.Drawing.Size(314, 24) - Me.tsmiFileInWorkMultiple_Lock.Text = "Ausgewählte Dateien in Bearbeitung nehmen" + Me.DD_DMSDataSet1.DataSetName = "DD_DMSDataSet" + Me.DD_DMSDataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' 'frmNodeNavigation ' @@ -1074,6 +1081,7 @@ Partial Class frmNodeNavigation CType(Me.PopupMenu3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PopupMenu4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PopupMenu5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSDataSet1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1177,4 +1185,5 @@ Partial Class frmNodeNavigation Friend WithEvents LinkPerMailVersendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents tsmiFileInWorkMultiple_Free As ToolStripMenuItem Friend WithEvents tsmiFileInWorkMultiple_Lock As ToolStripMenuItem + Friend WithEvents DD_DMSDataSet1 As DD_DMSDataSet End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index 9431a55..98d04a0 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -1115,4 +1115,7 @@ 143, 91 + + 616, 91 + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 857e0c6..ea0979d 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -964,7 +964,7 @@ Public Class frmNodeNavigation 'Refresh_Navpane() Update_Record_Label(SELECTED_NODE_RECORD_ID) - Dim oDocumentsFound = Await RUN_WDSEARCH_GRID(True) + Dim oDocumentsFound = Await RUN_DOCSEARCH(True) If ViewerInit Then If oDocumentsFound = 0 Then @@ -1674,7 +1674,7 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Customer_Run_Procedures: ", ex.Message) End Try End Sub - Private Async Function RUN_WDSEARCH_GRID(pShowSplashscreen As Boolean) As Task(Of Integer) + Private Async Function RUN_DOCSEARCH(pShowSplashscreen As Boolean) As Task(Of Integer) Dim oHandle As IOverlaySplashScreenHandle If pShowSplashscreen Then oHandle = SplashScreenManager.ShowOverlayForm(Me) @@ -2062,7 +2062,7 @@ Public Class frmNodeNavigation GridControlDocSearch.DataSource = Nothing GridViewDoc_Search.Columns.Clear() - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) Else MsgBox("Resetting the layout was not successful - File not existing!", MsgBoxStyle.Information) @@ -2178,7 +2178,7 @@ Public Class frmNodeNavigation 'Nur wenn neue Dateien abgelegt wurden muss die Prozedur zur aktualisierung der windream Dateien ausgeführt werden...ansonsten muss nichts passieren If NEW_FILES_ADDED = True Then Me.Cursor = Cursors.WaitCursor - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID) TimerClearResultfiles.Start() Else @@ -2613,7 +2613,7 @@ Public Class frmNodeNavigation ' End If 'Next For Each oDoc As ClassDocGrid.clsWMDoc In ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search) - If ClassHelper.File_open(oDoc.DocPath, oDoc.DocId) = True Then + If ClassHelper.File_open(oDoc.DocPath, oDoc.DocId, oDoc.ParentID) = True Then TimerFileHandle.Enabled = True End If Next @@ -2702,7 +2702,7 @@ Public Class frmNodeNavigation Dim msg1 As String If IW_USER.ToUpper = USER_USERNAME.ToUpper Or USER_IS_ADMIN Or USER_IS_SUPERVISOR Then If ClassFileResult.Set_InWork(0, "") = True Then - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End If Else msglbl = "In Bearbeitung durch User '" & IW_USER & "' - Kommentar:" @@ -2716,7 +2716,7 @@ Public Class frmNodeNavigation frmFileInWork.myDocuments = mySelectedDocs frmFileInWork.ShowDialog() ClassDocGrid.SELECTED_INWORK = ClassFileResult.InWork - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End If End If @@ -2746,7 +2746,7 @@ Public Class frmNodeNavigation Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle Dim frm As New frmFileRename(ClassFileResult.DocID, oDocuments.First.DisplayName, "Displayname", ClassFileResult.DocumentPath) frm.ShowDialog() - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) If Not IsNothing(oRowHandle) Then GridViewDoc_Search.FocusedRowHandle = oRowHandle End If @@ -2791,7 +2791,7 @@ Public Class frmNodeNavigation Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle Dim frm As New frmFileRename(ClassFileResult.DocID, FileToRename, "Filename", RENAME_DOC_PATH) frm.ShowDialog() - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) If Not IsNothing(oRowHandle) Then GridViewDoc_Search.FocusedRowHandle = oRowHandle End If @@ -2846,7 +2846,7 @@ Public Class frmNodeNavigation Catch ex As Exception NNLogger.Error(ex) NNLogger.Error(ex) - MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in Showing DocRecordLink-Form (NodeNavigation): " & ex.Message, MsgBoxStyle.Critical) End Try End Sub Sub Refresh_Selected_Table() @@ -2917,7 +2917,7 @@ Public Class frmNodeNavigation If ClassFileResult.Delete_ResultFile(oDoc.DocId, CURRENT_RECORD_ID, 0) = True Then ClassHelper.InsertEssential_Log(oDoc.DocId, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH") Cursor = Cursors.WaitCursor - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End If @@ -2937,7 +2937,7 @@ Public Class frmNodeNavigation ClassFileResult.DocID = oDocuments.First.DocId ClassFileResult.DocumentPath = oDocuments.First.DocPath frmWM_CreateVersion.ShowDialog() - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) Else MsgBox("Please choose only one document!", MsgBoxStyle.Exclamation) End If @@ -2994,7 +2994,7 @@ Public Class frmNodeNavigation End Sub Private Async Sub bbtnitmDocResultRefresh_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmDocResultRefresh.ItemClick - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick @@ -3307,7 +3307,7 @@ Public Class frmNodeNavigation End If Next - RUN_WDSEARCH_GRID(True) + RUN_DOCSEARCH(True) End If @@ -3397,7 +3397,7 @@ Public Class frmNodeNavigation If CURRENT_SEARCH_TYPE = "ENTITY" Then CURRENT_DT_DOC_ENTITY_SEARCH = Nothing End If - RUN_WDSEARCH_GRID(True) + RUN_DOCSEARCH(True) End If End Sub @@ -3407,19 +3407,21 @@ Public Class frmNodeNavigation Private Sub TimerFileHandle_Tick(sender As Object, e As EventArgs) Handles TimerFileHandle.Tick Try - Dim oSql = $"SELECT GUID FROM TBPMO_DOC_USER_REFRESH_VIEW WHERE USER_ID = {USER_GUID} AND REFRESHED_WHEN IS NULL" + Dim oSql = $"SELECT GUID FROM TBPMO_DOC_USER_REFRESH_VIEW WHERE USER_ID IN ({USER_GUID},0) AND REFRESHED_WHEN IS NULL" Dim oDTGUID As DataTable = MYDB_ECM.GetDatatable(oSql) - If oDTGUID.Rows.Count = 1 Then - Dim oupd = $"UPDATE TBPMO_DOC_USER_REFRESH_VIEW SET REFRESHED_WHEN = GETDATE() WHERE GUID = {oDTGUID.Rows(0).Item(0)}" - If MYDB_ECM.ExecuteNonQuery(oupd) = True Then - MsgBox("Attention: The docID of one document changed! The DocSearch will be refreshed!", MsgBoxStyle.Information) - RUN_WDSEARCH_GRID(True) - End If + If oDTGUID.Rows.Count >= 1 Then + Dim omsg = "Attention: The DocID of one document changed or a document has been versioned! The DocSearch has been refreshed!" + Update_Notification_Label(True, omsg, "Yellow") + For Each oROW As DataRow In oDTGUID.Rows + Dim oupd = $"UPDATE TBPMO_DOC_USER_REFRESH_VIEW Set REFRESHED_WHEN = GETDATE() WHERE GUID = {oROW.Item(0)}" + MYDB_ECM.ExecuteNonQuery(oupd) + Next + RUN_DOCSEARCH(True) End If Catch ex As Exception - NNLogger.Warn($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!") + NNLogger.Warn($"Unexpected Error In TimerFileHandleTick [{ex.Message}]!!") End Try End Sub Private Function GetActiveGridControl() As GridControl @@ -3446,13 +3448,13 @@ Public Class frmNodeNavigation oActiveGrid.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions) End If Else - MessageBox.Show("Please select a grid/table that you would like to export.", Text, MessageBoxButtons.OK) + MessageBox.Show("Please Select a grid/table that you would Like To export.", Text, MessageBoxButtons.OK) End If End Sub Private Async Sub KnotenLöschenadminToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KnotenLöschenadminToolStripMenuItem.Click If CURRENT_NODEID <> 0 Then - Dim result As DialogResult = MessageBox.Show("Wollen Sie fortfahren? Der Knoten wird in Folge mit den Unterknoten als gelöscht markiert!", "Bestätigung erforderlich", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + Dim result As DialogResult = MessageBox.Show("Wollen Sie fortfahren? Der Knoten wird In Folge mit den Unterknoten als gelöscht markiert!", "Bestätigung erforderlich", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = System.Windows.Forms.DialogResult.Yes Then Dim oSQL = $"EXEC [dbo].[PRPMO_DELETE_NODE] {CURRENT_NODEID}, '{USER_USERNAME}', 1, 0" If MYDB_ECM.ExecuteNonQuery(oSQL) = True Then @@ -3492,12 +3494,12 @@ Public Class frmNodeNavigation End If End If Next - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End Sub Private Async Sub tsmiFileInWorkMultiple_Lock_Click(sender As Object, e As EventArgs) Handles tsmiFileInWorkMultiple_Lock.Click frmFileInWork.myDocuments = mySelectedDocs frmFileInWork.ShowDialog() - Await RUN_WDSEARCH_GRID(True) + Await RUN_DOCSEARCH(True) End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index 4bad585..b814cc9 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -453,7 +453,7 @@ Public Class frmRecordView Exit Sub End If For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows - ClassHelper.File_open(row.Item("DOC_PATH"), 0) + ClassHelper.File_open(row.Item("DOC_PATH"), 0, 0) Next End Sub @@ -464,7 +464,7 @@ Public Class frmRecordView Exit Sub End If For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows - ClassHelper.File_open(row.Item("DOC_PATH"), 0) + ClassHelper.File_open(row.Item("DOC_PATH"), 0, 0) Next End Sub @@ -741,7 +741,7 @@ Public Class frmRecordView Exit Sub End If For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows - ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) + ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"), 0) Next End Sub diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index 6e464f7..5b3e46a 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -87,7 +87,7 @@ Public Class frmWM_IndexFile 'Stream File to windream '################################################################# sw = New SW("File Stream") - Dim streamresult = WMMOD.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME, OBJECT_TYPETextBox.Text) + Dim streamresult = WMMOD.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME, OBJECT_TYPETextBox.Text, True) sw.Done() '################################################################# If streamresult = True Then diff --git a/app/Setup_NoUpdaterVS19/Product.wxs b/app/Setup_NoUpdaterVS19/Product.wxs index c351543..4f3633a 100644 --- a/app/Setup_NoUpdaterVS19/Product.wxs +++ b/app/Setup_NoUpdaterVS19/Product.wxs @@ -188,7 +188,7 @@ - + @@ -200,8 +200,13 @@ - - + + + + + + +