diff --git a/app/DD-Record-Organizer/Classes/ClassWDRights.vb b/app/DD-Record-Organizer/Classes/ClassWDRights.vb index c1d3e72..1074468 100644 --- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb +++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb @@ -107,8 +107,9 @@ Public Class ClassWDRights oWMObject = oSession.GetWMObjectByPath(1, reldocpath) LOGGER.Debug("Object created.") Catch ex As Exception - Dim msg = "Error GetWMObjectByPath: (FDSR) " & reldocpath & vbNewLine & Err.Description + Dim msg = "Error GetWMObjectByPath: " & reldocpath & vbNewLine & Err.Description LOGGER.Warn(msg) + LOGGER.Error(ex) Return False End Try Dim lret diff --git a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb index 08c415b..d68524d 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.Designer.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.Designer.vb @@ -32,11 +32,11 @@ Partial Class frmDoc_Links Me.bbtnitmdeletelink = New DevExpress.XtraBars.BarButtonItem() Me.BarStaticItemStatus = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.bsiSource = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.bsiSource = New DevExpress.XtraBars.BarStaticItem() CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() @@ -121,6 +121,13 @@ Partial Class frmDoc_Links Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'bsiSource + ' + Me.bsiSource.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + resources.ApplyResources(Me.bsiSource, "bsiSource") + Me.bsiSource.Id = 4 + Me.bsiSource.Name = "bsiSource" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -147,13 +154,6 @@ Partial Class frmDoc_Links Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'bsiSource - ' - Me.bsiSource.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right - resources.ApplyResources(Me.bsiSource, "bsiSource") - Me.bsiSource.Id = 4 - Me.bsiSource.Name = "bsiSource" - ' 'frmDoc_Links ' resources.ApplyResources(Me, "$this") diff --git a/app/DD-Record-Organizer/frmDoc_Links.resx b/app/DD-Record-Organizer/frmDoc_Links.resx index dc76299..77e6033 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.resx +++ b/app/DD-Record-Organizer/frmDoc_Links.resx @@ -144,7 +144,7 @@ 0, 158 - 800, 270 + 1251, 426 @@ -226,13 +226,13 @@ Doc-Links - 800, 158 + 1251, 158 - 0, 428 + 0, 584 - 800, 22 + 1251, 22 RibbonStatusBar1 @@ -268,7 +268,7 @@ 6, 13 - 800, 450 + 1251, 606 @@ -443,6 +443,9 @@ AA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP + + CenterScreen + Doc-Links @@ -476,6 +479,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bsiSource + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -494,12 +503,6 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - bsiSource - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmDoc_Links diff --git a/app/DD-Record-Organizer/frmDoc_Links.vb b/app/DD-Record-Organizer/frmDoc_Links.vb index fcd0218..9b168a9 100644 --- a/app/DD-Record-Organizer/frmDoc_Links.vb +++ b/app/DD-Record-Organizer/frmDoc_Links.vb @@ -1,6 +1,7 @@ Imports System.IO Imports DD_LIB_Standards Imports DevExpress.XtraPrinting +Imports Microsoft.Office.Interop.Outlook Public Class frmDoc_Links Public Property Documents As New List(Of ClassWindreamDocGrid.WindreamDoc) @@ -38,7 +39,7 @@ Public Class frmDoc_Links Case "RWA" bbtnitmdeletelink.Enabled = True End Select - Catch ex As Exception + Catch ex As System.Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDoc_DocLinks_Load", ex.Message, ex.StackTrace) End Try End Sub @@ -80,12 +81,12 @@ Public Class frmDoc_Links If grvwGrid.Columns.Item("VALUE") IsNot Nothing Then grvwGrid.Columns.Item("VALUE").Visible = False End If - Catch ex1 As Exception + Catch ex1 As System.Exception LOGGER.Warn("Column VALUE not part of VWPMO_CUST_DOC_OBJECT_LINKS" & ex1.Message) End Try grvwGrid.OptionsView.ColumnAutoWidth = False grvwGrid.BestFitColumns() - Catch ex As Exception + Catch ex As System.Exception LOGGER.Error(ex) End Try @@ -99,7 +100,7 @@ Public Class frmDoc_Links MsgBox($"Please check Your link-object-relation", MsgBoxStyle.Exclamation) End If - Catch ex As Exception + Catch ex As System.Exception LOGGER.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Sub Refresh_Grid_Data", ex.Message, ex.StackTrace) End Try @@ -108,27 +109,44 @@ Public Class frmDoc_Links Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmdeletelink.ItemClick Dim oSelectedRows As Integer() = grvwGrid.GetSelectedRows() - For Each rowhandle As Integer In oSelectedRows - Try - Dim oSelectedDocID = grvwGrid.GetRowCellValue(rowhandle, "DocID") - Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "RecordID") - If IsNothing(oSelectedDocID) Then - Continue For - End If - LOGGER.Debug($"RecordLink will be removed Record: {oSelectedRecordID} - DocID: {oSelectedDocID} ") - Try - If ClassFileResult.Delete_ResultFile(oSelectedDocID, oSelectedRecordID, 0) = True Then - ClassHelper.InsertEssential_Log(oSelectedDocID, "DOC-ID", $"RECORD LINK {oSelectedRecordID} REMOVED FROM DOC-SEARCH") - End If - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace) - End Try - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Collecting DocRecord-Link", ex.Message, ex.StackTrace) - End Try - Next + If oSelectedRows.Count > 0 Then + Dim result As MsgBoxResult + Dim msg = String.Format("Wollen Sie die ausgewählten Links wirklich löschen?") + Dim oCount As Integer = 0 + If USER_LANGUAGE <> "de-DE" Then + msg = String.Format("Do you really want to delete the selected links?") + End If + result = MessageBox.Show(msg, "Bestätigung/Commitment:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + For Each rowhandle As Integer In oSelectedRows + Try + Dim oSelectedDocID = grvwGrid.GetRowCellValue(rowhandle, "DocID") + Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "RecordID") + If IsNothing(oSelectedDocID) Then + Continue For + End If + LOGGER.Debug($"RecordLink will be removed - Record: {oSelectedRecordID} - DocID: {oSelectedDocID} ") + Try + Dim oDEL = $"DELETE FROM TBPMO_DOC_RECORD_LINK WHERE Doc_ID = {oSelectedDocID} AND RECORD_ID = {oSelectedRecordID}" + If MYDB_ECM.ExecuteNonQuery(oDEL) = True Then + oCount += 1 + ClassHelper.InsertEssential_Log(oSelectedDocID, "DOC-ID", $"RECORD LINK {oSelectedRecordID} REMOVED FROM DOC-SEARCH") + End If + Catch ex As System.Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace) + End Try + Catch ex As System.Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Collecting DocRecord-Link", ex.Message, ex.StackTrace) + End Try + Next + MsgBox($"Es wurden {oCount} Links erfolreich gelöscht!", MsgBoxStyle.Information) + End If + + Refresh_Grid_Data(Documents) + Else + MsgBox("No links selected!", MsgBoxStyle.Information) + End If - Refresh_Grid_Data(Documents) End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick @@ -162,7 +180,7 @@ Public Class frmDoc_Links End If End If - Catch ex As Exception + Catch ex As System.Exception LOGGER.Error(ex) MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -173,7 +191,7 @@ Public Class frmDoc_Links Try grvwGrid.OptionsView.ColumnAutoWidth = False grvwGrid.BestFitColumns() - Catch ex As Exception + Catch ex As System.Exception LOGGER.Error(ex) End Try End Sub diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index cf90f9a..e2d4cb8 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -612,7 +612,7 @@ Public Class frmMain Application.AddMessageFilter(New ClassInactivityFilter(Me)) End If Catch ex As Exception - ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUOTP_LOGOUT_USER: " & ex.Message) + ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUTO_LOGOUT_USER: " & ex.Message) End Try Catch ex As Exception