diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index bc13a7d..ce4361f 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -120,7 +120,7 @@ - + diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index c3bbacc..785044a 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -945,6 +945,12 @@ Public Class ClassControlCreator Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP") 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) GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup) diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index 4d3929a..76d6c7a 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -218,7 +218,11 @@ Namespace ControlCreator Try Dim oComboboxDataTable As DataTable = Nothing 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 _Logger.Debug("SQL has no complex patterns!") 'oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId) diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 2b5997e..34b6f61 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -143,8 +143,8 @@ False - - ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewerDD.dll ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll diff --git a/app/TaskFlow/frmAdministration.Designer.vb b/app/TaskFlow/frmAdministration.Designer.vb index b78cb60..dbe7917 100644 --- a/app/TaskFlow/frmAdministration.Designer.vb +++ b/app/TaskFlow/frmAdministration.Designer.vb @@ -1120,7 +1120,7 @@ Partial Class frmAdministration ' Me.SplitContainerControl2.Panel2.Controls.Add(Me.TabControl1) resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") - Me.SplitContainerControl2.SplitterPosition = 286 + Me.SplitContainerControl2.SplitterPosition = 343 ' 'GridControlNavigation ' @@ -1142,7 +1142,7 @@ Partial Class frmAdministration Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia 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.GridControl = Me.GridControlNavigation Me.GridViewProfile.Name = "GridViewProfile" diff --git a/app/TaskFlow/frmAdministration.resx b/app/TaskFlow/frmAdministration.resx index afcbc51..bff3648 100644 --- a/app/TaskFlow/frmAdministration.resx +++ b/app/TaskFlow/frmAdministration.resx @@ -264,6 +264,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + Label20 @@ -414,6 +432,24 @@ 0 + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + Label19 @@ -483,69 +519,6 @@ 0 - - 206, 17 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - - - Label20 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - - - Label19 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel2 - - - 0 - Fill @@ -609,6 +582,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + Label22 @@ -711,6 +705,27 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + Label23 @@ -780,72 +795,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - - - Label22 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel3 - - - 0 - - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - - - Label23 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel4 - - - 0 - Fill @@ -1913,6 +1862,9 @@ Start + + Grundeinstellungen + Grundeinstellungen @@ -2000,12 +1952,6 @@ 0 - - 819, 134 - - - Grundeinstellungen - Fill @@ -2024,18 +1970,6 @@ GridColumn5 - - Profil-Name - - - True - - - 0 - - - 195 - Aktiv @@ -2043,13 +1977,25 @@ True - 1 + 0 - 50 + 40 + + + Profil-Name + + + True + + + 1 + + + 278 - 286, 563 + 343, 563 84 @@ -2132,1023 +2078,9 @@ Top, Bottom, Left, Right - - False - - - False - - - False - - - False - - - False - - - False - True - - Label15 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 0 - - - TYPELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 1 - - - TYPEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 2 - - - lblTargetPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 3 - - - TARGET_PATH_BLIND_FILETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 4 - - - lblDescription - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 5 - - - btnofbAHW - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 6 - - - lblSearch - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 7 - - - Label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 8 - - - Label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 9 - - - FINAL_TEXTTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 10 - - - FINAL_PROFILECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 11 - - - DISPLAY_MODELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 12 - - - DISPLAY_MODEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 13 - - - cmbLOGIndex - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 14 - - - PM_VEKTOR_INDEXComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 15 - - - Label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 16 - - - DESCRIPTIONTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 17 - - - cmbObjekttypen - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 18 - - - WD_SEARCHTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 19 - - - ADDED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 20 - - - CHANGED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 21 - - - ADDED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 22 - - - ADDED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 23 - - - CHANGED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 24 - - - btnWMSuche - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 25 - - - ADDED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 26 - - - CHANGED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 27 - - - btnWMopenSuche - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 28 - - - CHANGED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 29 - - - Tahoma, 9.75pt, style=Bold - - - 4, 22 - - - 3, 3, 3, 3 - - - 980, 432 - - - 0 - - - Allgemeine Profilangaben: - - - TabPage5 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabctrl_Profilkonfig - - - 0 - - - True - - - Top, Bottom, Left, Right - - - 3, 23 - - - 957, 382 - - - 94 - - - Panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 0 - - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 3 - - - 960, 391 - - - 75 - - - Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. - - - Label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 1 - - - Tahoma, 9pt - - - 4, 25 - - - 3, 3, 3, 3 - - - 966, 397 - - - 0 - - - Finale Indexe - - - TabPage11 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 0 - - - False - - - True - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 0 - - - ANNOTATE_WORK_HISTORY_ENTRYCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 1 - - - ANNOTATE_ALL_WORK_HISTORY_ENTRIESCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 2 - - - WORK_HISTORY_ENTRYLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 3 - - - WORK_HISTORY_ENTRYTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - - 4 - - - 4, 25 - - - 3, 3, 3, 3 - - - 966, 397 - - - 1 - - - Nachbearbeitungsfunktionen - - - TabPage12 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl2 - - - 1 - - - Fill - - - Tahoma, 9.75pt, style=Bold - - - 3, 3 - - - 974, 426 - - - 92 - - - TabControl2 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageAfterIndex - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 980, 432 - - - 1 - - - Aktionen nach erfolgreicher Indexierung: - - - TabPageAfterIndex - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabctrl_Profilkonfig - - - 1 - - - 3, 70 - - - 988, 458 - - - 6 - - - tabctrl_Profilkonfig - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 2 - - - 718, 13 - - - 65, 24 - - - 2 - - - Aktiv - - - ACTIVECheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 4 - - - Tahoma, 9.75pt - - - 718, 40 - - - 238, 24 - - - 3 - - - Neueste Dokumente zuerst anzeigen - - - SORT_BY_LATESTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 5 - - - False - - - True - - - 106, 43 - - - 30, 13 - - - 27 - - - Titel: - - - TITLELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 6 - - - False - - - True - - - 106, 16 - - - 64, 13 - - - 2 - - - Profil-Name: - - - NAMELabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 7 - - - 192, 40 - - - 511, 20 - - - 1 - - - TITLETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 8 - - - 192, 13 - - - 511, 20 - - - 0 - - - NAMETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlEdit - - - 9 - - - Fill - - - 3, 3 - - - 996, 531 - - - 28 - - - pnlEdit - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage1 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1002, 537 - - - 0 - - - Profil-Verwaltung - - - TabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 0 - - - TabControlProfilZuordnung - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1002, 537 - - - 1 - - - Profil-Zuordnung - - - TabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 1 - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 0 - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 1002, 537 - - - 2 - - - Dashboard - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 1010, 563 - - - 3 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerControl2.Panel2 - - - 0 - - - Panel2 - - - SplitContainerControl2.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2 - - - 1 - - - 1306, 563 - - - 85 - - - SplitContainerControl2 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - pnlMain - - - 0 - True @@ -4019,57 +2951,126 @@ 29 - - MOVE2FOLDERTextBox + + Tahoma, 9.75pt, style=Bold - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 22 - - GroupBox3 + + 3, 3, 3, 3 - + + 940, 415 + + 0 - - btnmovetoFolderDialog + + Allgemeine Profilangaben: - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TabPage5 - - GroupBox3 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tabctrl_Profilkonfig + + + 0 + + + True + + + Top, Bottom, Left, Right + + + 3, 23 + + + 957, 382 + + + 94 + + + Panel5 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 0 + + + Fill + + + Segoe UI, 9.75pt, style=Italic + + + 3, 3 + + + 960, 391 + + + 75 + + + Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierten Dokument gesetzt. + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + 1 - - Tahoma, 9.75pt + + Tahoma, 9pt - - 9, 6 + + 4, 25 - - 941, 57 + + 3, 3, 3, 3 - - 74 + + 966, 397 - - Wählen Sie hier einen Ordner, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage12 - - + 0 + + Finale Indexe + + + TabPage11 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 0 + + + True + Segoe UI, 9pt @@ -4124,6 +3125,33 @@ 1 + + Tahoma, 9.75pt + + + 9, 6 + + + 941, 57 + + + 74 + + + Wählen Sie hier einen Ordner, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage12 + + + 0 + Tahoma, 9.75pt @@ -4232,52 +3260,310 @@ 4 - - TabPage7 + + 4, 25 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 3 - - TabControlProfilZuordnung + + 966, 397 - - 0 - - - TabPage8 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControlProfilZuordnung - - + 1 - + + Nachbearbeitungsfunktionen + + + TabPage12 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl2 + + + 1 + + Fill - + + Tahoma, 9.75pt, style=Bold + + 3, 3 - - 996, 531 + + 974, 426 - - 1 + + 92 - - TabControlProfilZuordnung + + TabControl2 - + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage2 + + TabPageAfterIndex - + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 980, 432 + + + 1 + + + Aktionen nach erfolgreicher Indexierung: + + + TabPageAfterIndex + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabctrl_Profilkonfig + + + 1 + + + 3, 70 + + + 948, 441 + + + 6 + + + tabctrl_Profilkonfig + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 2 + + + 718, 13 + + + 65, 24 + + + 2 + + + Aktiv + + + ACTIVECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 4 + + + Tahoma, 9.75pt + + + 718, 40 + + + 238, 24 + + + 3 + + + Neueste Dokumente zuerst anzeigen + + + SORT_BY_LATESTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 5 + + + False + + + True + + + 106, 43 + + + 30, 13 + + + 27 + + + Titel: + + + TITLELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 6 + + + False + + + True + + + 106, 16 + + + 64, 13 + + + 2 + + + Profil-Name: + + + NAMELabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 7 + + + 192, 40 + + + 511, 20 + + + 1 + + + TITLETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 8 + + + 192, 13 + + + 511, 20 + + + 0 + + + NAMETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlEdit + + + 9 + + + Fill + + + 3, 3 + + + 939, 531 + + + 28 + + + pnlEdit + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 945, 537 + + + 0 + + + Profil-Verwaltung + + + TabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + 0 @@ -4334,501 +3620,60 @@ 1 + + Fill + + + 3, 3 + + + 996, 531 + + + 1 + + + TabControlProfilZuordnung + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1002, 537 + + + 1 + + + Profil-Zuordnung + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + Top, Bottom, Left, Right - - Label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 0 - - - Button4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 1 - - - Button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 2 - - - Button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 3 - - - Button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 4 - - - Series4Sequence - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 5 - - - Series3Sequence - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 6 - - - Series2Sequence - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 7 - - - Series1Sequence - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 8 - - - Series4Title - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 9 - - - Series4SQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 10 - - - Series4Column - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 11 - - - Series4Type - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 12 - - - Series4Argument - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 13 - - - Series4GUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 14 - - - Series3Title - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 15 - - - Series3SQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 16 - - - Series3Column - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 17 - - - Series3Type - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 18 - - - Series3Argument - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 19 - - - Series3GUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 20 - - - Series2Title - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 21 - - - Series2SQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 22 - - - Series2Column - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 23 - - - Series2Type - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 24 - - - Series2Argument - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 25 - - - Series2GUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 26 - - - Series1Title - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 27 - - - Label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 28 - - - Series1SQL - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 29 - - - Series1Column - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 30 - - - Label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 31 - - - Series1Type - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 32 - - - Label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 33 - - - Series1Argument - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 34 - - - Label10 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 35 - - - Series1GUID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 36 - - - Label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 37 - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox2 - - - 38 - - - 6, 89 - - - 0, 0 - - - 1 - - - Chart 1-4 - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 0 - True @@ -5819,65 +4664,29 @@ 38 - - Label5 + + 6, 89 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - GroupBox1 - - - 0 - - - Label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox1 - - + 1 - - Label1 + + Chart 1-4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox2 - - GroupBox1 - - - 2 - - - 6, 6 - - - 984, 77 - - - 0 - - - Verteilung und Top Kreditoren - - - GroupBox1 - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + TabPage3 - - 1 + + 0 True @@ -5968,6 +4777,114 @@ Top Kreditoren: 2 + + 6, 6 + + + 984, 77 + + + 0 + + + Verteilung und Top Kreditoren + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 1002, 537 + + + 2 + + + Dashboard + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 953, 563 + + + 3 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerControl2.Panel2 + + + 0 + + + Panel2 + + + SplitContainerControl2.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2 + + + 1 + + + 1306, 563 + + + 85 + + + SplitContainerControl2 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v25.2, Version=25.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + pnlMain + + + 0 + 1669, 17 diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 35f4623..117d579 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -1726,7 +1726,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAfABDAHwAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfgBDAH4AQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 3f834b0..2602b62 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -1608,7 +1608,7 @@ Public Class frmMain ' Overlay nur anzeigen, wenn die Anwendung aktuell den Fokus hat Dim appHasFocus As Boolean = Application.OpenForms().Cast(Of Form)().Any(Function(f) f.ContainsFocus) If Not _overlayActive AndAlso appHasFocus Then - oHandle = SplashScreenManager.ShowOverlayForm(Me) + oHandle = SplashScreenManager.ShowOverlayForm(GridControlWorkflows) _overlayActive = True overlayStartedHere = True Else @@ -2297,7 +2297,7 @@ Public Class frmMain ' ========== OVERLAY ANZEIGEN ========== If Not _overlayActive Then - oHandle = SplashScreenManager.ShowOverlayForm(Me) + oHandle = SplashScreenManager.ShowOverlayForm(GridControlWorkflows) _overlayActive = True overlayStartedHere = True End If diff --git a/app/TaskFlow/frmMonitor.Designer.vb b/app/TaskFlow/frmMonitor.Designer.vb index 8ae79d8..88e065b 100644 --- a/app/TaskFlow/frmMonitor.Designer.vb +++ b/app/TaskFlow/frmMonitor.Designer.vb @@ -47,7 +47,7 @@ Partial Class frmMonitor Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() 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() CType(Me.RibbonControl1, 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 BarStaticItemInfoDoc 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 End Class diff --git a/app/TaskFlow/frmMonitor.vb b/app/TaskFlow/frmMonitor.vb index 03ef936..5ce7e3a 100644 --- a/app/TaskFlow/frmMonitor.vb +++ b/app/TaskFlow/frmMonitor.vb @@ -259,7 +259,7 @@ Public Class frmMonitor LOGGER.Debug($"Attention: No Column FULL_FILE_PATH in GridView1") End 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, .ShowRotateButton = True, .ShowFlipButton = True, diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index a20b285..89834cf 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -34,7 +34,7 @@ Partial Class frmValidator Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() Me.DESCRIPTIONLabel = 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.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() @@ -919,7 +919,7 @@ Partial Class frmValidator Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents bsiInfo1 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 RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index eb57c96..37e2444 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -616,7 +616,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.5.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DD_DocumentViewer, DigitalData.Controls.DocumentViewerDD, Version=2.7.5.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 6590be9..447bcff 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -10,9 +10,7 @@ Imports System.Text.RegularExpressions Imports System.Threading Imports DevExpress.Data Imports DevExpress.DataAccess.Native.Sql -Imports DevExpress.DataProcessing.InMemoryDataProcessor Imports DevExpress.Utils -Imports DevExpress.Utils.Automation Imports DevExpress.XtraBars Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors.Mask @@ -376,7 +374,7 @@ Public Class frmValidator Dim _step = 0 Try ' === 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, .ShowRotateButton = True, .ShowFlipButton = True, @@ -1440,7 +1438,6 @@ Public Class frmValidator .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" - '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 { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" @@ -1465,7 +1462,6 @@ Public Class frmValidator LEN(T.SQL_COMMAND) > 0 AND T.SQL_COMMAND LIKE '%{#CTRL%' 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 { .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}", .SortByColumn = "SEQUENCE" diff --git a/app/TaskFlow/frmValidatorSearch.Designer.vb b/app/TaskFlow/frmValidatorSearch.Designer.vb index 089a54e..f8205b7 100644 --- a/app/TaskFlow/frmValidatorSearch.Designer.vb +++ b/app/TaskFlow/frmValidatorSearch.Designer.vb @@ -47,7 +47,7 @@ Partial Class frmValidatorSearch Me.XtraTabPageDoc5 = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch5 = New DevExpress.XtraGrid.GridControl() 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.XtraTabControlSQL = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageSearch1 = New DevExpress.XtraTab.XtraTabPage() @@ -763,6 +763,6 @@ Partial Class frmValidatorSearch Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents tsslblSQL As ToolStripStatusLabel 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 End Class diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb index 032ae67..5989148 100644 --- a/app/TaskFlow/frmValidatorSearch.vb +++ b/app/TaskFlow/frmValidatorSearch.vb @@ -792,7 +792,7 @@ Public Class frmValidatorSearch Private Sub frmValidatorSearch_Load(sender As Object, e As EventArgs) Handles Me.Load 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, .ShowRotateButton = True, .ShowFlipButton = True,