3 Commits

6 changed files with 82 additions and 66 deletions

View File

@@ -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

View File

@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAVgBCgFYAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAWABCgFgAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1494,12 +1494,6 @@
<data name="RibbonPageAktionen.Text" xml:space="preserve">
<value>Aktionen</value>
</data>
<data name="RibbonPageGroup9.Text" xml:space="preserve">
<value>RibbonPageGroup9</value>
</data>
<data name="RibbonPage1.Text" xml:space="preserve">
<value>RibbonPage1</value>
</data>
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1481, 158</value>
</data>
@@ -2667,18 +2661,6 @@
<data name="&gt;&gt;RibbonPageGroup8.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value>
</data>
<data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPageGroup9.Name" xml:space="preserve">
<value>RibbonPageGroup9</value>
</data>
<data name="&gt;&gt;RibbonPageGroup9.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RepositoryItemTrackBar1.Name" xml:space="preserve">
<value>RepositoryItemTrackBar1</value>
</data>

View File

@@ -2360,11 +2360,9 @@ Public Class frmMain
If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20)
If SQL_PROFILES_USER <> "" Then
oSQL = SQL_PROFILES_USER.Replace("@USER_ID", USER_ID)
LOGGER.Debug($"VWPM_PROFILE_ACTIVE-SELECT used from DD-SQL-Config..")
Else
oSQL = $"SELECT [dbo].[FNDD_LANGUAGE_PHRASE] ('PROFILE_TITLE' + CONVERT(VARCHAR(4),T.GUID),'{USER_LANGUAGE}','PM') as GROUP_TEXT_LANG, T.*
FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({USER_ID}))"

View File

@@ -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

View File

@@ -344,7 +344,7 @@
<value>DocumentViewerValidator</value>
</data>
<data name="&gt;&gt;DocumentViewerValidator.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewerValidator.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value>
@@ -947,6 +947,9 @@
TDElppgSU0yJKabEFNPhDn4CUL0KSeYATWkAAAAASUVORK5CYII=
</value>
</data>
<data name="BarButtonItem7.Caption" xml:space="preserve">
<value>Color</value>
</data>
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -975,6 +978,9 @@
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Information</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>RibbonPageGroup1</value>
</data>
<data name="RibbonPage1.Text" xml:space="preserve">
<value>Start</value>
</data>
@@ -1626,6 +1632,18 @@
<data name="&gt;&gt;FolderBrowserDialog1.Type" xml:space="preserve">
<value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
<value>RibbonPageGroup1</value>
</data>
<data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;BarButtonItem7.Name" xml:space="preserve">
<value>BarButtonItem7</value>
</data>
<data name="&gt;&gt;BarButtonItem7.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmValidator</value>
</data>

View File

@@ -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
@@ -762,6 +763,7 @@ Public Class frmValidator
Dim oControlID = oControlRow.Item("GUID")
oControlInfo = $"CtrlID: {oControlID} - CtrlName: {oControlRow.Item("NAME")} - CtrlIndex: {oControlRow.Item("INDEX_NAME")}"
Try
If LOG_PERF Then PerformanceLogger.Info(oControlInfo + "")
Select Case oControlRow.Item("CTRL_TYPE").ToString.ToUpper
Case ClassControlCreator.PREFIX_TEXTBOX
If LOG_PERF Then PerformanceLogger.Info("Create_Controls/Textbox")
@@ -1219,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
@@ -1453,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
@@ -1466,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
@@ -1492,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
@@ -1503,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
@@ -3152,30 +3154,38 @@ Public Class frmValidator
Dim oMyDatatable As DataTable = oValueFromSource
Logger.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count)
For Each oRow As DataRow In oMyDatatable.Rows
Logger.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...")
oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter)
'If USER_USERNAME.ToLower = "'marscheiber" Then MsgBox($"IDB ROW Vector {oRow.Item(0).ToString}...")
Try
Logger.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...")
oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter)
If oColValuesfromSource.Length > 8 Then
Logger.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!")
End If
If oColValuesfromSource.Length > 8 Then
Logger.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!")
End If
Logger.Debug($"oColValuesfromSource splitted - Length ({oColValuesfromSource.Length.ToString})")
Dim oRowData As New List(Of Object)
Dim oRowData As New List(Of Object)
For index = 1 To oColValuesfromSource.Length
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)
End Try
For index = 1 To oColValuesfromSource.Length
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
oRowData.Add(oConvertedValue)
Next
oDataSource.Rows.Add(oRowData.ToArray())
Next
End If
End If
Else
Logger.Info($"DevExpressGrid: There are no columns configured/listed for control {oControlId}.")
End If
Case Else
@@ -3575,7 +3585,7 @@ Public Class frmValidator
Catch ex As Exception
Logger.Warn($"Unexpected error in FillIndexValues: [{oControName} -TYPE: {oControlType}-INDEXNAME: {oIndexName}] ERROR: {ex.Message}")
errormessage = "Unvorhergesehener Fehler bei FillIndexValues:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
errormessage = "Unvorhergesehener Fehler bei FillIndexValues:" + oControName & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
My.Settings.Save()
frmError.ShowDialog()
End Try
@@ -5742,4 +5752,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