diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 233a1b8..4172110 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -650,7 +650,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.BarButtonItemExportExcel, "BarButtonItemExportExcel") Me.BarButtonItemExportExcel.Id = 32 - Me.BarButtonItemExportExcel.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemExportExcel.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemExportExcel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItemExportExcel.Name = "BarButtonItemExportExcel" Me.BarButtonItemExportExcel.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 0781d79..fe703c3 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAZQBCAGUAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAaQBCAGkAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -172,60 +172,7 @@ 179, 17 - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 1 - - - Fill - - - - Tahoma, 9pt - - - 0, 151 - - - 1233, 355 - - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Zoom @@ -253,6 +200,7 @@ Application + 233, 0 @@ -262,6 +210,7 @@ 1000, 355 + 8 @@ -333,8 +282,14 @@ - 1012, 17 + 863, 17 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -488,21 +443,63 @@ 1 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 151 + + + 1233, 355 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 - 171, 56 + 17, 56 490, 17 - 404, 56 + 250, 56 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 235, 76 @@ -684,27 +681,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 605, 17 @@ -715,7 +691,7 @@ 525, 95 - 305, 56 + 151, 56 Aktualisieren @@ -1396,7 +1372,7 @@ Export Übersicht - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1747,6 +1723,24 @@ 0, 0 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Workflow + + + Funktionen/App Start + Start @@ -1795,24 +1789,6 @@ 4 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Workflow - - - Funktionen/App Start - Top @@ -3150,9 +3126,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -3165,6 +3138,9 @@ Bars + + &Hintergrund + PDF Dokument @@ -3298,19 +3274,19 @@ RibbonPage2 - 586, 56 + 432, 56 - 738, 56 + 584, 56 - 831, 56 + 677, 56 PDF Files (*.pdf*)|*.pdf - 968, 56 + 814, 56 235, 95 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index c3793f0..52e3fa4 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -421,16 +421,17 @@ Public Class frmMain End Sub Public Sub Timer_Inactivity_Reset_Disable(pTrigger As String) Try - If Timer5Mins_running = True Or TimerRefresh_running = True Then + If Timer5Mins_running = True Or TimerRefresh_running = True Or FormShown = False Then Exit Sub End If If INACTIVITY_DURATION <> 0 Then + TimerInactivity.Enabled = False TimerInactivity.Stop() TimerInactivity.Interval = INACTIVITY_DURATION * 60000 + TimerInactivity.Enabled = True TimerInactivity.Start() bsiInactivityCheck.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Dim StartTime As DateTime = #12:00:00 AM# - 'load combo box Dim oStarttime As DateTime = Now oStarttime = oStarttime.AddMinutes(INACTIVITY_DURATION) @@ -535,6 +536,7 @@ Public Class frmMain End Function Private Sub SaveGridLayout() + Timer_Inactivity_Reset_Disable("SaveGridLayout") If NO_WORKFLOWITEMS = True Then Exit Sub End If @@ -565,6 +567,7 @@ Public Class frmMain Private Sub ResetLayout() Try + Timer_Inactivity_Reset_Disable("ResetLayout") Dim xml As String = GetXML_OverviewLayoutName() IO.File.Delete(xml) Try @@ -1993,7 +1996,6 @@ Public Class frmMain Private Async Sub GridLayout_Reset() FRONTEND_ACTION = "RESET_LAYOUT" - Timer_Inactivity_Reset_Disable("TabellenlayoutZurücksetzenToolStripMenuItem") Await Reset_GridLayout(False) Await Decide_Load(False, True) SaveGridLayout() @@ -2248,6 +2250,7 @@ Public Class frmMain CurrNavBarGroup = NavBarControl1.Groups(1) FormShown = True + Timer_Inactivity_Reset_Disable("Decide_Load") Await Decide_Load(True) Handling_DEBUG_USER() @@ -2691,7 +2694,6 @@ Public Class frmMain If FRONTEND_ACTION <> "NONE" Then Exit Sub End If - Timer_Inactivity_Reset_Disable("GridLayout_Changed") SaveGridLayout() End Sub @@ -2897,5 +2899,7 @@ Public Class frmMain End Try End Sub - + Private Sub GridViewWFItems_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridViewWFItems.SelectionChanged + Timer_Inactivity_Reset_Disable("GridViewWFItems_SelectionChanged") + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 8a17e31..2bddbe4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -107,7 +107,7 @@ Partial Class frmValidator Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageCustAttmt = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupCustom = 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() @@ -749,7 +749,7 @@ Partial Class frmValidator ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageCustAttmt, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroupCustom, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -773,15 +773,15 @@ Partial Class frmValidator Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' - 'RibbonPageCustAttmt + 'RibbonPageGroupCustom ' - Me.RibbonPageCustAttmt.AllowTextClipping = False - Me.RibbonPageCustAttmt.ItemLinks.Add(Me.Attmt_bbtnitmShow) - Me.RibbonPageCustAttmt.ItemLinks.Add(Me.Attmnt_bbtnitm_LoadonClick) - Me.RibbonPageCustAttmt.ItemLinks.Add(Me.barbtnitmExport) - Me.RibbonPageCustAttmt.Name = "RibbonPageCustAttmt" - resources.ApplyResources(Me.RibbonPageCustAttmt, "RibbonPageCustAttmt") - Me.RibbonPageCustAttmt.Visible = False + Me.RibbonPageGroupCustom.AllowTextClipping = False + Me.RibbonPageGroupCustom.ItemLinks.Add(Me.Attmt_bbtnitmShow) + Me.RibbonPageGroupCustom.ItemLinks.Add(Me.Attmnt_bbtnitm_LoadonClick) + Me.RibbonPageGroupCustom.ItemLinks.Add(Me.barbtnitmExport) + Me.RibbonPageGroupCustom.Name = "RibbonPageGroupCustom" + resources.ApplyResources(Me.RibbonPageGroupCustom, "RibbonPageGroupCustom") + Me.RibbonPageGroupCustom.Visible = False ' 'RibbonPageGroup2 ' @@ -933,7 +933,7 @@ Partial Class frmValidator Friend WithEvents btnitemConversation_reload As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents Attmt_bbtnitmShow As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageCustAttmt As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupCustom As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents barbtnitmExport As DevExpress.XtraBars.BarButtonItem Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 4f01899..d52b3d1 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -131,31 +131,6 @@ 0, 0 - - Top, Left, Right - - - Segoe UI Symbol, 12pt, style=Bold - - - 3, 4 - - - No - - - 433, 29 - - - - 1 - - - Label1 - - - MiddleLeft - TITLELabel1 @@ -168,30 +143,6 @@ 0 - - Bottom, Left, Right - - - Tahoma, 9.75pt - - - MiddleLeft - - - 7, 454 - - - 3, 4, 3, 4 - - - 445, 50 - - - 11 - - - Validierung speichern - Nächstes Dokument - btnSave @@ -204,21 +155,6 @@ 1 - - Top, Left, Right - - - 5, 33 - - - 447, 48 - - - 1 - - - Label3 - DESCRIPTIONLabel @@ -231,24 +167,6 @@ 2 - - Top, Bottom, Left, Right - - - True - - - 8, 85 - - - 3, 4, 3, 4 - - - 444, 361 - - - 18 - PanelValidatorControl @@ -273,6 +191,7 @@ 455, 511 + 24 @@ -441,6 +360,135 @@ 0 + + Top, Left, Right + + + Segoe UI Symbol, 12pt, style=Bold + + + 3, 4 + + + No + + + 433, 29 + + + 1 + + + Label1 + + + MiddleLeft + + + TITLELabel1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + Bottom, Left, Right + + + Tahoma, 9.75pt + + + MiddleLeft + + + 7, 454 + + + 3, 4, 3, 4 + + + 445, 50 + + + 11 + + + Validierung speichern - Nächstes Dokument + + + btnSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + Top, Left, Right + + + 5, 33 + + + 447, 48 + + + 1 + + + Label3 + + + DESCRIPTIONLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 2 + + + Top, Bottom, Left, Right + + + True + + + 8, 85 + + + 3, 4, 3, 4 + + + 444, 361 + + + 18 + + + PanelValidatorControl + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + 17, 17 @@ -1029,43 +1077,9 @@ 0, 0 - - Aktionen - - - Beendete Konversationen - - - Funktionen - Konversationen - - Datei - - - Aktionen - - - Anhänge zu Beleg - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF - l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw - DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ - k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 - XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR - Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng - kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg - gg== - - - - Information - Start @@ -1738,10 +1752,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageCustAttmt + + RibbonPageGroupCustom - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1993,6 +2007,39 @@ Zoom + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu + NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + 10% @@ -2035,39 +2082,6 @@ sichtbare einpassen - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu - NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - BarButtonItem1 @@ -2080,6 +2094,40 @@ 1029, 17 + + Funktionen + + + Aktionen + + + Beendete Konversationen + + + Datei + + + Aktionen + + + Anhänge zu Beleg + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF + l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw + DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ + k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 + XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR + Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng + kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg + gg== + + + + Information + RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 5c7bbbd..a159f64 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -613,13 +613,17 @@ Public Class frmValidator End Try bbtniRefreshSearches.Visibility = BarItemVisibility.Always - RibbonPageCustAttmt.Visible = True + RibbonPageGroupCustom.Visible = True Else LOGGER.Debug("AdditionlSearhes result = false!") bbtniRefreshSearches.Visibility = BarItemVisibility.Never Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Never Attmt_bbtnitmShow.Visibility = BarItemVisibility.Never - RibbonPageCustAttmt.Visible = False + If barbtnitmExport.Visibility = BarItemVisibility.Never Then + RibbonPageGroupCustom.Visible = False + Else + RibbonPageGroupCustom.Visible = True + End If End If @@ -2528,16 +2532,16 @@ Public Class frmValidator End If End If - 'Beschriftung des Navigators - 'lblNavigator_anzDok.Text = position & " Of " & Anzahl_ValDoks & " files" - 'If WMDocPathWindows <> String.Empty Then - ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### - Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}" - DatabaseFallback.ExecuteNonQueryECM(Sql) + 'Beschriftung des Navigators + 'lblNavigator_anzDok.Text = position & " Of " & Anzahl_ValDoks & " files" + 'If WMDocPathWindows <> String.Empty Then + ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### + Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}" + DatabaseFallback.ExecuteNonQueryECM(sql) ' ############ Infos eintragen ################# - ' txtDateipfad.Text = Document_Path - Dim omsg = $"Verbleibende Belege: {Amount_Docs2Validate}" + ' txtDateipfad.Text = Document_Path + Dim omsg = $"Verbleibende Belege: {Amount_Docs2Validate}" If USER_LANGUAGE <> "de-DE" Then omsg = $"Remaining documents: {omsg}" End If @@ -3728,7 +3732,7 @@ Public Class frmValidator End Try Try If RibbonPageCustTitle <> "" Then - RibbonPageCustAttmt.Text = RibbonPageCustTitle + RibbonPageGroupCustom.Text = RibbonPageCustTitle End If If Not IsNothing(WMDocPathWindows) Then If ButtonExport2Folder_Caption <> "" And WMDocPathWindows <> "" Then