diff --git a/app/TaskFlow/My Project/Application.Designer.vb b/app/TaskFlow/My Project/Application.Designer.vb index 44583d7..8d31ac0 100644 --- a/app/TaskFlow/My Project/Application.Designer.vb +++ b/app/TaskFlow/My Project/Application.Designer.vb @@ -24,7 +24,7 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = true + Me.IsSingleInstance = false Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses diff --git a/app/TaskFlow/My Project/Application.myapp b/app/TaskFlow/My Project/Application.myapp index 74f2fe3..1eb0a95 100644 --- a/app/TaskFlow/My Project/Application.myapp +++ b/app/TaskFlow/My Project/Application.myapp @@ -2,7 +2,7 @@ true frmMain - true + false 0 true 0 diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index a9def59..3c6d6ae 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 65727c4..3ccacef 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -571,6 +571,7 @@ frmAbout.vb + Designer frmAdmin2.vb @@ -713,6 +714,7 @@ frmValidator.vb + Designer frmValidator.vb diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index 7530140..199cfb3 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -84,6 +84,11 @@ Public Class frmAdministration End If ObjekttypenEintragen() Indexe_eintragen() + If IDB_ACTIVE = True Then + bbtnitmNotResponsible.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bbtnitmNotResponsible.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If ' RibbonPageGroupProfile.Enabled = False _Logger.Debug("Administration loaded!") diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 39739db..9326515 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -673,13 +673,15 @@ Public Class frmMain End Try Try - GridViewWorkflows.Columns.Item("CONV_YN").Visible = False + If Not IsNothing(GridViewWorkflows.Columns("CONV_YN")) Then + GridViewWorkflows.Columns.Item("CONV_YN").Visible = False + End If Catch ex As Exception End Try Catch ex As Exception - End Try + End Try End Sub Private Sub ResetLayout() Try @@ -702,10 +704,6 @@ Public Class frmMain GridViewWorkflows.PopulateColumns() If GridViewWorkflows.Columns.Count > 0 Then - COLUMNS_INVISIBLE() - - - Try If TL_ICON = True Then GridViewWorkflows.Columns.Item("ICON").MaxWidth = 24 @@ -718,22 +716,22 @@ Public Class frmMain End Try - If IDB_ACTIVE = True Then - Try - If GridViewWorkflows.Columns.Item("CONV_YN") IsNot Nothing Then - GridViewWorkflows.Columns.Item("CONV_YN").Visible = False - End If - Catch ex As Exception - LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION") - End Try - Try - GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left - Catch ex As Exception - LOGGER.Info("ResetLayout - Column CONVERSATION obviously is not part of GridViewWorkflows") - End Try - End If + 'If IDB_ACTIVE = True Then + ' Try + ' If GridViewWorkflows.Columns.Item("CONV_YN") IsNot Nothing Then + ' GridViewWorkflows.Columns.Item("CONV_YN").Visible = False + ' End If + ' Catch ex As Exception + ' LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION") + ' End Try + ' Try + ' GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left + ' Catch ex As Exception + ' LOGGER.Info("ResetLayout - Column CONVERSATION obviously is not part of GridViewWorkflows") + ' End Try + 'End If Dim oReducedColName As String Try @@ -767,6 +765,7 @@ Public Class frmMain End Try ' GridViewWorkflows.OptionsView.ShowIndicator = False + COLUMNS_INVISIBLE() End If @@ -905,7 +904,7 @@ Public Class frmMain GridViewWorkflows.HideLoadingPanel() TimerRefresh.Start() RefreshHelper.LoadViewInfo() - If GridViewWorkflows.GroupCount = 0 And IsNothing(GridViewWorkflows.Columns("GROUP_TEXT")) Then + If GridViewWorkflows.GroupCount = 0 And Not IsNothing(GridViewWorkflows.Columns("GROUP_TEXT")) Then LOGGER.Info("NO GROUPS AFTER CLICK OVERVIEW...CREATING GROUPS NEW...") Await Load_Grid_Overview(False, True, True) GridViewWorkflows.HideLoadingPanel() @@ -1055,33 +1054,33 @@ Public Class frmMain Next End If - If IDB_ACTIVE = True Then - ' Spalte für Conversation erstellen - Dim columnConvIcon As New DataColumn() - columnConvIcon.DataType = GetType(Image) - columnConvIcon.ColumnName = "CONVERSATION" - columnConvIcon.Caption = "" - DT_CURR_WF_ITEMS.Columns.Add(columnConvIcon) - End If - For Each oRow As DataRow In DT_CURR_WF_ITEMS.Rows - Try - Dim oCONVYN As Boolean - Try - oCONVYN = oRow.Item("CONV_YN") - Catch ex As Exception - LOGGER.Warn($"Please check Your select/view Config - Column CONV_YN is missing [{ex.Message}]") - Exit For - End Try + 'If IDB_ACTIVE = True Then + ' ' Spalte für Conversation erstellen + ' Dim columnConvIcon As New DataColumn() + ' columnConvIcon.DataType = GetType(Image) + ' columnConvIcon.ColumnName = "CONVERSATION" + ' columnConvIcon.Caption = "" + ' DT_CURR_WF_ITEMS.Columns.Add(columnConvIcon) + 'End If + 'For Each oRow As DataRow In DT_CURR_WF_ITEMS.Rows + ' Try + ' Dim oCONVYN As Boolean + ' Try + ' oCONVYN = oRow.Item("CONV_YN") + ' Catch ex As Exception + ' LOGGER.Warn($"Please check Your select/view Config - Column CONV_YN is missing [{ex.Message}]") + ' Exit For + ' End Try - Select Case oCONVYN - Case True - oRow.Item("CONVERSATION") = My.Resources.conversation - End Select - Catch ex As Exception - LOGGER.Warn("Create_Basic_View1 - Column CONVERSATION obviously is not part of GridViewWorkflows") - End Try + ' Select Case oCONVYN + ' Case True + ' oRow.Item("CONVERSATION") = My.Resources.conversation + ' End Select + ' Catch ex As Exception + ' LOGGER.Warn("Create_Basic_View1 - Column CONVERSATION obviously is not part of GridViewWorkflows") + ' End Try - Next + 'Next bindsourcegrid.DataSource = DT_CURR_WF_ITEMS GridControlWorkflows.DataSource = bindsourcegrid Dim objectCount_Descr = GridViewWorkflows.RowCount.ToString @@ -1112,18 +1111,18 @@ Public Class frmMain - If IDB_ACTIVE = True Then - Try - GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left - Catch ex As Exception - LOGGER.Info("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridViewWorkflows - Trying to Rest Layout") - ResetLayout() - FRONTEND_ACTION = FA_NONE - Exit Sub - End Try - End If + 'If IDB_ACTIVE = True Then + ' Try + ' GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left + ' Catch ex As Exception + ' LOGGER.Info("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridViewWorkflows - Trying to Rest Layout") + ' ResetLayout() + ' FRONTEND_ACTION = FA_NONE + ' Exit Sub + ' End Try + 'End If ' GridViewWorkflows.OptionsView.ShowIndicator = False @@ -1172,7 +1171,7 @@ Public Class frmMain If oViewColumn.Caption = oGridDXFieldName Then If oActGridColumn.Visible = False Then If oViewColumn.Caption <> "GUID" And oViewColumn.Caption <> "TL_STATE" And oViewColumn.Caption <> "PROFILE_ID" And oViewColumn.Caption <> "DocID" And - oViewColumn.Caption <> "GROUP_COLOR" And oViewColumn.Caption <> "GROUP_TEXT" And oViewColumn.Caption <> "CONV_YN" Then + oViewColumn.Caption <> "GROUP_COLOR" And oViewColumn.Caption <> "GROUP_TEXT" Then 'And oViewColumn.Caption <> "CONV_YN" Console.WriteLine($"ViewColumn [{oViewColumn.Caption}] is invisible") Else oViewColumn_exists = True @@ -1351,6 +1350,7 @@ Public Class frmMain If GridViewWorkflows.OptionsFind.AlwaysVisible Then BarCheckItemShowSearch.Checked = True End If + COLUMNS_INVISIBLE() GridIsLoaded = True Catch ex As Exception GridIsLoaded = True @@ -1834,7 +1834,7 @@ Public Class frmMain End Function Private Sub Create_GroupBy_Parts() Try - LOGGER.Debug("Now Working on Groups..") + LOGGER.Debug("Now Create_GroupBy_Parts ...") GridViewWorkflows.OptionsView.ShowGroupPanel = False Dim oindex As Integer = 0 If Not IsNothing(BASEDATA_DTGRID_GROUPS) Then @@ -2012,33 +2012,33 @@ Public Class frmMain Next End If - If IDB_ACTIVE = True Then - ' Spalte für Conversation erstellen - Dim columnConvIcon As New DataColumn() - columnConvIcon.DataType = GetType(Image) - columnConvIcon.ColumnName = "CONVERSATION" - columnConvIcon.Caption = "" - DT_CURR_WF_ITEMS.Columns.Add(columnConvIcon) - For Each oRow As DataRow In DT_CURR_WF_ITEMS.Rows - Try - Dim oCONVYN As Boolean - Try - oCONVYN = oRow.Item("CONV_YN") - Catch ex As Exception - LOGGER.Warn("Load_Grid_Overview - Column CONV_YN obviously is not part of CURR_DT_OVERVIEW") - Exit For - End Try - Select Case oCONVYN - Case True - oRow.Item("CONVERSATION") = My.Resources.conversation - End Select - Catch ex As Exception - LOGGER.Warn("Load_Grid_Overview - Column CONVERSATION obviously is not part of GridViewWorkflows") - Exit For - End Try + 'If IDB_ACTIVE = True Then + ' ' Spalte für Conversation erstellen + ' Dim columnConvIcon As New DataColumn() + ' columnConvIcon.DataType = GetType(Image) + ' columnConvIcon.ColumnName = "CONVERSATION" + ' columnConvIcon.Caption = "" + ' DT_CURR_WF_ITEMS.Columns.Add(columnConvIcon) + ' For Each oRow As DataRow In DT_CURR_WF_ITEMS.Rows + ' Try + ' Dim oCONVYN As Boolean + ' Try + ' oCONVYN = oRow.Item("CONV_YN") + ' Catch ex As Exception + ' LOGGER.Warn("Load_Grid_Overview - Column CONV_YN obviously is not part of CURR_DT_OVERVIEW") + ' Exit For + ' End Try + ' Select Case oCONVYN + ' Case True + ' oRow.Item("CONVERSATION") = My.Resources.conversation + ' End Select + ' Catch ex As Exception + ' LOGGER.Warn("Load_Grid_Overview - Column CONVERSATION obviously is not part of GridViewWorkflows") + ' Exit For + ' End Try - Next - End If + ' Next + 'End If bindsourcegrid.DataSource = DT_CURR_WF_ITEMS @@ -2050,11 +2050,11 @@ Public Class frmMain oColNotPartofLayout = False 'GridControlDocRow.ForceInitialize() ' GridControl1.DataSource = CURR_DT_PROFILEGRID - If pFormLoad = True Then - If IDB_ACTIVE = True Then - oColNotPartofLayout = Column_inGridViewLayout("CONV_YN") - End If - End If + 'If pFormLoad = True Then + ' If IDB_ACTIVE = True Then + ' oColNotPartofLayout = Column_inGridViewLayout("CONV_YN") + ' End If + 'End If If pNavbarClick = False Then If pForceReload = True And (GridLayoutChanged() = True Or oColNotPartofLayout = True) Then ResetLayout() @@ -2087,15 +2087,15 @@ Public Class frmMain End If - If IDB_ACTIVE = True Then - Try - GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 - GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left - Catch ex As Exception - LOGGER.Info("LoadGridOverview - Column CONVERSATION obviously not part of GridViewWorkflows") - End Try - End If + 'If IDB_ACTIVE = True Then + ' Try + ' GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").MinWidth = 24 + ' GridViewWorkflows.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left + ' Catch ex As Exception + ' LOGGER.Info("LoadGridOverview - Column CONVERSATION obviously not part of GridViewWorkflows") + ' End Try + 'End If 'GridViewWorkflows.OptionsView.ShowIndicator = False @@ -2162,6 +2162,10 @@ Public Class frmMain Await Decide_Load(False, True) GridViewWorkflows.OptionsView.ShowViewCaption = False SaveGridLayout() + If GridViewWorkflows.GroupCount = 0 And Not IsNothing(GridViewWorkflows.Columns("GROUP_TEXT")) Then + LOGGER.Info("NO GROUPS AFTER GridLayout_Reset Load...") + Create_GroupBy_Parts() + End If GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) If GridControlWorkflows.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() FRONTEND_ACTION = FA_NONE @@ -2448,6 +2452,11 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ FormShown = True Timer_Inactivity_Reset_Disable("Decide_Load") Await Decide_Load(True) + If GridViewWorkflows.GroupCount = 0 And Not IsNothing(GridViewWorkflows.Columns("GROUP_TEXT")) Then + LOGGER.Info("NO GROUPS AFTER SHOWN_Decide Load...") + Create_GroupBy_Parts() + End If + Handling_DEBUG_USER() Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM NOTE diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index e3c8650..7585648 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -86,13 +86,7 @@ Partial Class frmValidator Me.bsiInfo1 = New DevExpress.XtraBars.BarStaticItem() Me.bsiInfo2 = New DevExpress.XtraBars.BarStaticItem() Me.BbtnitmSave = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarLinkContainerItem1 = New DevExpress.XtraBars.BarLinkContainerItem() - Me.btnitemConversationEnd = New DevExpress.XtraBars.BarButtonItem() - Me.BarLinkContainerItem2 = New DevExpress.XtraBars.BarLinkContainerItem() - Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.Attmt_bbtnitmShow = New DevExpress.XtraBars.BarButtonItem() @@ -100,7 +94,6 @@ Partial Class frmValidator Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem() Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -528,7 +521,7 @@ Partial Class frmValidator 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6, Me.BarButtonItem7}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 34 Me.RibbonControl1.Name = "RibbonControl1" @@ -662,51 +655,12 @@ Partial Class frmValidator Me.BbtnitmSave.ImageOptions.LargeImage = CType(resources.GetObject("BbtnitmSave.ImageOptions.LargeImage"), System.Drawing.Image) Me.BbtnitmSave.Name = "BbtnitmSave" ' - 'BarButtonItem2 - ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 17 - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'BarLinkContainerItem1 - ' - resources.ApplyResources(Me.BarLinkContainerItem1, "BarLinkContainerItem1") - Me.BarLinkContainerItem1.Id = 18 - Me.BarLinkContainerItem1.Name = "BarLinkContainerItem1" - ' - 'btnitemConversationEnd - ' - resources.ApplyResources(Me.btnitemConversationEnd, "btnitemConversationEnd") - Me.btnitemConversationEnd.Id = 19 - Me.btnitemConversationEnd.ImageOptions.SvgImage = CType(resources.GetObject("btnitemConversationEnd.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.btnitemConversationEnd.Name = "btnitemConversationEnd" - ' - 'BarLinkContainerItem2 - ' - resources.ApplyResources(Me.BarLinkContainerItem2, "BarLinkContainerItem2") - Me.BarLinkContainerItem2.Id = 21 - Me.BarLinkContainerItem2.Name = "BarLinkContainerItem2" - ' - 'BarEditItem1 - ' - resources.ApplyResources(Me.BarEditItem1, "BarEditItem1") - Me.BarEditItem1.Edit = Me.RepositoryItemComboBox1 - Me.BarEditItem1.Id = 22 - Me.BarEditItem1.Name = "BarEditItem1" - ' 'RepositoryItemComboBox1 ' resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" ' - 'BarEditItem2 - ' - resources.ApplyResources(Me.BarEditItem2, "BarEditItem2") - Me.BarEditItem2.Edit = Me.RepositoryItemComboBox2 - Me.BarEditItem2.Id = 23 - Me.BarEditItem2.Name = "BarEditItem2" - ' 'RepositoryItemComboBox2 ' resources.ApplyResources(Me.RepositoryItemComboBox2, "RepositoryItemComboBox2") @@ -767,12 +721,6 @@ Partial Class frmValidator Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' - 'BarButtonItem7 - ' - resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7") - Me.BarButtonItem7.Id = 33 - Me.BarButtonItem7.Name = "BarButtonItem7" - ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroupCustom, Me.RibbonPageGroup2}) @@ -950,13 +898,7 @@ Partial Class frmValidator Friend WithEvents bsiInfo2 As DevExpress.XtraBars.BarStaticItem Friend WithEvents DocumentViewerValidator As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BbtnitmSave As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarLinkContainerItem1 As DevExpress.XtraBars.BarLinkContainerItem - Friend WithEvents btnitemConversationEnd As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarLinkContainerItem2 As DevExpress.XtraBars.BarLinkContainerItem - Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox - Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents RepositoryItemComboBox3 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem @@ -973,7 +915,6 @@ Partial Class frmValidator Friend WithEvents TITLELabel1 As DevExpress.XtraEditors.LabelControl Friend WithEvents PanelValidatorControl As DevExpress.XtraEditors.XtraScrollableControl Friend WithEvents PanelValidatorControlBorder As DevExpress.XtraEditors.PanelControl - Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnReject As DevExpress.XtraEditors.SimpleButton Friend WithEvents SplitContainerButtons As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerReject_NotResp As DevExpress.XtraEditors.SplitContainerControl diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index fe8d029..cbc29b7 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -467,42 +467,6 @@ 0, 158 - - Top, Bottom, Left, Right - - - Fill - - - 2, 2 - - - 1003, 939 - - - 3 - - - PanelValidatorControl - - - DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelValidatorControlBorder - - - 0 - - - 5, 85 - - - 1007, 943 - - - 44 - PanelValidatorControlBorder @@ -515,28 +479,6 @@ 1 - - Top, Left, Right - - - Segoe UI, 9.75pt - - - - None - - - 5, 33 - - - 1007, 46 - - - 1 - - - LabelControl1 - DESCRIPTIONLabel @@ -549,27 +491,6 @@ 2 - - Top, Left, Right - - - Segoe UI, 12pt, style=Bold - - - None - - - 5, 5 - - - 1007, 28 - - - 1 - - - LabelControl1 - TITLELabel1 @@ -678,6 +599,133 @@ 0 + + Top, Bottom, Left, Right + + + PanelValidatorControl + + + DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelValidatorControlBorder + + + 0 + + + 5, 85 + + + 1007, 943 + + + 44 + + + PanelValidatorControlBorder + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 1 + + + Fill + + + 2, 2 + + + 1003, 939 + + + 3 + + + PanelValidatorControl + + + DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelValidatorControlBorder + + + 0 + + + Top, Left, Right + + + Segoe UI, 9.75pt + + + + None + + + 5, 33 + + + 1007, 46 + + + 1 + + + LabelControl1 + + + DESCRIPTIONLabel + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 2 + + + Top, Left, Right + + + Segoe UI, 12pt, style=Bold + + + None + + + 5, 5 + + + 1007, 28 + + + 1 + + + LabelControl1 + + + TITLELabel1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 3 + 756, 17 @@ -784,10 +832,10 @@ Tahoma, 8.25pt, style=Bold - BarStaticItem1 + bsiInformation - BarStaticItem1 + bsiDocID Datei öffnen @@ -1088,57 +1136,6 @@ uOVgTgFgJVQ5UIMszEGUwFP1hRCKJ8gHxL8Yk0HaAAAAAElFTkSuQmCC - - BarButtonItem2 - - - Konversationen - - - Beende Konversation - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkZvcmJpZCI+DQogICAgPHBhdGggZD0iTTE2LDRDOS40 - LDQsNCw5LjQsNCwxNnM1LjQsMTIsMTIsMTJzMTItNS40LDEyLTEyUzIyLjYsNCwxNiw0eiBNMTYsOGMx - LjUsMCwyLjksMC40LDQuMSwxLjFsLTExLDExICAgQzguNCwxOC45LDgsMTcuNSw4LDE2QzgsMTEuNiwx - MS42LDgsMTYsOHogTTE2LDI0Yy0xLjUsMC0yLjgtMC40LTQtMS4xTDIyLjksMTJjMC43LDEuMiwxLjEs - Mi41LDEuMSw0QzI0LDIwLjQsMjAuNCwyNCwxNiwyNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwv - c3ZnPgs= - - - - BarLinkContainerItem2 - - - Auswahl - - - False - - - - Combo - - - Auswahl - - - False - - - Combo - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1284,40 +1281,25 @@ TDElppgSU0yJKabEFNPhDn4CUL0KSeYATWkAAAAASUVORK5CYII= - - Color - 0, 0 - - 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 + + False + + + + Combo + + + False + + + Combo + False @@ -1834,48 +1816,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem2 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarLinkContainerItem1 - - - DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnitemConversationEnd - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarLinkContainerItem2 - - - DevExpress.XtraBars.BarLinkContainerItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarEditItem1 - - - DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RepositoryItemComboBox1 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarEditItem2 - - - DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RepositoryItemComboBox2 @@ -1918,12 +1864,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem7 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPage1 @@ -2203,6 +2143,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 % @@ -2245,39 +2218,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 @@ -2296,6 +2236,31 @@ 1029, 17 + + 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/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 528c539..a5a5774 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -352,77 +352,70 @@ Public Class frmValidator - If IDB_ACTIVE Then - Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) - Logger.Debug($"oProfile_REJECT_SQL_REASONS: " + oProfile_REJECT_SQL_REASONS) - Logger.Debug($"oProfileNotResponsibleText: " + oProfileNotResponsibleText) - Logger.Debug($"oProfile_NOT_RESP_SQL: " + oProfile_NOT_RESP_SQL) - Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) - Dim functBtnReject As Boolean = False - Dim functBtnNR As Boolean = False - If oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS <> String.Empty Then - functBtnReject = True - End If - If oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL <> String.Empty Then + Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) + Logger.Debug($"oProfile_REJECT_SQL_REASONS: " + oProfile_REJECT_SQL_REASONS) + Logger.Debug($"oProfileNotResponsibleText: " + oProfileNotResponsibleText) + Logger.Debug($"oProfile_NOT_RESP_SQL: " + oProfile_NOT_RESP_SQL) + Logger.Debug($"oProfileRejectionText: " + oProfileRejectionText) + Dim functBtnReject As Boolean = False + Dim functBtnNR As Boolean = False + If oProfileRejectionText <> String.Empty And oProfile_REJECT_SQL_REASONS <> String.Empty Then + functBtnReject = True + End If + If oProfileNotResponsibleText <> String.Empty And oProfile_NOT_RESP_SQL <> String.Empty Then + If IDB_ACTIVE = True Then functBtnNR = True End If - If functBtnReject = False And functBtnNR = False Then - Logger.Debug($"!Keine Ablehnung und Nicht zuständig Funktion konfiguriert!") - SplitContainerReject_NotResp.Visible = False - SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None - SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2 - + End If + If functBtnReject = False And functBtnNR = False Then + Logger.Debug($"!Keine Ablehnung und Nicht zuständig Funktion konfiguriert!") + SplitContainerReject_NotResp.Visible = False + SplitContainerButtons.CollapsePanel = SplitCollapsePanel.None + SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Panel2 + Else + SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1 + SplitContainerReject_NotResp.Visible = True + If functBtnReject = True And functBtnNR = True Then + Logger.Debug($"Nicht zuständig und Ablehnungs-Buttons werden eingeblendet!") + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.None + SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both + btnReject.Text = oProfileRejectionText + btnNotResponsible.Text = oProfileNotResponsibleText + If USER_GHOST_MODE_ACTIVE Then + btnReject.Enabled = False + btnNotResponsible.Enabled = False + Else + btnReject.Enabled = True + btnNotResponsible.Enabled = True + End If Else - SplitContainerButtons.CollapsePanel = SplitCollapsePanel.Panel1 - SplitContainerReject_NotResp.Visible = True - If functBtnReject = True And functBtnNR = True Then - Logger.Debug($"Nicht zuständig und Ablehnungs-Buttons werden eingeblendet!") - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.None - SplitContainerButtons.PanelVisibility = SplitPanelVisibility.Both - btnReject.Text = oProfileRejectionText + If functBtnNR = True Then + Logger.Debug($"Nicht zuständig Button wird eingeblendet!") + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel1 + SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel2 + btnReject.Visible = False + SplitContainerReject_NotResp.Collapsed = True btnNotResponsible.Text = oProfileNotResponsibleText If USER_GHOST_MODE_ACTIVE Then - btnReject.Enabled = False btnNotResponsible.Enabled = False Else - btnReject.Enabled = True btnNotResponsible.Enabled = True End If Else - If functBtnNR = True Then - Logger.Debug($"Nicht zuständig Button wird eingeblendet!") - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel1 - SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel2 - btnReject.Visible = False - SplitContainerReject_NotResp.Collapsed = True - btnNotResponsible.Text = oProfileNotResponsibleText - If USER_GHOST_MODE_ACTIVE Then - btnNotResponsible.Enabled = False - Else - btnNotResponsible.Enabled = True - End If + SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel2 + SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel1 + SplitContainerReject_NotResp.Collapsed = True + btnNotResponsible.Visible = False + btnReject.Text = oProfileRejectionText + If USER_GHOST_MODE_ACTIVE Then + btnReject.Enabled = False Else - SplitContainerReject_NotResp.CollapsePanel = SplitCollapsePanel.Panel2 - SplitContainerReject_NotResp.PanelVisibility = SplitPanelVisibility.Panel1 - SplitContainerReject_NotResp.Collapsed = True - btnNotResponsible.Visible = False - btnReject.Text = oProfileRejectionText - If USER_GHOST_MODE_ACTIVE Then - btnReject.Enabled = False - Else - btnReject.Enabled = True - End If + btnReject.Enabled = True End If End If - - - - - End If End If - bbtniNext.Visibility = BarItemVisibility.Always If CURRENT_JUMP_DOC_GUID <> 0 Then bbtniNext.Visibility = BarItemVisibility.Never @@ -2644,8 +2637,8 @@ Public Class frmValidator End If If oCurrency <> String.Empty Then If oCurrency.ToString.Length = 2 Then + Logger.Debug("oCurrency-Length = 2 - Setting to EUR") oCurrency = "EUR" - Logger.Debug("oCurrency = 48 - Stting to EUR") End If Logger.Debug($"oCurrency = {oCurrency}") For Each oControl As Control In PanelValidatorControl.Controls @@ -5740,21 +5733,6 @@ Public Class frmValidator End If End Sub - Private Sub BarButtonItem2_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItemFileView.ItemClick - Try - Dim Proc As New System.Diagnostics.Process - Dim psi As New ProcessStartInfo(WMDocPathWindows) - Proc.EnableRaisingEvents = True - Proc.StartInfo = psi - Proc.Start() - Logger.Info(" - Datei wurde geöffnet!") - Catch ex As Exception - Logger.Error(ex) - MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Logger.Info("Fehler bei Datei öffnen: " & ex.Message, True) - End Try - End Sub - Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick frmFileInfo.ShowDialog() End Sub