18 Commits

Author SHA1 Message Date
Developer01
8704691d4c Wenn Wert von DGV Zelle nicht Teil des Selects war wurde Zelle ungültig gezeichnet. Behoben und Finalisiert und an WISAG ausgeliefert, 2026-02-09 07:56:01 +01:00
Developer01
2a781f0be7 2.8.0 2026-02-05 17:00:03 +01:00
Developer01
034ca839ba 2.7.9 an WISAG ausgegeben 2026-02-05 16:58:19 +01:00
Developer01
05c4ee9f41 Bug Speichern Inherit Value und ReadOnly Columns 2026-02-02 16:58:04 +01:00
Developer01
83e31a2e00 Geschwindigkeitsoptimierungen Main 2026-02-02 11:44:17 +01:00
Developer01
bca424f50f Optimierungen 2026-01-30 14:40:02 +01:00
Developer01
11d27cd860 Create_Basic_View 2026-01-30 13:02:55 +01:00
Developer01
969f27a91f frm main Load Grid Optimierung 2026-01-30 13:00:16 +01:00
Developer01
b7d427b5eb Decide_Load_Speed 2026-01-30 12:56:36 +01:00
Developer01
0f936c71e6 Speed Otimizing Lookp etc 2026-01-30 12:53:01 +01:00
Developer01
a53bfee8d5 ComboBOx Optimierung 2026-01-30 12:13:08 +01:00
Developer01
df4a8df25a Optimierung Speed Load_Next Document 2026-01-30 12:09:21 +01:00
Developer01
0e6848aa69 Hotspots 2026-01-30 11:23:35 +01:00
Developer01
72b1e4acba Vererbung Tabelle Finalisierung 2026-01-30 09:01:47 +01:00
Developer01
c249aa890d Messpunkte integriert 2026-01-29 10:46:09 +01:00
Developer01
f1984572b7 2.7.7 2026-01-28 21:48:44 +01:00
Developer01
ce50bc2964 Vererbung Werte 1 2026-01-28 21:47:49 +01:00
Developer01
2a8beead00 Logging bzgl AdditionalTitle 2026-01-12 13:16:08 +01:00
42 changed files with 4511 additions and 2021 deletions

View File

@@ -7,6 +7,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "..\..\..\2_DLL Projekte\Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -61,6 +63,26 @@ Global
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.ActiveCfg = Debug|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.Build.0 = Debug|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.Build.0 = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.ActiveCfg = Release|Any CPU
{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -230,7 +230,7 @@
<value>0, 0</value>
</setting>
<setting name="frmValSearchSplitterDistance" serializeAs="String">
<value>513</value>
<value>346</value>
</setting>
<setting name="frmMainWindowState" serializeAs="String">
<value>Normal</value>

View File

@@ -1,6 +1,5 @@
Imports System.ComponentModel
Imports System.Text.RegularExpressions
Imports DD_LIB_Standards
Imports DevExpress.Utils
Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors.Controls
@@ -11,13 +10,10 @@ Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraGrid.Views.Base
Imports DevExpress.XtraGrid.Views.Grid
Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.Language.DataTableEx
Imports DigitalData.Modules.Base
Public Class ClassControlCreator
@@ -93,7 +89,7 @@ Public Class ClassControlCreator
Public Attribute As String
Public [ReadOnly] As Boolean = False
Public BackColor As Color = Color.White
Public Property IsDirty As Boolean = False
End Class
Public Sub New(pLogConfig As LogConfig)
@@ -332,7 +328,7 @@ Public Class ClassControlCreator
End If
If Not designMode Then
'oControl.ReadOnly = oReadOnly
oControl.ReadOnly = oReadOnly
oControl.TabStop = Not oReadOnly
oControl.BackColor = IIf(oReadOnly, Color.LightGray, Color.White)
@@ -362,7 +358,7 @@ Public Class ClassControlCreator
Try
oControl.Text = row.Item("CTRL_CAPTION_LANG")
Catch ex As Exception
Logger.Warn("Label [{0}] does not have a translation!", oControl.Name)
Logger.Warn("⚠️ Label [{0}] does not have a translation!", oControl.Name)
oControl.Text = row.Item("CTRL_TEXT")
End Try
Dim oAlignment = row.ItemEx("TEXT_ALIGNMENT", "Near")
@@ -541,7 +537,7 @@ Public Class ClassControlCreator
Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode)
Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid
Dim oView As GridView
Dim oControlName = oControl.Name
oControl.ForceInitialize()
@@ -808,7 +804,6 @@ Public Class ClassControlCreator
Public Function GridTables_GetRepositoryItemForColumn(pColumnName As String, pDataTable As DataTable, pIsAdvancedLookup As Boolean) As RepositoryItem
If pIsAdvancedLookup Then
Dim oEditor = New RepositoryItemLookupControl3
If pDataTable IsNot Nothing Then
@@ -817,18 +812,34 @@ Public Class ClassControlCreator
oEditor.DataSource = pDataTable
End If
' Erlaube ungültige Werte (verhindert automatisches Löschen)
oEditor.NullText = "[Ungültiger Wert]"
oEditor.ShowFooter = False
oEditor.AllowNullInput = DefaultBoolean.True
oEditor.ValidateOnEnterKey = True
' KRITISCH: Erlaube Texteingabe für ungültige Werte
oEditor.TextEditStyle = TextEditStyles.Standard
' Weitere Standard-Eigenschaften für LookupControl3
'oEditor.ImmediatePopup = False
Return oEditor
Else
Dim oEditor = New RepositoryItemComboBox()
Dim oItems As New List(Of String)
AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
If oItems.Contains(_sender.EditValue) Then
_e.Cancel = False
Else
_e.Cancel = True
End If
' KRITISCH: Erlaube Anzeige ungültiger Werte
oEditor.TextEditStyle = TextEditStyles.Standard ' Statt DisableTextEditor!
oEditor.AllowNullInput = DefaultBoolean.True
oEditor.ValidateOnEnterKey = True
AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
' Prüfe nur bei Änderung, nicht beim Anzeigen
If Not oItems.Contains(_sender.EditValue) AndAlso _sender.IsModified Then
_e.Cancel = True
_sender.ErrorText = "Ungültiger Wert - bitte neu auswählen"
End If
End Sub
If pDataTable IsNot Nothing Then
@@ -850,7 +861,6 @@ Public Class ClassControlCreator
Return oEditor
End If
End Function
Public Sub GridTables_HandleControlValueChange(pControlPanel As XtraScrollableControl, pColumnsWithSqlAndControlPlaceholders As DataTable)
If Not IsNothing(pColumnsWithSqlAndControlPlaceholders) AndAlso pColumnsWithSqlAndControlPlaceholders.Rows.Count > 0 Then
For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows

View File

@@ -156,7 +156,7 @@ Public Class ClassFinalizeDoc
End If
Return indexierung_erfolgreich
Catch ex As Exception
LOGGER.Warn("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString)
LOGGER.Warn("⚠️ Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString)
Return False
End Try

View File

@@ -1,11 +1,12 @@
Imports DLLLicenseManager
Imports DigitalData.Modules.Logging
Imports System.Windows.Forms.VisualStyles.VisualStyleElement
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.Database
Imports System.Windows.Forms.VisualStyles.VisualStyleElement
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.Logging
Imports DLLLicenseManager
Imports DocumentFormat.OpenXml.Spreadsheet
Public Class ClassInit
Public _lizenzManager As ClassLicenseManager
@@ -20,21 +21,16 @@ Public Class ClassInit
My.Application.Info.CompanyName,
My.Application.Info.ProductName)
LOGGER = LOGCONFIG.GetLogger("taskFLOW")
LOGGER.Info("## taskFLOW started - {0}", Now)
Try
Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
For Each file As IO.FileInfo In directory.GetFiles
If (Now - file.CreationTime).Days > 29 Then
file.Delete()
Else
Exit For
End If
Next
Catch ex As Exception
@@ -59,6 +55,15 @@ Public Class ClassInit
CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
LOGGER.Info("ConfigManager loaded")
LOGGER.Info($"oUserAppDataPath will be: {oUserAppDataPath}")
If oStartupPath <> oCommonAppDataPath Then
LOGGER.Info($"oCommonAppDataPath will be: {oCommonAppDataPath}")
LOGGER.Info($"oStartupPath will be: {oStartupPath}")
Else
LOGGER.Info($"oStartupPath is the same as oCommonAppDataPath: {oCommonAppDataPath}")
End If
Try
If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then
LOGGER.Debug("Test Connection String loaded")
@@ -85,11 +90,11 @@ Public Class ClassInit
LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!")
Else
LOGGER.Warn($"#### !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###")
LOGGER.Warn($"#### ⚠️ !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###")
End If
End If
Catch ex As Exception
LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}")
LOGGER.Warn($"⚠️ Could not initialize the AppServer: {ex.Message}")
End Try
Else
@@ -244,12 +249,12 @@ Public Class ClassInit
Try
oLICDATE = CDate(split(1))
Catch ex As Exception
LOGGER.Warn($"Error Converting Value {split(1)} to DATE")
LOGGER.Warn($"⚠️ Error Converting Value {split(1)} to DATE")
Try
Dim expenddt As Date = Date.ParseExact(split(1), "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
oLICDATE = expenddt
Catch ex1 As Exception
LOGGER.Warn($"Second Error Converting DATE with ParseExact - Setting Date = Today")
LOGGER.Warn($"⚠️Second Error Converting DATE with ParseExact - Setting Date = Today")
oLICDATE = Now.Date
End Try
@@ -329,9 +334,8 @@ Public Class ClassInit
LOGGER.Debug("Username: " & USER_USERNAME)
Dim oFnct As New RefreshHelper.SW("FNDD_LOGIN_USER_MODULE")
oSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED)
Dim DT_CHECKUSER_MODULE As DataTable
DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
.FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'"
})
@@ -357,6 +361,7 @@ Public Class ClassInit
USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
USER_MODULE_ID = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ID")
USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
@@ -386,7 +391,7 @@ Public Class ClassInit
USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL"))
Catch ex As Exception
LOGGER.Warn("Error in USER_RIGHT_FILE_DELETE: " & ex.Message)
LOGGER.Warn("⚠️ Error in USER_RIGHT_FILE_DELETE: " & ex.Message)
USER_RIGHT_FILE_DELETE = False
End Try
USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
@@ -526,7 +531,10 @@ Public Class ClassInit
oSql = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
BASEDATA_TBDD_COLUMNS_FORMAT = DatabaseFallback.GetDatatable("TBDD_COLUMNS_FORMAT", New GetDatatableOptions(oSql, DatabaseType.ECM))
oStopWatch.Done()
Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Info($"Unexpected Error in InitBasics - last Step [{oStep}]: {ex.Message}", True)
@@ -547,6 +555,48 @@ Public Class ClassInit
LOGGER.Warn($"no profiles for user: '{USER_USERNAME}' configured - Check SQL [{oSql}]!", False)
End If
oSql = "SELECT KEY_NAME, VALUE_TEXT1
FROM TBDD_USER_KEY_VALUE_PAIR
WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "'"
Dim oDT_USER_KEY_VALUE_PAIR As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSql, DatabaseType.ECM))
If UserInheritance_ConfirmationByColumn Is Nothing Then
UserInheritance_ConfirmationByColumn = New List(Of UserInheritanceConfirmation)()
End If
If Not IsNothing(oDT_USER_KEY_VALUE_PAIR) Then
For Each row As DataRow In oDT_USER_KEY_VALUE_PAIR.Rows
Dim keyName As String = row("KEY_NAME").ToString()
' Prüfe ob es sich um einen Inheritance-Key handelt
If keyName.StartsWith("INHERITANCE_CONFIRM_") Then
Dim columnName As String = keyName.Replace("INHERITANCE_CONFIRM_", "")
Dim countValue As Integer = Integer.Parse(row("VALUE_TEXT1").ToString())
Dim existingEntry = UserInheritance_ConfirmationByColumn.FirstOrDefault(
Function(e) String.Equals(e.ColumnName, columnName, StringComparison.OrdinalIgnoreCase))
If existingEntry IsNot Nothing Then
existingEntry.Count = countValue
Else
UserInheritance_ConfirmationByColumn.Add(
New UserInheritanceConfirmation With {
.ColumnName = columnName,
.Count = countValue
})
End If
LOGGER.Debug("Loaded inheritance confirmation for column [{0}] with count [{1}]", columnName, countValue)
End If
Next
Else
LOGGER.Warn("⚠️ oDT_USER_KEY_VALUE_PAIR is nothing")
End If
oStopWatch.Done()
Catch ex As Exception
LOGGER.Error(ex)

View File

@@ -2,6 +2,7 @@
Public Class ClassParamRefresh
Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable)
LOGGER.Debug("Refresh_Params starting ...")
Dim oStopwatch As New RefreshHelper.SW("Refresh_Params")
FORCE_LAYOUT_OVERVIEW = False
SHOW_CHARTS = True
@@ -28,16 +29,18 @@ Public Class ClassParamRefresh
End If
End If
LOGGER.Debug("Refresh_Params BASEDATA_DT_TBDD_SQL_COMMANDS done!")
If DT_CHECKUSER.Rows.Count = 1 Then
If oLicenseoverSQL = False Then
USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN")
LOGGER.Debug(String.Format("Refresh_Params USERCOUNT_LOGGED_IN {0}", USERCOUNT_LOGGED_IN.ToString))
End If
Try
WORKING_MODE = DT_CHECKUSER.Rows(0).Item("WORKING_MODE")
LOGGER.Debug(String.Format("Refresh_Params WORKING_MODE {0}", WORKING_MODE.ToString))
Catch ex As Exception
WORKING_MODE = ""
End Try
@@ -47,6 +50,7 @@ Public Class ClassParamRefresh
If ADDITIONAL_TITLE = String.Empty Then
ADDITIONAL_TITLE = My.Application.Info.ProductName
End If
LOGGER.Debug(String.Format("Refresh_Params ADDITIONAL_TITLE {0}", ADDITIONAL_TITLE.ToString))
Catch ex As Exception
ADDITIONAL_TITLE = My.Application.Info.ProductName
End Try
@@ -69,6 +73,8 @@ Public Class ClassParamRefresh
ElseIf oMode = "PM.DEBUG_LOG" Then
DEBUG = True
LOGCONFIG.Debug = True
ElseIf oMode = "PM.LOG_HOTSPOTS" Then
LOG_HOTSPOTS = True
ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
@@ -215,6 +221,28 @@ Public Class ClassParamRefresh
Catch ex As Exception
TITLE_NOTIFICATIONS = ""
End Try
ElseIf oMode.StartsWith("TF.InheritanceMsgAmount") Then
Dim oParam = oMode.Replace("TF.InheritanceMsgAmount=", "")
Try
InheritanceMsgAmount = oParam
Catch ex As Exception
End Try
ElseIf oMode.StartsWith("TF.InheritanceCalcReset") Then
Dim oParam = oMode.Replace("TF.InheritanceCalcReset=", "")
Try
If CBool(oParam) = True Then
LOGGER.Info("Inheritance_Counts werden auf 0 zurückgesetzt bzw gelöscht")
Dim oDELETESQL = "DELETE FROM TBDD_USER_KEY_VALUE_PAIR
WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "' AND KEY_NAME LIKE 'INHERITANCE_CONFIRM_%'"
DatabaseECM.ExecuteNonQuery(oDELETESQL)
UserInheritance_ConfirmationByColumn = Nothing
CONFIG.Save()
End If
Catch ex As Exception
End Try
ElseIf oMode.StartsWith("PM.START_CW") Then
Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
Try

View File

@@ -211,7 +211,7 @@ LOGGER.Error(ex)
Public Function GetTypeOfIndex(ByVal indexname As String) As Integer
Try
If IsNothing(Me.oSession) Then
LOGGER.Warn("GetTypeOfIndex: WMSession is nothing")
LOGGER.Warn("⚠️ GetTypeOfIndex: WMSession is nothing")
Return Nothing
End If
Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
@@ -272,7 +272,7 @@ LOGGER.Error(ex)
Public Function GetIndicesByObjecttype(ByVal Objecttype_name As String) As String()
Try
If IsNothing(Me.oSession) Then
LOGGER.Warn("GetIndicesByObjecttype: WMSession is nothing")
LOGGER.Warn("⚠️ GetIndicesByObjecttype: WMSession is nothing")
Return Nothing
End If
Dim oObjectType As WMObject
@@ -325,7 +325,7 @@ LOGGER.Error(ex)
Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
Try
If IsNothing(Me.oSession) Then
LOGGER.Warn("GetObjecttypeByName: WMSession is nothing")
LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing")
Return Nothing
End If
' alle Objekttypen auslesen

View File

@@ -15,6 +15,7 @@ Imports System.Text.RegularExpressions
Imports System.Globalization
Imports DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper
Imports DevExpress.XtraEditors.Mask
Imports System.Windows.Forms
Namespace ControlCreator
Public Class GridControl
@@ -69,7 +70,7 @@ Namespace ControlCreator
Dim oConnectionId As Integer = oRow.ItemEx("CONNECTION_ID", 0)
Dim oSqlCommand As String = oRow.ItemEx("SQL_COMMAND", "")
If oConnectionId > 0 And oSqlCommand <> "" Then
If oSqlCommand <> "" Then
Try
Dim oComboboxDataTable As DataTable = Nothing
Dim oColumnName As String = oRow.Item("SPALTENNAME")
@@ -92,7 +93,7 @@ Namespace ControlCreator
_GridTables.Item(pControlId).Add(oColumnName, oRepositoryItem)
End If
Catch ex As Exception
_Logger.Warn("Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), pControlName)
_Logger.Warn("⚠️ Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), pControlName)
_Logger.Error(ex)
End Try
End If
@@ -168,6 +169,18 @@ Namespace ControlCreator
Dim oSequence As Integer = oColumnData.Item("SEQUENCE")
oCol.VisibleIndex = oSequence
' READ_ONLY Eigenschaft verarbeiten
Dim oIsReadOnly As Boolean = False
Dim oReadOnlyValue = ObjectEx.NotNull(oColumnData.Item("READ_ONLY"), False)
If TypeOf oReadOnlyValue Is Boolean Then
oIsReadOnly = CBool(oReadOnlyValue)
Else
Dim oReadOnlyInt As Integer
oIsReadOnly = Integer.TryParse(oReadOnlyValue.ToString(), oReadOnlyInt) AndAlso oReadOnlyInt = 1
End If
oCol.OptionsColumn.AllowEdit = Not oIsReadOnly
Dim oColumnType As String = oColumnData.Item("TYPE_COLUMN")
Select Case oColumnType
@@ -308,7 +321,7 @@ Namespace ControlCreator
End If
Next
Catch ex As Exception
_Logger.Warn("Error in CustomRowCellEdit for [{0}]", e.CellValue)
_Logger.Warn("⚠️ Error in CustomRowCellEdit for [{0}]", e.CellValue)
_Logger.Error(ex)
End Try
End Sub
@@ -351,8 +364,8 @@ Namespace ControlCreator
End If
Dim oColumnData As DataRow = pColumnDefinition.
Select($"SPALTENNAME = '{pArgs.Column.FieldName}'").
FirstOrDefault()
Select($"SPALTENNAME = '{pArgs.Column.FieldName}'").
FirstOrDefault()
If oColumnData Is Nothing Then
Return
@@ -377,31 +390,139 @@ Namespace ControlCreator
Return
End If
' Benutzerbestätigung für Wertvererbung
Dim valueToApply = pArgs.Value
Dim affectedRowsCount = pView.DataRowCount - listIndex - 1
Dim confirmationEntry = GetInheritanceConfirmationEntry(pArgs.Column.FieldName)
If affectedRowsCount > 0 AndAlso confirmationEntry.Count < InheritanceMsgAmount Then
Dim confirmMessage As String = String.Format(
"Möchten Sie den Wert '{0}' an {1} nachfolgende Zeile(n) vererben?",
valueToApply,
affectedRowsCount)
If USER_LANGUAGE <> "de-DE" Then
confirmMessage = String.Format(
"Do you want to inherit the value '{0}' to {1} subsequent row(s)?",
valueToApply,
affectedRowsCount)
End If
Dim confirmTitle As String = "Wertevererbung bestätigen"
If USER_LANGUAGE <> "de-DE" Then
confirmTitle = "Confirm Value Inheritance"
End If
Dim result = MessageBox.Show(
confirmMessage,
confirmTitle,
MessageBoxButtons.YesNo,
MessageBoxIcon.Question,
MessageBoxDefaultButton.Button1)
If result <> DialogResult.Yes Then
_Logger.Debug("User cancelled value inheritance")
Return
End If
confirmationEntry.Count += 1
CONFIG.Save()
_Logger.Info("User confirmed value inheritance. Confirmation count: {0}", confirmationEntry.Count)
ElseIf affectedRowsCount > 0 AndAlso confirmationEntry.Count = InheritanceMsgAmount Then
' Schwellenwert erreicht - User fragen, ob er weiterhin gefragt werden möchte
Dim continueAskingMessage As String = "Sie haben diese Bestätigung bereits mehrfach durchgeführt. Möchten Sie in Zukunft weiterhin gefragt werden?"
If USER_LANGUAGE <> "de-DE" Then
continueAskingMessage = "You have confirmed this action multiple times. Do you want to continue being asked in the future?"
End If
Dim continueAskingTitle As String = "Bestätigungen fortsetzen?"
If USER_LANGUAGE <> "de-DE" Then
continueAskingTitle = "Continue Confirmations?"
End If
Dim continueResult = MessageBox.Show(
continueAskingMessage,
continueAskingTitle,
MessageBoxButtons.YesNo,
MessageBoxIcon.Question,
MessageBoxDefaultButton.Button2)
If continueResult = DialogResult.Yes Then
' User möchte weiterhin gefragt werden - Counter zurücksetzen
confirmationEntry.Count = 0
CONFIG.Save()
_Logger.Info("User wants to continue being asked. Counter reset to 0.")
Else
' User möchte nicht mehr gefragt werden - Counter erhöhen
confirmationEntry.Count += 1
CONFIG.Save()
_Logger.Info("User does not want to be asked anymore. Counter increased to {0}.", confirmationEntry.Count)
End If
ElseIf affectedRowsCount > 0 Then
_Logger.Info("Skipping confirmation dialog (already confirmed {0} times)", confirmationEntry.Count)
End If
isApplyingInheritedValue = True
Try
Dim valueToApply = pArgs.Value
_Logger.Debug(String.Format("Inherit Value is active for column. So inheritting the value [{0}]...", valueToApply))
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
Dim targetHandle = pView.GetRowHandle(dataIndex)
If targetHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse pView.IsGroupRow(targetHandle) Then
Continue For
End If
_Logger.Info(String.Format("Inherit Value is active for column. So inheritting the value [{0}]...", valueToApply))
If pView.IsNewItemRow(targetHandle) Then
Exit For
End If
' Batch-Update mit BeginUpdate/EndUpdate für bessere Performance
pView.BeginUpdate()
Try
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
Dim targetHandle = pView.GetRowHandle(dataIndex)
If targetHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse pView.IsGroupRow(targetHandle) Then
Continue For
End If
Dim existingValue = pView.GetRowCellValue(targetHandle, pArgs.Column.FieldName)
If Equals(existingValue, valueToApply) Then
Continue For
End If
If pView.IsNewItemRow(targetHandle) Then
Exit For
End If
Dim existingValue = pView.GetRowCellValue(targetHandle, pArgs.Column.FieldName)
If Equals(existingValue, valueToApply) Then
Continue For
End If
pView.SetRowCellValue(targetHandle, pArgs.Column.FieldName, valueToApply)
Next
' WICHTIG: Nach dem Setzen der Werte die Spalte neu zeichnen
pView.LayoutChanged()
' Nur die betroffene Spalte invalidieren (effizienter als alle Zeilen)
For dataIndex As Integer = listIndex + 1 To pView.DataRowCount - 1
Dim targetHandle = pView.GetRowHandle(dataIndex)
If targetHandle <> DevExpress.XtraGrid.GridControl.InvalidRowHandle AndAlso Not pView.IsNewItemRow(targetHandle) Then
pView.InvalidateRowCell(targetHandle, pArgs.Column)
End If
Next
Finally
pView.EndUpdate()
End Try
pView.SetRowCellValue(targetHandle, pArgs.Column.FieldName, valueToApply)
Next
Finally
isApplyingInheritedValue = False
End Try
End Sub
Private Function GetInheritanceConfirmationEntry(columnName As String) As UserInheritanceConfirmation
Dim entries = UserInheritance_ConfirmationByColumn
If entries Is Nothing Then
entries = New List(Of UserInheritanceConfirmation)()
UserInheritance_ConfirmationByColumn = entries
End If
Dim entry = entries.FirstOrDefault(Function(item) String.Equals(item.ColumnName, columnName, StringComparison.OrdinalIgnoreCase))
If entry Is Nothing Then
entry = New UserInheritanceConfirmation With {
.ColumnName = columnName,
.Count = 0
}
entries.Add(entry)
End If
Return entry
End Function
Private Sub View_CustomColumnDisplayText(ByVal eSender As Object, ByVal e As CustomColumnDisplayTextEventArgs)
If IsNothing(e.Value) Then
Exit Sub
@@ -423,21 +544,21 @@ Namespace ControlCreator
Dim oColumnName As String = oFocusedColumn.FieldName
If e.MenuType = GridMenuType.Column AndAlso oColumnType Is GetType(Boolean) Then
e.Menu.Items.Add(New Menu.DXMenuItem(
e.Menu.Items.Add(New DevExpress.Utils.Menu.DXMenuItem(
"Alle Zeilen anhaken",
Sub(_sender As Object, _e As EventArgs)
SetCellValuesForBooleanColumn(view, oColumnName, True)
End Sub,
My.Resources.itemtypechecked,
Menu.DXMenuItemPriority.Normal))
DevExpress.Utils.Menu.DXMenuItemPriority.Normal))
e.Menu.Items.Add(New Menu.DXMenuItem(
e.Menu.Items.Add(New DevExpress.Utils.Menu.DXMenuItem(
"Alle Zeilen abhaken",
Sub(_sender As Object, _e As EventArgs)
SetCellValuesForBooleanColumn(view, oColumnName, False)
End Sub,
My.Resources.itemtypechecked,
Menu.DXMenuItemPriority.Normal))
DevExpress.Utils.Menu.DXMenuItemPriority.Normal))
End If
End Sub

View File

@@ -21527,12 +21527,12 @@ Namespace DD_DMSLiteDataSetTableAdapters
"ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQU"& _
"ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _
"OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT"& _
"_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = 'INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"@LU_CAPTION'"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _
"ERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SP"& _
"ALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND"& _
", READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, R"& _
"EGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCE"& _
"D_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)"
"_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = @LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID "& _
"= @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SP"& _
"ALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOA"& _
"D_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGE"& _
"X_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TB"& _
"PM_CONTROL_TABLE WHERE (GUID = @GUID)"
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21556,6 +21556,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADVANCED_LOOKUP", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ADVANCED_LOOKUP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
End Sub
@@ -21839,6 +21840,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
ByVal ADVANCED_LOOKUP As Boolean, _
ByVal SAVE_CHANGE_ON_ENABLED As Object, _
ByVal INHERIT_VALUE As Boolean, _
ByVal LU_CAPTION As String, _
ByVal Original_GUID As Integer, _
ByVal GUID As Integer) As Integer
Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer)
@@ -21915,8 +21917,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
Me.Adapter.UpdateCommand.Parameters(20).Value = CType(SAVE_CHANGE_ON_ENABLED,Object)
End If
Me.Adapter.UpdateCommand.Parameters(21).Value = CType(INHERIT_VALUE,Boolean)
Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_GUID,Integer)
Me.Adapter.UpdateCommand.Parameters(23).Value = CType(GUID,Integer)
If (LU_CAPTION Is Nothing) Then
Throw New Global.System.ArgumentNullException("LU_CAPTION")
Else
Me.Adapter.UpdateCommand.Parameters(22).Value = CType(LU_CAPTION,String)
End If
Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_GUID,Integer)
Me.Adapter.UpdateCommand.Parameters(24).Value = CType(GUID,Integer)
Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
<> Global.System.Data.ConnectionState.Open) Then

View File

@@ -1333,9 +1333,8 @@ SET CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN
CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN,
CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE,
SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT_VALUE,
LU_CAPTION = 'INHERIT_VALUE
@LU_CAPTION'
WHERE (GUID = @Original_GUID);
LU_CAPTION = @LU_CAPTION
WHERE (GUID = @Original_GUID);
SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1360,6 +1359,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
<Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" Scale="0" Size="1024" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="INHERIT_VALUE" ColumnName="INHERIT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INHERIT_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INHERIT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="LU_CAPTION" ColumnName="LU_CAPTION" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@LU_CAPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="LU_CAPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
@@ -3392,9 +3392,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
</xs:element>
<xs:annotation>
<xs:appinfo>
<msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
<msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" />
<msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE" />
<msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" />
<msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
<msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
</xs:appinfo>
</xs:annotation>
</xs:schema>

View File

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="83" ViewPortY="-27" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="83" ViewPortY="51" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="14" X="1688" Y="-74" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="2" X="-17" Y="232" Height="262" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />

View File

@@ -14,7 +14,7 @@
Public Property NO_DETAIL_PROFILES As Boolean = False
' Debug Settings
Public Property DEBUG As Boolean = False
Public Property LOG_HOTSPOTS As Boolean = False
Public Property INDEX_DMS_ERSTELLT = "DMS erstellt"
Public Property INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)"

View File

@@ -1,10 +1,11 @@
Imports WINDREAMLib
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Windream
Imports DigitalData.Modules.ZooFlow
Imports taskFLOW.ClassConfig
Imports WINDREAMLib
Module ModuleRuntimeVariables
@@ -34,7 +35,7 @@ Module ModuleRuntimeVariables
Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
Public Property BASEDATA_TBPM_PROFILE_CONTROLS As DataTable
Public Property CURRENT_ProfilGUID As Integer
Public Property CURRENT_ProfilName As String
@@ -62,6 +63,7 @@ Module ModuleRuntimeVariables
Public Property USER_IS_ADMIN As Boolean = False
Public Property USER_ID = 0
Public Property USER_MODULE_ID = 0
Public Property USER_PRENAME = ""
Public Property USER_SURNAME = ""
Public Property USER_SHORTNAME = ""
@@ -80,6 +82,11 @@ Module ModuleRuntimeVariables
Public Property USER_USERNAME_ORG As String = ""
Public Property USER_GHOST_MODE_ACTIVE As Boolean = False
Public Property USER_GHOST_MODE_USRNAME As String = ""
Public Class UserInheritanceConfirmation
Public Property ColumnName As String = ""
Public Property Count As Integer
End Class
Public Property UserInheritance_ConfirmationByColumn As New List(Of UserInheritanceConfirmation)
Public Property FORCE_LAYOUT_OVERVIEW As Boolean = False
Public Property SHOW_CHARTS As Boolean = True
@@ -94,6 +101,7 @@ Module ModuleRuntimeVariables
Public Property POPUP_REMINDER_ACTIVE As Boolean = True
Public Property INACTIVITY_DURATION As Integer = 0
Public Property INACTIVITYRecognized As Boolean = False
Public Property InheritanceMsgAmount As Integer = 5
Public Property LAST_EDITED_COLUMN As String = "NONE"
Public Property LAST_ADDED_COLUMN As String = "NONE"
Public Property MON_EDITED_COLUMN As String = "NONE"
@@ -142,7 +150,6 @@ Module ModuleRuntimeVariables
Public Property CURRENT_DT_PROFILES As DataTable
Public Property CURRENT_DT_PROFILE_LANGUAGE As DataTable
Public Property CURRENT_DT_PROFILE As DataTable
Public Property CURRENT_CONTROL_NAME_LIST As New List(Of String)
@@ -150,7 +157,7 @@ Module ModuleRuntimeVariables
Public Property DTVWCONTROL_INDEX As DataTable
Public Property DTCONTROLS_WITH_SQL As DataTable
Public Property DTTBPM_PROFILE_FINAL_INDEXING As DataTable
Public Property CURRENT_CONTROL_ID As Integer
Public Property errormessage As String

View File

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.7.6.0")>
<Assembly: AssemblyVersion("2.8.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")>

View File

@@ -156,7 +156,7 @@ Namespace My
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("513")> _
Global.System.Configuration.DefaultSettingValueAttribute("346")> _
Public Property frmValSearchSplitterDistance() As Integer
Get
Return CType(Me("frmValSearchSplitterDistance"),Integer)

View File

@@ -27,7 +27,7 @@
<Value Profile="(Default)">0, 0</Value>
</Setting>
<Setting Name="frmValSearchSplitterDistance" Type="System.Int32" Scope="User">
<Value Profile="(Default)">513</Value>
<Value Profile="(Default)">346</Value>
</Setting>
<Setting Name="frmMainWindowState" Type="System.String" Scope="User">
<Value Profile="(Default)">Normal</Value>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -151,9 +151,9 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="DigitalData.Controls.DocumentViewer, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
<HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -178,7 +178,7 @@
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -189,12 +189,15 @@
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\11_2025\DigitalData.Modules.License.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Messaging">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
@@ -231,68 +234,95 @@
<HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Markdown, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Markdown.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
<Private>True</Private>
</Reference>
<Reference Include="Google.Protobuf, Version=3.33.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -326,6 +356,15 @@
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Exceptions, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Exceptions.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Settings, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Settings.Edition, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -417,6 +456,9 @@
<Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
@@ -1036,7 +1078,6 @@
<None Include="FinalIndexDataSet.xss">
<DependentUpon>FinalIndexDataSet.xsd</DependentUpon>
</None>
<None Include="frmValidator.v" />
<None Include="My Project\app.manifest" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
@@ -1338,10 +1379,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

View File

@@ -64,6 +64,15 @@ Namespace My.Resources
End Set
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bestätigung ähnelt.
'''</summary>
Friend Shared ReadOnly Property Bestaetigung() As String
Get
Return ResourceManager.GetString("Bestaetigung", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bitte validieren Sie die rot markierten Felder! ähnelt.
'''</summary>
@@ -109,6 +118,24 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Vererbung Werte Grid aktiv ähnelt.
'''</summary>
Friend Shared ReadOnly Property Inheritance_Messages_Active() As String
Get
Return ResourceManager.GetString("Inheritance_Messages_Active", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Vererbung Werte Grid inaktiv ähnelt.
'''</summary>
Friend Shared ReadOnly Property Inheritance_Messages_Inactive() As String
Get
Return ResourceManager.GetString("Inheritance_Messages_Inactive", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Speichern - Nächster Vorgang (F2) ähnelt.
'''</summary>

View File

@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Bestaetigung" xml:space="preserve">
<value>Confirmation</value>
</data>
<data name="Bitte validieren Sie die rot markierten Felder!" xml:space="preserve">
<value>Please validate red marked fields!</value>
</data>
@@ -144,4 +141,13 @@
<data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
<value>Would You like to end this conversation?</value>
</data>
<data name="Bestaetigung" xml:space="preserve">
<value>Confirmation</value>
</data>
<data name="Inheritance_Messages_Active" xml:space="preserve">
<value>Confirmation of inheritance Values Grid active</value>
</data>
<data name="Inheritance_Messages_Inactive" xml:space="preserve">
<value>Confirmation of inheritance Values Grid inactive</value>
</data>
</root>

View File

@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Bestaetigung" xml:space="preserve">
<value>Confirmation</value>
</data>
<data name="Bitte validieren Sie die rot markierten Felder!" xml:space="preserve">
<value>Veuillez valider les champs marqués en rouge!</value>
</data>
@@ -144,4 +141,13 @@
<data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
<value>Vous voulez mettre fin à la conversation?</value>
</data>
<data name="Bestaetigung" xml:space="preserve">
<value>Confirmation</value>
</data>
<data name="Inheritance_Messages_Active" xml:space="preserve">
<value>Confirmation Héritage Valeurs Grille active</value>
</data>
<data name="Inheritance_Messages_Inactive" xml:space="preserve">
<value>Confirmation Héritage Valeurs Grille inactive</value>
</data>
</root>

View File

@@ -141,4 +141,13 @@
<data name="Wollen Sie die Konversation beenden?" xml:space="preserve">
<value>Wollen Sie die Konversation beenden?</value>
</data>
<data name="Bestaetigung" xml:space="preserve">
<value>Bestätigung</value>
</data>
<data name="Inheritance_Messages_Active" xml:space="preserve">
<value>Vererbung Werte Grid aktiv</value>
</data>
<data name="Inheritance_Messages_Inactive" xml:space="preserve">
<value>Vererbung Werte Grid inaktiv</value>
</data>
</root>

View File

@@ -163,7 +163,7 @@ Public Class Validator
' Logger.Error(ex)
' Dim st As New StackTrace(True)
' st = New StackTrace(ex, True)
' Logger.Warn("Unexpected error in Check_UpdateIndexe TextBox :" & ex.Message, True)
' LOGGER.Warn("⚠️ Unexpected error in Check_UpdateIndexe TextBox :" & ex.Message, True)
' Return False
' End Try
'End Function

View File

@@ -5,7 +5,6 @@ Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraEditors
Imports DigitalData.Modules.Language
''' <summary>
''' Defines common Functions for Checking for and replacing placeholders.
''' This Class also includes a child class `Pattern` for passing around Patterns.
@@ -51,7 +50,7 @@ Public Class clsPatterns
Public Const INT_VALUE_WMDocID = "WMDocID"
Public Const INT_VALUE_IDBID = "IDBObjID"
Public Const MAX_TRY_COUNT = 20
Public Const MAX_TRY_COUNT = 5
''' <summary>
''' This value will be valid as any datatype,
@@ -64,6 +63,80 @@ Public Class clsPatterns
Private Shared ReadOnly complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
Private Shared ReadOnly simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
Private Shared _ControlLookupCache As Dictionary(Of String, Control)
''' <summary>
''' Clears the control lookup cache. Call when controls are dynamically added/removed.
''' </summary>
Public Shared Sub ClearControlCache()
_ControlLookupCache = Nothing
LOGGER.Debug("Control cache cleared")
End Sub
''' <summary>
''' Aktualisiert den Wert eines Controls im Cache
''' </summary>
Public Shared Sub UpdateControlInCache(controlName As String, newValue As Object)
SyncLock _ControlLookupCache ' Thread-Safety
If _ControlLookupCache Is Nothing OrElse Not _ControlLookupCache.ContainsKey(controlName) Then
LOGGER.Warn($"Control [{controlName}] not found in cache for update")
Return
End If
' Hole das Control aus dem Cache
Dim ctrl As Control = _ControlLookupCache(controlName)
' Aktualisiere den WERT des Controls basierend auf seinem Typ
Try
Select Case ctrl.GetType
Case GetType(TextEdit), GetType(MemoEdit)
DirectCast(ctrl, BaseEdit).EditValue = newValue
Case GetType(LookupControl3)
Dim lookup = DirectCast(ctrl, LookupControl3)
If TypeOf newValue Is List(Of String) Then
lookup.Properties.SelectedValues = DirectCast(newValue, List(Of String))
ElseIf TypeOf newValue Is String Then
lookup.Properties.SelectedValues = New List(Of String) From {newValue.ToString()}
End If
Case GetType(Windows.Forms.ComboBox)
DirectCast(ctrl, ComboBox).Text = newValue?.ToString()
Case GetType(CheckBox)
If TypeOf newValue Is Boolean Then
DirectCast(ctrl, CheckBox).Checked = CBool(newValue)
End If
Case GetType(DateTimePicker)
If TypeOf newValue Is Date Then
DirectCast(ctrl, DateTimePicker).Value = CDate(newValue)
End If
Case Else
LOGGER.Warn($"Unsupported control type for cache update: {ctrl.GetType.Name}")
End Select
LOGGER.Debug($"Cache updated for control [{controlName}] with value type [{newValue?.GetType().Name}]")
Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Warn($"Failed to update control [{controlName}]: {ex.Message}")
End Try
End SyncLock
End Sub
''' <summary>
''' Batch-Update für mehrere Controls
''' </summary>
Public Shared Sub UpdateMultipleControlsInCache(updates As Dictionary(Of String, Object))
If updates Is Nothing OrElse updates.Count = 0 Then Return
SyncLock _ControlLookupCache
For Each kvp In updates
UpdateControlInCache(kvp.Key, kvp.Value)
Next
LOGGER.Debug($"Batch cache update completed for {updates.Count} controls")
End SyncLock
End Sub
''' <summary>
''' Wraps a pattern-type and -value in the common format: {#type#value}
''' </summary>
@@ -189,9 +262,24 @@ Public Class clsPatterns
End Try
End Function
Private Shared Sub RecursiveAddToCache(ctrl As Control, cache As Dictionary(Of String, Control))
cache(ctrl.Name) = ctrl
For Each child As Control In ctrl.Controls
RecursiveAddToCache(child, cache)
Next
End Sub
Public Shared Function ReplaceControlValues(pInput As String, oPanel As DevExpress.XtraEditors.XtraScrollableControl, oIsSQL As Boolean) As String
Dim oResult = pInput
' Cache beim ersten Aufruf erstellen mit Lock
SyncLock GetType(clsPatterns) ' Class-Level Lock
If _ControlLookupCache Is Nothing Then
_ControlLookupCache = New Dictionary(Of String, Control)()
For Each ctrl As Control In oPanel.Controls
RecursiveAddToCache(ctrl, _ControlLookupCache)
Next
LOGGER.Debug($"Control cache initialized with {_ControlLookupCache.Count} controls")
End If
End SyncLock
Try
Dim oTryCounter = 0
@@ -214,15 +302,34 @@ Public Class clsPatterns
End If
LOGGER.Debug("Found placeholder for control [{0}].", oControlName)
' Beim Cache-Zugriff Lock verwenden
Dim oControl As Control = Nothing
SyncLock _ControlLookupCache
If Not _ControlLookupCache.TryGetValue(oControlName, oControl) Then
LOGGER.Warn($"Control [{oControlName}] not found in cache!")
' Fallback außerhalb des Lock
End If
End SyncLock
' Fallback außerhalb des Lock
If oControl Is Nothing Then
oControl = oPanel.Controls.Find(oControlName, True).FirstOrDefault()
If oControl IsNot Nothing Then
LOGGER.Info($"Control [{oControlName}] found via fallback. Adding to cache.")
SyncLock _ControlLookupCache
_ControlLookupCache(oControlName) = oControl
End SyncLock
End If
End If
Dim oControl As Control = oPanel.Controls.Find(oControlName, False).FirstOrDefault()
If oControl IsNot Nothing Then
Dim oReplaceValue As String
LOGGER.Debug("oControl.GetType [{0}].", oControl.GetType.ToString)
Select Case oControl.GetType
Case GetType(TextBox)
oReplaceValue = oControl.Text
LOGGER.Debug("TextBox- oReplaceValue will be [{0}].", oReplaceValue)
Case GetType(TextEdit)
Try
oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty)
@@ -230,6 +337,7 @@ Public Class clsPatterns
LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
oReplaceValue = ""
End Try
LOGGER.Debug("TextEdit- oReplaceValue will be [{0}].", oReplaceValue)
Case GetType(MemoEdit)
Try
oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
@@ -237,6 +345,7 @@ Public Class clsPatterns
LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
oReplaceValue = ""
End Try
LOGGER.Debug("MemoEdit- oReplaceValue will be [{0}].", oReplaceValue)
Case GetType(LookupControl3)
Dim oLookupControl3 As LookupControl3 = oControl
@@ -274,7 +383,7 @@ Public Class clsPatterns
Dim oView As GridView = oGrid.FocusedView
If oColumnName = String.Empty Then
LOGGER.Warn("Used placeholder for Table [{0}] but without Column Name!", oControlName)
LOGGER.Warn("⚠️ Used placeholder for Table [{0}] but without Column Name!", oControlName)
oReplaceValue = ERROR_REPLACE_VALUE
End If
@@ -283,7 +392,7 @@ Public Class clsPatterns
SingleOrDefault()
If oColumn?.SummaryItem?.SummaryValue Is Nothing Then
LOGGER.Warn("Column [{0}] not found in Grid!", oColumnName)
LOGGER.Warn("⚠️ Column [{0}] not found in Grid!", oColumnName)
oReplaceValue = ERROR_REPLACE_VALUE
Else
oReplaceValue = oColumn.SummaryItem.SummaryValue
@@ -298,6 +407,8 @@ Public Class clsPatterns
oReplaceValue = oReplaceValue.Replace("'", "''")
End If
oResult = ReplacePattern(oResult, PATTERN_CTRL, oReplaceValue)
Else
LOGGER.Warn("⚠️ Could not get a Control for [{0}].", oControlName)
End If
oTryCounter += 1
@@ -305,7 +416,7 @@ Public Class clsPatterns
Return oResult
Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Warn("Error in ReplaceControlValues:" & ex.Message)
LOGGER.Warn("⚠️ Error in ReplaceControlValues:" & ex.Message)
Return oResult
End Try
End Function

View File

@@ -370,7 +370,7 @@ Partial Class frmColumn_Detail
'
'READ_ONLYCheckBox
'
Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True))
Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "READ_ONLY", True))
resources.ApplyResources(Me.READ_ONLYCheckBox, "READ_ONLYCheckBox")
Me.READ_ONLYCheckBox.MenuManager = Me.RibbonControl1
Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"

View File

@@ -64,6 +64,17 @@ Public Class frmColumn_Detail
End Try
End Function
Private Sub READ_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles READ_ONLYCheckBox.CheckedChanged
Console.WriteLine($"READ_ONLY changed to: {READ_ONLYCheckBox.Checked}")
Console.WriteLine($"CheckEditInheritValue is now: {CheckEditInheritValue.Checked}")
End Sub
Private Sub CheckEditInheritValue_CheckedChanged(sender As Object, e As EventArgs) Handles CheckEditInheritValue.CheckedChanged
Console.WriteLine($"CheckEditInheritValue changed to: {CheckEditInheritValue.Checked}")
Dim stackTrace As New StackTrace()
Console.WriteLine($"Called from: {stackTrace}")
End Sub
Sub Save_Data()
Try
TBPM_CONTROL_TABLEBindingSource.EndEdit()
@@ -92,7 +103,7 @@ Public Class frmColumn_Detail
)
tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
FillData(GUIDTextBox.Text)
' FillData(GUIDTextBox.Text)
Else
tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If

View File

@@ -246,6 +246,7 @@ Partial Class frmMain
'
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.Transparent
Me.Panel1.Controls.Add(Me.GridControlWorkflows)
Me.Panel1.Controls.Add(Me.Panel2)
Me.Panel1.Controls.Add(Me.NavBarControl1)
@@ -985,7 +986,6 @@ Partial Class frmMain
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlBottom)
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlLeft)
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlRight)
Me.DocumentViewerBarManager1.DockWindowTabFont = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.DocumentViewerBarManager1.Form = Me
Me.DocumentViewerBarManager1.ImageStream = CType(resources.GetObject("DocumentViewerBarManager1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer)
Me.DocumentViewerBarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.PrintPreviewStaticItem1, Me.ProgressBarEditItem1, Me.PrintPreviewBarItem1, Me.PrintPreviewStaticItem2, Me.ZoomTrackBarEditItem1, Me.bbiDocumentMap, Me.bbiParameters, Me.bbiThumbnails, Me.bbiFind, Me.bbiHighlightEditingFields, Me.bbiCustomize, Me.bbiOpen, Me.bbiSave, Me.bbiPrint, Me.bbiPrintDirect, Me.bbiPageSetup, Me.bbiEditPageHF, Me.bbiScale, Me.bbiHandTool, Me.bbiMagnifier, Me.bbiZoomOut, Me.bbiZoom, Me.bbiZoomIn, Me.bbiShowFirstPage, Me.bbiShowPrevPage, Me.bbiShowNextPage, Me.bbiShowLastPage, Me.bbiMultiplePages, Me.bbiFillBackground, Me.bbiWatermark, Me.bbiExportFile, Me.bbiSendFile, Me.bbiClosePreview, Me.miFile, Me.miView, Me.miBackground, Me.miPageLayout, Me.miPageLayoutFacing, Me.miPageLayoutContinuous, Me.miToolbars, Me.PrintPreviewBarCheckItem1, Me.PrintPreviewBarCheckItem2, Me.PrintPreviewBarCheckItem3, Me.PrintPreviewBarCheckItem4, Me.PrintPreviewBarCheckItem5, Me.PrintPreviewBarCheckItem6, Me.PrintPreviewBarCheckItem7, Me.PrintPreviewBarCheckItem8, Me.PrintPreviewBarCheckItem9, Me.PrintPreviewBarCheckItem10, Me.PrintPreviewBarCheckItem11, Me.PrintPreviewBarCheckItem12, Me.PrintPreviewBarCheckItem13, Me.PrintPreviewBarCheckItem14, Me.PrintPreviewBarCheckItem15, Me.PrintPreviewBarCheckItem16, Me.PrintPreviewBarCheckItem17, Me.PrintPreviewBarCheckItem18, Me.PrintPreviewBarCheckItem19})

View File

@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAXgBCwF4AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAbgBCwG4AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1893,13 +1893,13 @@
<value>Starte Validierung für Profil</value>
</data>
<metadata name="bindsourcegrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
<value>986, 17</value>
</metadata>
<metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>490, 17</value>
</metadata>
<metadata name="ContextMenuNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>250, 56</value>
<value>1220, 17</value>
</metadata>
<data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 100</value>
@@ -2024,10 +2024,10 @@
<value>728, 17</value>
</metadata>
<metadata name="Timer5Mins.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>525, 95</value>
<value>643, 54</value>
</metadata>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>151, 56</value>
<value>1120, 17</value>
</metadata>
<data name="barDockControlTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -2036,7 +2036,7 @@
<value>0, 0</value>
</data>
<metadata name="DocumentViewerBarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 95</value>
<value>138, 54</value>
</metadata>
<data name="barDockControlBottom.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value>
@@ -3592,25 +3592,25 @@
<value>RibbonPage2</value>
</data>
<metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>432, 56</value>
<value>1402, 17</value>
</metadata>
<metadata name="bwSync.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>584, 56</value>
<value>1554, 17</value>
</metadata>
<metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>677, 56</value>
<value>1649, 17</value>
</metadata>
<data name="SaveFileDialog1.Filter" xml:space="preserve">
<value>PDF Dateien (*.pdf*)|*.pdf</value>
</data>
<metadata name="bwBasicData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>814, 56</value>
<value>17, 54</value>
</metadata>
<metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>235, 95</value>
<value>353, 54</value>
</metadata>
<metadata name="TimerInactivity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>394, 95</value>
<value>510, 54</value>
</metadata>
<data name="BarButtonItem5.Caption" xml:space="preserve">
<value>BarButtonItem5</value>

File diff suppressed because it is too large Load Diff

View File

@@ -918,7 +918,7 @@ Public Class frmMassValidator
Else
'not implemented
LOGGER.Warn("Depending_Control_Set_Result for [{0}] NOT IMPLEMENTED", displayboxname)
LOGGER.Warn("⚠️ Depending_Control_Set_Result for [{0}] NOT IMPLEMENTED", displayboxname)
End If
Else
If oResultTable.Rows.Count = 1 Then
@@ -929,7 +929,7 @@ Public Class frmMassValidator
End If
End If
Else
LOGGER.Warn("Result Table is nothing!")
LOGGER.Warn("⚠️ Result Table is nothing!")
End If
Catch ex As Exception
LOGGER.Info("Unexpected Ersror in Depending_Control_Set_Result - ERROR: " & ex.Message)

View File

@@ -36,7 +36,7 @@ Public Class frmMonitor
Try
oDocID = GridView1.GetFocusedRowCellValue(GridView1.Columns("ObjectID"))
Catch ex1 As Exception
LOGGER.Warn("Could not get Doc/ObjectReference: " & ex.Message)
LOGGER.Warn("⚠️ Could not get Doc/ObjectReference: " & ex.Message)
MsgBox("Could not get Doc/ObjectReference: " & ex.Message, MsgBoxStyle.Critical, "Load_Detail")
Exit Sub
End Try
@@ -174,7 +174,7 @@ Public Class frmMonitor
'_frmDocView.LoadFile(oDocPath)
If File.Exists(oDocPath) Then
DocumentViewerMonitor.LoadFile(oDocPath)
DocumentViewerMonitor.LoadFile_FromPath(oDocPath)
BarStaticItemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
DocumentViewerMonitor.Visible = True
' DocumentViewerMonitor.RightOnlyView(USER_RIGHT_VIEW_ONLY)
@@ -523,7 +523,7 @@ Public Class frmMonitor
LOGGER.Warn($"Error getting DocPath in Monitor: {ex.Message}")
Exit Sub
End Try
DocumentViewerMonitor?.LoadFile(oDocPath)
DocumentViewerMonitor?.LoadFile_FromPath(oDocPath)
'If oDocPath <> "" Then
' If Not Application.OpenForms().OfType(Of frmValidator).Any Then

View File

@@ -519,7 +519,7 @@ Partial Class frmValidator
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.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.bbtnitmInfoWorkflow, Me.bchkitmNotes, Me.BarButtonGroup1})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 38
Me.RibbonControl1.MaxItemId = 39
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.OptionsMenuMinWidth = 257
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})

View File

@@ -411,7 +411,7 @@
<value>0, 0</value>
</data>
<data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
<value>335, 50</value>
<value>334, 50</value>
</data>
<data name="btnSave.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -447,7 +447,7 @@
<value>1</value>
</data>
<data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing">
<value>648, 50</value>
<value>647, 50</value>
</data>
<data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
@@ -480,7 +480,7 @@
<value>6, 58</value>
</data>
<data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
<value>640, 225</value>
<value>639, 225</value>
</data>
<data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -511,7 +511,7 @@
<value>6, 33</value>
</data>
<data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>641, 26</value>
<value>640, 26</value>
</data>
<data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -544,7 +544,7 @@
<value>5, 5</value>
</data>
<data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>641, 28</value>
<value>640, 28</value>
</data>
<data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -571,7 +571,7 @@
<value>0, 0</value>
</data>
<data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>652, 341</value>
<value>651, 341</value>
</data>
<data name="pnlMain.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
@@ -606,11 +606,8 @@
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>520, 341</value>
<value>521, 341</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -643,7 +640,7 @@
<value>1176, 341</value>
</data>
<data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>652</value>
<value>651</value>
</data>
<data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>37</value>

File diff suppressed because it is too large Load Diff

View File

@@ -150,7 +150,7 @@ Partial Class frmValidatorSearch
'
Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1)
resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2")
Me.SplitContainerControlDoc.SplitterPosition = 468
Me.SplitContainerControlDoc.SplitterPosition = 351
'
'XtraTabControlDocs
'
@@ -162,13 +162,12 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc1
'
Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1)
resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1")
Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1"
resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1")
'
'GridControlDocSearch1
'
resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1")
Me.GridControlDocSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode1.RelationName = "Level1"
Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1
@@ -181,7 +180,6 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch1.DetailHeight = 458
Me.GridViewDocSearch1.GridControl = Me.GridControlDocSearch1
Me.GridViewDocSearch1.Name = "GridViewDocSearch1"
Me.GridViewDocSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -196,13 +194,12 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc2
'
Me.XtraTabPageDoc2.Controls.Add(Me.GridControlDocSearch2)
resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2")
Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2"
resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2")
'
'GridControlDocSearch2
'
resources.ApplyResources(Me.GridControlDocSearch2, "GridControlDocSearch2")
Me.GridControlDocSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlDocSearch2.MainView = Me.GridViewDocSearch2
Me.GridControlDocSearch2.Name = "GridControlDocSearch2"
Me.GridControlDocSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch2})
@@ -213,7 +210,6 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch2.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch2.DetailHeight = 458
Me.GridViewDocSearch2.GridControl = Me.GridControlDocSearch2
Me.GridViewDocSearch2.Name = "GridViewDocSearch2"
Me.GridViewDocSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -228,13 +224,12 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc3
'
Me.XtraTabPageDoc3.Controls.Add(Me.GridControlDocSearch3)
resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3")
Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3"
resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3")
'
'GridControlDocSearch3
'
resources.ApplyResources(Me.GridControlDocSearch3, "GridControlDocSearch3")
Me.GridControlDocSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlDocSearch3.MainView = Me.GridViewDocSearch3
Me.GridControlDocSearch3.Name = "GridControlDocSearch3"
Me.GridControlDocSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch3})
@@ -245,7 +240,6 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch3.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch3.DetailHeight = 458
Me.GridViewDocSearch3.GridControl = Me.GridControlDocSearch3
Me.GridViewDocSearch3.Name = "GridViewDocSearch3"
Me.GridViewDocSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -260,13 +254,12 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc4
'
Me.XtraTabPageDoc4.Controls.Add(Me.GridControlDocSearch4)
resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4")
Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4"
resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4")
'
'GridControlDocSearch4
'
resources.ApplyResources(Me.GridControlDocSearch4, "GridControlDocSearch4")
Me.GridControlDocSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlDocSearch4.MainView = Me.GridViewDocSearch4
Me.GridControlDocSearch4.Name = "GridControlDocSearch4"
Me.GridControlDocSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch4})
@@ -277,7 +270,6 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch4.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch4.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch4.DetailHeight = 458
Me.GridViewDocSearch4.GridControl = Me.GridControlDocSearch4
Me.GridViewDocSearch4.Name = "GridViewDocSearch4"
Me.GridViewDocSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -292,13 +284,12 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc5
'
Me.XtraTabPageDoc5.Controls.Add(Me.GridControlDocSearch5)
resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5")
Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5"
resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5")
'
'GridControlDocSearch5
'
resources.ApplyResources(Me.GridControlDocSearch5, "GridControlDocSearch5")
Me.GridControlDocSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlDocSearch5.MainView = Me.GridViewDocSearch5
Me.GridControlDocSearch5.Name = "GridControlDocSearch5"
Me.GridControlDocSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch5})
@@ -309,7 +300,6 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch5.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch5.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch5.DetailHeight = 458
Me.GridViewDocSearch5.GridControl = Me.GridControlDocSearch5
Me.GridViewDocSearch5.Name = "GridViewDocSearch5"
Me.GridViewDocSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -356,13 +346,12 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch1
'
Me.XtraTabPageSearch1.Controls.Add(Me.GridControlSearch1)
resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1")
Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1"
resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1")
'
'GridControlSearch1
'
resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1")
Me.GridControlSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode2.RelationName = "Level1"
Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
Me.GridControlSearch1.MainView = Me.GridViewSearch1
@@ -375,7 +364,6 @@ Partial Class frmValidatorSearch
Me.GridViewSearch1.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch1.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch1.DetailHeight = 458
Me.GridViewSearch1.GridControl = Me.GridControlSearch1
Me.GridViewSearch1.Name = "GridViewSearch1"
Me.GridViewSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -390,13 +378,12 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch2
'
Me.XtraTabPageSearch2.Controls.Add(Me.GridControlSearch2)
resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2")
Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2"
resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2")
'
'GridControlSearch2
'
resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2")
Me.GridControlSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode3.RelationName = "Level1"
Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3})
Me.GridControlSearch2.MainView = Me.GridViewSearch2
@@ -409,7 +396,6 @@ Partial Class frmValidatorSearch
Me.GridViewSearch2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch2.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch2.DetailHeight = 458
Me.GridViewSearch2.GridControl = Me.GridControlSearch2
Me.GridViewSearch2.Name = "GridViewSearch2"
Me.GridViewSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -424,13 +410,12 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch3
'
Me.XtraTabPageSearch3.Controls.Add(Me.GridControlSearch3)
resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3")
Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3"
resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3")
'
'GridControlSearch3
'
resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3")
Me.GridControlSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode4.RelationName = "Level1"
Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
Me.GridControlSearch3.MainView = Me.GridViewSearch3
@@ -443,7 +428,6 @@ Partial Class frmValidatorSearch
Me.GridViewSearch3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch3.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch3.DetailHeight = 458
Me.GridViewSearch3.GridControl = Me.GridControlSearch3
Me.GridViewSearch3.Name = "GridViewSearch3"
Me.GridViewSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -458,13 +442,12 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch4
'
Me.XtraTabPageSearch4.Controls.Add(Me.GridControlSearch4)
resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4")
Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4"
resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4")
'
'GridControlSearch4
'
resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4")
Me.GridControlSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode5.RelationName = "Level1"
Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5})
Me.GridControlSearch4.MainView = Me.GridViewSearch4
@@ -477,7 +460,6 @@ Partial Class frmValidatorSearch
Me.GridViewSearch4.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch4.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch4.DetailHeight = 458
Me.GridViewSearch4.GridControl = Me.GridControlSearch4
Me.GridViewSearch4.Name = "GridViewSearch4"
Me.GridViewSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@@ -492,13 +474,12 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch5
'
Me.XtraTabPageSearch5.Controls.Add(Me.GridControlSearch5)
resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5")
Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5"
resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5")
'
'GridControlSearch5
'
resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5")
Me.GridControlSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode6.RelationName = "Level1"
Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6})
Me.GridControlSearch5.MainView = Me.GridViewSearch5
@@ -511,7 +492,6 @@ Partial Class frmValidatorSearch
Me.GridViewSearch5.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch5.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch5.DetailHeight = 458
Me.GridViewSearch5.GridControl = Me.GridControlSearch5
Me.GridViewSearch5.Name = "GridViewSearch5"
Me.GridViewSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]

View File

@@ -125,32 +125,20 @@
<data name="SplitContainerControlDoc.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="SplitContainerControlDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="XtraTabControlDocs.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="XtraTabControlDocs.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="XtraTabControlDocs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlDocSearch1.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlDocSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 933</value>
<value>349, 557</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -168,11 +156,8 @@
<data name="&gt;&gt;GridControlDocSearch1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageDoc1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageDoc1.Size" type="System.Drawing.Size, System.Drawing">
<value>466, 746</value>
<value>349, 557</value>
</data>
<data name="XtraTabPageDoc1.Text" xml:space="preserve">
<value>XtraTabPage1</value>
@@ -190,7 +175,7 @@
<value>0</value>
</data>
<data name="XtraTabControlDocs.Size" type="System.Drawing.Size, System.Drawing">
<value>468, 764</value>
<value>351, 580</value>
</data>
<data name="XtraTabControlDocs.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -198,17 +183,11 @@
<data name="GridControlDocSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlDocSearch2.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlDocSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 920</value>
<value>349, 557</value>
</data>
<data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -225,11 +204,8 @@
<data name="&gt;&gt;GridControlDocSearch2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageDoc2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageDoc2.Size" type="System.Drawing.Size, System.Drawing">
<value>466, 736</value>
<value>349, 557</value>
</data>
<data name="XtraTabPageDoc2.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -249,17 +225,11 @@
<data name="GridControlDocSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlDocSearch3.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch3.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlDocSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 916</value>
<value>349, 557</value>
</data>
<data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -276,11 +246,8 @@
<data name="&gt;&gt;GridControlDocSearch3.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageDoc3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageDoc3.Size" type="System.Drawing.Size, System.Drawing">
<value>466, 733</value>
<value>349, 557</value>
</data>
<data name="XtraTabPageDoc3.Text" xml:space="preserve">
<value>XtraTabPage1</value>
@@ -300,17 +267,11 @@
<data name="GridControlDocSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlDocSearch4.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch4.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlDocSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 916</value>
<value>349, 557</value>
</data>
<data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -327,11 +288,8 @@
<data name="&gt;&gt;GridControlDocSearch4.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageDoc4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageDoc4.Size" type="System.Drawing.Size, System.Drawing">
<value>466, 733</value>
<value>349, 557</value>
</data>
<data name="XtraTabPageDoc4.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -351,17 +309,11 @@
<data name="GridControlDocSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlDocSearch5.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch5.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlDocSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 916</value>
<value>349, 557</value>
</data>
<data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -378,11 +330,8 @@
<data name="&gt;&gt;GridControlDocSearch5.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageDoc5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageDoc5.Size" type="System.Drawing.Size, System.Drawing">
<value>466, 733</value>
<value>349, 557</value>
</data>
<data name="XtraTabPageDoc5.Text" xml:space="preserve">
<value>XtraTabPage3</value>
@@ -433,10 +382,10 @@
<value>0, 0</value>
</data>
<data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
<value>4, 4, 4, 4</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>621, 764</value>
<value>503, 580</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -445,7 +394,7 @@
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainerControlDoc.Panel2</value>
@@ -469,7 +418,7 @@
<value>1</value>
</data>
<data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing">
<value>1101, 764</value>
<value>864, 580</value>
</data>
<data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -490,10 +439,7 @@
<value>Fill</value>
</data>
<data name="SplitContainerSearches.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 31</value>
</data>
<data name="SplitContainerSearches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
<value>0, 27</value>
</data>
<data name="XtraTabControlSQL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@@ -501,23 +447,14 @@
<data name="XtraTabControlSQL.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="XtraTabControlSQL.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlSearch1.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>639, 926</value>
<value>344, 560</value>
</data>
<data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -534,11 +471,8 @@
<data name="&gt;&gt;GridControlSearch1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageSearch1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="XtraTabPageSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>511, 741</value>
<value>344, 560</value>
</data>
<data name="XtraTabPageSearch1.Text" xml:space="preserve">
<value>Search1</value>
@@ -556,7 +490,7 @@
<value>0</value>
</data>
<data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>513, 769</value>
<value>346, 583</value>
</data>
<data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -564,17 +498,11 @@
<data name="GridControlSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlSearch2.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>639, 915</value>
<value>511, 560</value>
</data>
<data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -591,11 +519,8 @@
<data name="&gt;&gt;GridControlSearch2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageSearch2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>511, 732</value>
<value>511, 560</value>
</data>
<data name="XtraTabPageSearch2.Text" xml:space="preserve">
<value>Search2</value>
@@ -615,17 +540,11 @@
<data name="GridControlSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlSearch3.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch3.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>639, 915</value>
<value>511, 560</value>
</data>
<data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -642,11 +561,8 @@
<data name="&gt;&gt;GridControlSearch3.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageSearch3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>511, 732</value>
<value>511, 560</value>
</data>
<data name="XtraTabPageSearch3.Text" xml:space="preserve">
<value>XtraTabPage1</value>
@@ -666,17 +582,11 @@
<data name="GridControlSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlSearch4.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch4.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>639, 915</value>
<value>511, 560</value>
</data>
<data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -693,11 +603,8 @@
<data name="&gt;&gt;GridControlSearch4.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageSearch4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>511, 732</value>
<value>511, 560</value>
</data>
<data name="XtraTabPageSearch4.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -717,17 +624,11 @@
<data name="GridControlSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="GridControlSearch5.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch5.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="GridControlSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>639, 915</value>
<value>511, 560</value>
</data>
<data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -744,11 +645,8 @@
<data name="&gt;&gt;GridControlSearch5.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabPageSearch5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>511, 732</value>
<value>511, 560</value>
</data>
<data name="XtraTabPageSearch5.Text" xml:space="preserve">
<value>XtraTabPage3</value>
@@ -781,22 +679,19 @@
<value>595, 17</value>
</metadata>
<data name="tsslblSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 20</value>
<value>91, 17</value>
</data>
<data name="tsslblSQL.Text" xml:space="preserve">
<value>No action so far</value>
</data>
<data name="statlbl.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 20</value>
<value>0, 17</value>
</data>
<data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 769</value>
</data>
<data name="StatusStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 19, 0</value>
<value>0, 583</value>
</data>
<data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>513, 26</value>
<value>346, 22</value>
</data>
<data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -835,22 +730,22 @@
<value>Bottom</value>
</data>
<data name="tslblDocID.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 28</value>
<value>61, 22</value>
</data>
<data name="tslblDocID.Text" xml:space="preserve">
<value>tslblDocID</value>
</data>
<data name="tslblState.Size" type="System.Drawing.Size, System.Drawing">
<value>115, 28</value>
<value>91, 22</value>
</data>
<data name="tslblState.Text" xml:space="preserve">
<value>No action so far</value>
</data>
<data name="ToolStrip2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 764</value>
<value>0, 580</value>
</data>
<data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
<value>1101, 31</value>
<value>864, 25</value>
</data>
<data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -883,10 +778,7 @@
<value>1</value>
</data>
<data name="SplitContainerSearches.Size" type="System.Drawing.Size, System.Drawing">
<value>1619, 795</value>
</data>
<data name="SplitContainerSearches.SplitterWidth" type="System.Int32, mscorlib">
<value>5</value>
<value>1214, 605</value>
</data>
<data name="SplitContainerSearches.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -907,13 +799,13 @@
<value>17, 17</value>
</metadata>
<data name="DateiÖffnenToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>184, 26</value>
<value>148, 22</value>
</data>
<data name="DateiÖffnenToolStripMenuItem1.Text" xml:space="preserve">
<value>Öffnen</value>
</data>
<data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>184, 26</value>
<value>148, 22</value>
</data>
<data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
<value>Eigenschaften</value>
@@ -922,7 +814,7 @@
<value>Magenta</value>
</data>
<data name="ToolStripDropDownButtonFile.Size" type="System.Drawing.Size, System.Drawing">
<value>79, 28</value>
<value>67, 24</value>
</data>
<data name="ToolStripDropDownButtonFile.Text" xml:space="preserve">
<value>Datei</value>
@@ -931,7 +823,7 @@
<value>Magenta</value>
</data>
<data name="ToolStripButtonRefreshSearches.Size" type="System.Drawing.Size, System.Drawing">
<value>162, 28</value>
<value>135, 24</value>
</data>
<data name="ToolStripButtonRefreshSearches.Text" xml:space="preserve">
<value>Aktualisiere Ansicht</value>
@@ -940,7 +832,7 @@
<value>0, 0</value>
</data>
<data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>1619, 31</value>
<value>1214, 27</value>
</data>
<data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -981,7 +873,7 @@
</value>
</data>
<data name="EigenschaftenDateiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>218, 30</value>
<value>189, 30</value>
</data>
<data name="EigenschaftenDateiToolStripMenuItem.Text" xml:space="preserve">
<value>Eigenschaften Datei</value>
@@ -1044,28 +936,28 @@
</value>
</data>
<data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>218, 30</value>
<value>189, 30</value>
</data>
<data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
<value>Datei öffnen</value>
</data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>215, 6</value>
<value>186, 6</value>
</data>
<data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>218, 30</value>
<value>189, 30</value>
</data>
<data name="ToolStripMenuItem1.Text" xml:space="preserve">
<value>Aktualisieren</value>
</data>
<data name="LayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>218, 30</value>
<value>189, 30</value>
</data>
<data name="LayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve">
<value>Layout zurücksetzen</value>
</data>
<data name="ContextMenuStripWMFile.Size" type="System.Drawing.Size, System.Drawing">
<value>219, 130</value>
<value>190, 130</value>
</data>
<data name="&gt;&gt;ContextMenuStripWMFile.Name" xml:space="preserve">
<value>ContextMenuStripWMFile</value>
@@ -1077,16 +969,16 @@
<value>423, 17</value>
</metadata>
<data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 6</value>
<value>147, 6</value>
</data>
<data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 30</value>
<value>150, 30</value>
</data>
<data name="ToolStripMenuItem4.Text" xml:space="preserve">
<value>Aktualisieren</value>
</data>
<data name="ContextMenuStripSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 40</value>
<value>151, 40</value>
</data>
<data name="&gt;&gt;ContextMenuStripSQL.Name" xml:space="preserve">
<value>ContextMenuStripSQL</value>
@@ -1101,10 +993,10 @@
<value>81</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>8, 17</value>
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1619, 826</value>
<value>1214, 632</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt</value>
@@ -1142,9 +1034,6 @@
AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAP//AAA=
</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Zusätzliche Suchen</value>
</data>

View File

@@ -442,7 +442,7 @@ Public Class frmValidatorSearch
.ShowSettingButton = True
})
Catch ex As Exception
LOGGER.Warn("Error initializing DocViewDocsValdiatorSearch: " & ex.Message)
LOGGER.Warn("⚠️ Error initializing DocViewDocsValdiatorSearch: " & ex.Message)
End Try
OperationMode = GetOperationMode()
@@ -542,7 +542,7 @@ Public Class frmValidatorSearch
If Not IsNothing(DocumentViewer1) Then
Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}"
If Not IsNothing(oDocument.Contents) Then
DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
DocumentViewer1.LoadFile_FromPath(clsWMDocGrid.SELECTED_DOC_PATH) ',oFileName, New MemoryStream(oDocument.Contents))
LastDocID = clsWMDocGrid.SELECTED_DOC_ID
DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY)
If USER_RIGHT_VIEW_ONLY = True Then
@@ -631,7 +631,7 @@ Public Class frmValidatorSearch
End If
Else
LOGGER.Warn("Attention: RESULT_DOC_PATH is nothing")
LOGGER.Warn("⚠️ Attention: RESULT_DOC_PATH is nothing")
End If
Catch ex As Exception
MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)

View File

@@ -3,8 +3,11 @@
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
<package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.3" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
<package id="GdPicture" version="14.3.23" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.23" targetFramework="net462" />
<package id="Google.Protobuf" version="3.33.2" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
@@ -34,6 +37,7 @@
<package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
<package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="8.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -151,9 +151,9 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="DigitalData.Controls.DocumentViewer, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
<HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -178,7 +178,7 @@
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -189,12 +189,15 @@
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\11_2025\DigitalData.Modules.License.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Messaging">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
@@ -231,68 +234,95 @@
<HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.Markdown, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Markdown.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
<Private>True</Private>
</Reference>
<Reference Include="Google.Protobuf, Version=3.33.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -326,6 +356,15 @@
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Exceptions, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Exceptions.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Settings, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.dll</HintPath>
</Reference>
<Reference Include="NativeSDK.Settings.Edition, Version=14.3.23.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -417,6 +456,9 @@
<Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
@@ -1036,7 +1078,6 @@
<None Include="FinalIndexDataSet.xss">
<DependentUpon>FinalIndexDataSet.xsd</DependentUpon>
</None>
<None Include="frmValidator.v" />
<None Include="My Project\app.manifest" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
@@ -1338,10 +1379,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
<Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
<Import Project="..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.23\build\net462\GdPicture.runtimes.windows.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

File diff suppressed because it is too large Load Diff

35
app/update_devexpress.ps1 Normal file
View File

@@ -0,0 +1,35 @@
$vbprojPath = "TaskFlow\taskFLOW.vbproj"
$devExpressBasePath = "D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework"
$content = Get-Content $vbprojPath -Raw
# Liste aller DevExpress-Referenzen, die aktualisiert werden müssen
$replacements = @(
@{
Old = ' <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>'
New = ' <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll</HintPath>
</Reference>'
},
@{
Old = ' <Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />'
New = ' <Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.CodeParser.v21.2.dll</HintPath>
</Reference>'
},
@{
Old = ' <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />'
New = ' <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
</Reference>'
}
)
foreach ($replacement in $replacements) {
$content = $content.Replace($replacement.Old, $replacement.New)
}
Set-Content $vbprojPath $content -NoNewline
Write-Host "Updated DevExpress references"

View File

@@ -0,0 +1,28 @@
import re
vbproj_path = r"TaskFlow\taskFLOW.vbproj"
devexpress_base_path = r"D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework"
with open(vbproj_path, 'r', encoding='utf-8') as f:
content = f.read()
# Pattern for DevExpress references without HintPath
pattern = r'(<Reference Include="(DevExpress\.[^"]+\.v21\.2[^"]*)"[^>]*>)\s*(<SpecificVersion>False</SpecificVersion>)?\s*(</Reference>)'
def replace_func(match):
full_ref = match.group(1)
dll_name = re.sub(r',.*$', '', match.group(2))
specific_version = match.group(3)
dll_filename = f"{dll_name}.dll"
if specific_version:
return f"{full_ref}\r\n {specific_version}\r\n <HintPath>{devexpress_base_path}\\{dll_filename}</HintPath>\r\n </Reference>"
else:
return f"{full_ref}\r\n <HintPath>{devexpress_base_path}\\{dll_filename}</HintPath>\r\n </Reference>"
new_content = re.sub(pattern, replace_func, content)
with open(vbproj_path, 'w', encoding='utf-8') as f:
f.write(new_content)
print("DevExpress references updated successfully")