diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index 348767c..ce8cacd 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -95,8 +95,6 @@ Partial Class frmMain Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageAktionen = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Panel2 = New System.Windows.Forms.Panel() @@ -294,7 +292,7 @@ Partial Class frmMain resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 54 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen, Me.RibbonPage1}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -823,17 +821,6 @@ Partial Class frmMain Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItemMassValidation) Me.RibbonPageGroup8.Name = "RibbonPageGroup8" ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup9}) - Me.RibbonPage1.Name = "RibbonPage1" - resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") - ' - 'RibbonPageGroup9 - ' - Me.RibbonPageGroup9.Name = "RibbonPageGroup9" - resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") - ' 'RepositoryItemTrackBar1 ' Me.RepositoryItemTrackBar1.LabelAppearance.Options.UseTextOptions = True @@ -1787,8 +1774,6 @@ Partial Class frmMain Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageAktionen As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup9 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RepositoryItemTrackBar1 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar Friend WithEvents Panel2 As Panel Friend WithEvents lblCaptionMainGrid As Label diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 53d1ebe..93635d9 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAVgBCgFYAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAWABCgFgAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1494,12 +1494,6 @@ Aktionen - - RibbonPageGroup9 - - - RibbonPage1 - 1481, 158 @@ -2667,18 +2661,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage1 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup9 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RepositoryItemTrackBar1 diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 562bfcb..2547be1 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -105,6 +105,8 @@ Partial Class frmValidator Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -453,9 +455,9 @@ 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.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}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 33 + Me.RibbonControl1.MaxItemId = 34 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3}) @@ -694,7 +696,7 @@ Partial Class frmValidator ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroupCustom, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroupCustom, Me.RibbonPageGroup2, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -759,6 +761,18 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'BarButtonItem7 + ' + resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7") + Me.BarButtonItem7.Id = 33 + Me.BarButtonItem7.Name = "BarButtonItem7" + ' 'frmValidator ' Me.Appearance.Options.UseFont = True @@ -880,4 +894,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 RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 742a7ec..a93ce08 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -344,7 +344,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 @@ -947,6 +947,9 @@ TDElppgSU0yJKabEFNPhDn4CUL0KSeYATWkAAAAASUVORK5CYII= + + Color + 0, 0 @@ -975,6 +978,9 @@ Information + + RibbonPageGroup1 + Start @@ -1626,6 +1632,18 @@ System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, 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 + frmValidator diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index fc868d5..f0c016e 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1,4 +1,5 @@ -Imports DevExpress.XtraBars +Imports DevExpress.DataAccess.Native.Sql +Imports DevExpress.XtraBars Imports DevExpress.XtraEditors Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Columns @@ -1220,7 +1221,7 @@ Public Class frmValidator Select Case oAction.ToString.ToUpper Case "SetButton".ToUpper btnSave.Text = oCaption & " (F2)" - btnSave.BackColor = oColor + btnSave.Appearance.BackColor = oColor Case "Override_Question".ToUpper If oQuestion <> "" Then Dim result As MsgBoxResult @@ -1454,7 +1455,7 @@ Public Class frmValidator If oControlDataResult Is Nothing Then Exit Sub End If - + Dim oButtonFinishSet As Boolean = False For Each oResultRow As DataRow In oControlDataResult.Rows Try _SetControlValue_In_Action = True @@ -1467,9 +1468,9 @@ Public Class frmValidator If oControl2Set.ToString.ToUpper = "BTN_FINISH".ToUpper Then btnSave.Text = oControlCaption & " (F2)" - btnSave.BackColor = oControlBackColor - btnSave.ForeColor = oControlFontColor - + btnSave.Appearance.BackColor = oControlBackColor + btnSave.Appearance.ForeColor = oControlFontColor + oButtonFinishSet = True _SetControlValue_In_Action = False Continue For End If @@ -1493,7 +1494,7 @@ Public Class frmValidator Dim oControl As Control = oControlObject2Set Dim oMeta As ClassControlCreator.ControlMetadata = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata) - Logger.Debug($"Got the Control22Set: {oControlId2Set}..Setting the values..") + Logger.Debug($"Got the Control2Set: {oControlId2Set}..Setting the values..") Select Case True @@ -1504,8 +1505,8 @@ Public Class frmValidator oControl.Text &= oControlCaption End If - btnSave.BackColor = oControlBackColor - btnSave.ForeColor = oControlFontColor + oControl.BackColor = oControlBackColor + oControl.ForeColor = oControlFontColor Case oControl.GetType() = GetType(LookupControl3) Dim oDependingLookup As LookupControl3 = oControl @@ -3164,12 +3165,15 @@ Public Class frmValidator Dim oRowData As New List(Of Object) For index = 1 To oColValuesfromSource.Length - Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN") - Logger.Debug($"oColumnType of DGView-Column ({oColumnType.ToString})") - Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType) - oRowData.Add(oConvertedValue) + Try + Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN") + Logger.Debug($"oColumnType of DGView-Column ({oColumnType.ToString})...") + Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType) + oRowData.Add(oConvertedValue) + Catch ex As Exception + Logger.Warn($"Error while converting/adding Value to oRowData: " & ex.Message) + End Try Next - oDataSource.Rows.Add(oRowData.ToArray()) Catch ex As Exception Logger.Warn($"Error while adding datarow [{oRow.Item(0).ToString}] to Grid: " & ex.Message) @@ -3181,7 +3185,7 @@ Public Class frmValidator End If Else - + Logger.Info($"DevExpressGrid: There are no columns configured/listed for control {oControlId}.") End If Case Else @@ -3736,7 +3740,7 @@ Public Class frmValidator Try Dim oSQL = PROFIL_FINISH_SQL oSQL = clsPatterns.ReplaceAllValues(oSQL, PanelValidatorControl, True) - sd + Dim oDT_ACTIONS As DataTable = DatabaseFallback.GetDatatableECM(oSQL) If IsNothing(oDT_ACTIONS) Then MsgBox("Something went wrong in btnFinish_continue - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) @@ -5746,4 +5750,11 @@ Public Class frmValidator End Using Return tmpImg End Function + + Private Sub BarButtonItem7_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem7.ItemClick + Dim oControlFontColor = Color.FromName("Black") + Dim oControlBackColor = Color.FromName("Red") + btnSave.Appearance.ForeColor = oControlFontColor + btnSave.Appearance.BackColor = oControlBackColor + End Sub End Class \ No newline at end of file