Bibliotheks- und UI-Updates, SQL-Platzhalter

In dieser Commit wurden mehrere wichtige Änderungen vorgenommen:
- Aktualisierung der Bibliotheksreferenzen von `DocumentViewer` zu `DocumentViewerDD` in mehreren Dateien.
- DevExpress-Bibliotheken wurden von Version 21.2 auf 25.2 aktualisiert.
- Neue Codeblöcke zur Ersetzung von Platzhaltern in SQL-Anweisungen in `ClassControlCreator.vb` und `GridControl.vb` hinzugefügt.
- Anpassungen an der Benutzeroberfläche in `frmAdministration.Designer.vb` und `frmAdministration.resx`, einschließlich neuer Labels und Textboxen sowie Änderungen an der Spaltenreihenfolge.
- Methode zum Anzeigen des Overlay-Formulars in `frmMain.vb` geändert.
- Aktualisierung der Paketversionen und Hinzufügen neuer Analysetools in `taskFLOW.vbproj`.
This commit is contained in:
Developer01
2026-10-26 17:01:01 +01:00
parent bb152cc300
commit 3fa4b8f231
15 changed files with 717 additions and 1794 deletions

View File

@@ -120,7 +120,7 @@
<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll"/> <File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll"/>
<File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" Source="DigitalData.Modules.Patterns.dll"/> <File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" Source="DigitalData.Modules.Patterns.dll"/>
<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" Source="DigitalData.Modules.EDMI.API.dll"/> <File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" Source="DigitalData.Modules.EDMI.API.dll"/>
<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll"/> <File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewerDD.dll" Source="DigitalData.Controls.DocumentViewerDD.dll"/>
<File Id="DDLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" /> <File Id="DDLicenseManager" Name="DLLLicenseManager.dll" Source="DLLLicenseManager.dll" KeyPath="no" />
<File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" /> <File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
<File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" /> <File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />

View File

@@ -945,6 +945,12 @@ Public Class ClassControlCreator
Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP") Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP")
If oSqlStatement <> String.Empty AndAlso oConnectionId > -1 Then If oSqlStatement <> String.Empty AndAlso oConnectionId > -1 Then
' ========== NEU: {#IDBA#...}-Platzhalter vorab ersetzen ==========
If oSqlStatement.Contains("{#IDBA#") Then
oSqlStatement = clsPatterns.ReplaceIDBAttributes(oSqlStatement, True)
Logger.Debug($"GridTables_HandleControlValueChange -> Nach ReplaceIDBAttributes für [{oColumnName}]: [{oSqlStatement}]")
End If
' ========== ENDE NEU ==========
oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True) oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True)
GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup) GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)

View File

@@ -218,7 +218,11 @@ Namespace ControlCreator
Try Try
Dim oComboboxDataTable As DataTable = Nothing Dim oComboboxDataTable As DataTable = Nothing
Dim oColumnName As String = oRow.Item("SPALTENNAME") Dim oColumnName As String = oRow.Item("SPALTENNAME")
_Logger.Debug("Working on SQL for Column[{0}]...", oColumnName) _Logger.Debug("Working on SQL [{0}] for Column[{1}]...", oSqlCommand, oColumnName)
If oSqlCommand.Contains("{#IDBA#") Then
oSqlCommand = clsPatterns.ReplaceIDBAttributes(oSqlCommand, True)
_Logger.Debug("FillGridTables -> Nach ReplaceIDBAttributes für [{0}]: [{1}]", oColumnName, oSqlCommand)
End If
If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then
_Logger.Debug("SQL has no complex patterns!") _Logger.Debug("SQL has no complex patterns!")
'oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId) 'oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId)

View File

@@ -143,8 +143,8 @@
<Reference Include="DevExpress.XtraVerticalGrid.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraVerticalGrid.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="DigitalData.Controls.DocumentViewer"> <Reference Include="DigitalData.Controls.DocumentViewerDD">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewerDD.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Controls.LookupGrid"> <Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>

View File

@@ -1120,7 +1120,7 @@ Partial Class frmAdministration
' '
Me.SplitContainerControl2.Panel2.Controls.Add(Me.TabControl1) Me.SplitContainerControl2.Panel2.Controls.Add(Me.TabControl1)
resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
Me.SplitContainerControl2.SplitterPosition = 286 Me.SplitContainerControl2.SplitterPosition = 343
' '
'GridControlNavigation 'GridControlNavigation
' '
@@ -1142,7 +1142,7 @@ Partial Class frmAdministration
Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colNAME, Me.colActiveProfil}) Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colActiveProfil, Me.colNAME})
Me.GridViewProfile.DetailHeight = 295 Me.GridViewProfile.DetailHeight = 295
Me.GridViewProfile.GridControl = Me.GridControlNavigation Me.GridViewProfile.GridControl = Me.GridControlNavigation
Me.GridViewProfile.Name = "GridViewProfile" Me.GridViewProfile.Name = "GridViewProfile"

File diff suppressed because it is too large Load Diff

View File

@@ -1726,7 +1726,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAfABDAHwAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAfgBDAH4AQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

View File

@@ -1608,7 +1608,7 @@ Public Class frmMain
' Overlay nur anzeigen, wenn die Anwendung aktuell den Fokus hat ' Overlay nur anzeigen, wenn die Anwendung aktuell den Fokus hat
Dim appHasFocus As Boolean = Application.OpenForms().Cast(Of Form)().Any(Function(f) f.ContainsFocus) Dim appHasFocus As Boolean = Application.OpenForms().Cast(Of Form)().Any(Function(f) f.ContainsFocus)
If Not _overlayActive AndAlso appHasFocus Then If Not _overlayActive AndAlso appHasFocus Then
oHandle = SplashScreenManager.ShowOverlayForm(Me) oHandle = SplashScreenManager.ShowOverlayForm(GridControlWorkflows)
_overlayActive = True _overlayActive = True
overlayStartedHere = True overlayStartedHere = True
Else Else
@@ -2297,7 +2297,7 @@ Public Class frmMain
' ========== OVERLAY ANZEIGEN ========== ' ========== OVERLAY ANZEIGEN ==========
If Not _overlayActive Then If Not _overlayActive Then
oHandle = SplashScreenManager.ShowOverlayForm(Me) oHandle = SplashScreenManager.ShowOverlayForm(GridControlWorkflows)
_overlayActive = True _overlayActive = True
overlayStartedHere = True overlayStartedHere = True
End If End If

View File

@@ -47,7 +47,7 @@ Partial Class frmMonitor
Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
Me.SplitContainerControlMain = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerControlMain = New DevExpress.XtraEditors.SplitContainerControl()
Me.DocumentViewerMonitor = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.DocumentViewerMonitor = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer()
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -455,6 +455,6 @@ Partial Class frmMonitor
Friend WithEvents SplitContainerControlMain As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerControlMain As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents BarStaticItemInfoDoc As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarStaticItemInfoDoc As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarStaticItemInfo As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarStaticItemInfo As DevExpress.XtraBars.BarStaticItem
Friend WithEvents DocumentViewerMonitor As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents DocumentViewerMonitor As DigitalData.Controls.DocumentViewer.DD_DocumentViewer
Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@@ -259,7 +259,7 @@ Public Class frmMonitor
LOGGER.Debug($"Attention: No Column FULL_FILE_PATH in GridView1") LOGGER.Debug($"Attention: No Column FULL_FILE_PATH in GridView1")
End Try End Try
Try Try
DocumentViewerMonitor.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { DocumentViewerMonitor.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True, .ShowPrintButton = True,
.ShowRotateButton = True, .ShowRotateButton = True,
.ShowFlipButton = True, .ShowFlipButton = True,

View File

@@ -34,7 +34,7 @@ Partial Class frmValidator
Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl()
Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl()
Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer()
Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components)
Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
@@ -919,7 +919,7 @@ Partial Class frmValidator
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents bsiInfo1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsiInfo1 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents bsiInfo2 As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsiInfo2 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DD_DocumentViewer
Friend WithEvents BbtnitmSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents BbtnitmSave As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox

View File

@@ -616,7 +616,7 @@
<value>DocumentViewer1</value> <value>DocumentViewer1</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.5.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.Controls.DocumentViewer.DD_DocumentViewer, DigitalData.Controls.DocumentViewerDD, Version=2.7.5.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value> <value>SplitContainer1.Panel2</value>

View File

@@ -10,9 +10,7 @@ Imports System.Text.RegularExpressions
Imports System.Threading Imports System.Threading
Imports DevExpress.Data Imports DevExpress.Data
Imports DevExpress.DataAccess.Native.Sql Imports DevExpress.DataAccess.Native.Sql
Imports DevExpress.DataProcessing.InMemoryDataProcessor
Imports DevExpress.Utils Imports DevExpress.Utils
Imports DevExpress.Utils.Automation
Imports DevExpress.XtraBars Imports DevExpress.XtraBars
Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors.Mask Imports DevExpress.XtraEditors.Mask
@@ -376,7 +374,7 @@ Public Class frmValidator
Dim _step = 0 Dim _step = 0
Try Try
' === MESSPUNKT 4: DocumentViewer Init === ' === MESSPUNKT 4: DocumentViewer Init ===
Dim oDVSettings As New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { Dim oDVSettings As New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True, .ShowPrintButton = True,
.ShowRotateButton = True, .ShowRotateButton = True,
.ShowFlipButton = True, .ShowFlipButton = True,
@@ -1440,7 +1438,6 @@ Public Class frmValidator
.SortByColumn = "SEQUENCE" .SortByColumn = "SEQUENCE"
}) })
oSQL = "SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME,T.FORMATTYPE,T.FORMATSTRING, T.ADVANCED_LOOKUP from TBPM_CONTROL_TABLE T WITH (NOLOCK), TBPM_PROFILE_CONTROLS T1 WITH (NOLOCK) WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = " & CURRENT_ProfilGUID & " AND LEN(T.SQL_COMMAND) > 0 ORDER BY T.SEQUENCE" oSQL = "SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME,T.FORMATTYPE,T.FORMATSTRING, T.ADVANCED_LOOKUP from TBPM_CONTROL_TABLE T WITH (NOLOCK), TBPM_PROFILE_CONTROLS T1 WITH (NOLOCK) WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = " & CURRENT_ProfilGUID & " AND LEN(T.SQL_COMMAND) > 0 ORDER BY T.SEQUENCE"
'DT_COLUMNS_GRID_WITH_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTGRID_SQL_DEFINITION", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DT_COLUMNS_GRID_WITH_SQL = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { DT_COLUMNS_GRID_WITH_SQL = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
.FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}",
.SortByColumn = "SEQUENCE" .SortByColumn = "SEQUENCE"
@@ -1465,7 +1462,6 @@ Public Class frmValidator
LEN(T.SQL_COMMAND) > 0 AND LEN(T.SQL_COMMAND) > 0 AND
T.SQL_COMMAND LIKE '%{#CTRL%' T.SQL_COMMAND LIKE '%{#CTRL%'
ORDER BY T.SEQUENCE" ORDER BY T.SEQUENCE"
'DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = DataASorDB.GetDatatable("DD_ECM", oSQL, "DTGRID_SQL_DEFINITION", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER = DatabaseFallback.GetDatatable("DTGRID_SQL_DEFINITION", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
.FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}",
.SortByColumn = "SEQUENCE" .SortByColumn = "SEQUENCE"

View File

@@ -47,7 +47,7 @@ Partial Class frmValidatorSearch
Me.XtraTabPageDoc5 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageDoc5 = New DevExpress.XtraTab.XtraTabPage()
Me.GridControlDocSearch5 = New DevExpress.XtraGrid.GridControl() Me.GridControlDocSearch5 = New DevExpress.XtraGrid.GridControl()
Me.GridViewDocSearch5 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridViewDocSearch5 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer()
Me.SplitContainerSearches = New System.Windows.Forms.SplitContainer() Me.SplitContainerSearches = New System.Windows.Forms.SplitContainer()
Me.XtraTabControlSQL = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControlSQL = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPageSearch1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageSearch1 = New DevExpress.XtraTab.XtraTabPage()
@@ -763,6 +763,6 @@ Partial Class frmValidatorSearch
Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents StatusStrip1 As StatusStrip
Friend WithEvents tsslblSQL As ToolStripStatusLabel Friend WithEvents tsslblSQL As ToolStripStatusLabel
Friend WithEvents SplitContainerControlDoc As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerControlDoc As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DD_DocumentViewer
Friend WithEvents statlbl As ToolStripStatusLabel Friend WithEvents statlbl As ToolStripStatusLabel
End Class End Class

View File

@@ -792,7 +792,7 @@ Public Class frmValidatorSearch
Private Sub frmValidatorSearch_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmValidatorSearch_Load(sender As Object, e As EventArgs) Handles Me.Load
Try Try
DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True, .ShowPrintButton = True,
.ShowRotateButton = True, .ShowRotateButton = True,
.ShowFlipButton = True, .ShowFlipButton = True,