Compare commits

...

2 Commits

Author SHA1 Message Date
Developer01
040c7aeac0 2.7.3 WISAG
• Erweiterung von SetControlValues_FromControl um Handling für DevExpress DateEdit (Parsing verschiedener Datumsformate, Farbanpassung).
• Ergänzung einer analogen Fall-Branch für System.Windows.Forms.DateTimePicker (Fallback auf MinimumDateTime bei ungültigem oder leerem Caption).
• Keine bestehenden Funktionen außerhalb der neuen Select-Case-Zweige angepasst.
Nutzen: Ermöglicht dynamisches Setzen von Datumswerten aus SQL-Steuerdaten (Caption-Feld) für beide Datumstypen und konsistente Farbgestaltung wie bei anderen Steuerelementen.
Hinweis: Validierungs- und Logging-Struktur wiederverwendet; keine Seiteneffekte auf andere Control-Typen.
2025-11-19 13:02:27 +01:00
Developer01
6eafe9d53a Ms merge 2025-11-13 10:27:02 +01:00
49 changed files with 833 additions and 558 deletions

View File

@ -102,7 +102,8 @@
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>
<connectionStrings> <connectionStrings>
<add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" /> <add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False"
providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
@ -143,7 +144,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" /> <assemblyIdentity name="GdPicture.NET.14.Common" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.3.1.0" newVersion="14.3.1.0" /> <bindingRedirect oldVersion="0.0.0.0-14.3.3.0" newVersion="14.3.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" /> <assemblyIdentity name="GdPicture.NET.14.Imaging" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
@ -151,15 +152,15 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" /> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
@ -229,7 +230,7 @@
<value>0, 0</value> <value>0, 0</value>
</setting> </setting>
<setting name="frmValSearchSplitterDistance" serializeAs="String"> <setting name="frmValSearchSplitterDistance" serializeAs="String">
<value>563</value> <value>513</value>
</setting> </setting>
<setting name="frmMainWindowState" serializeAs="String"> <setting name="frmMainWindowState" serializeAs="String">
<value>Normal</value> <value>Normal</value>

View File

@ -366,4 +366,55 @@ Public Class ClassAllgemeineFunktionen
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file") MsgBox(ex.Message, MsgBoxStyle.Critical, "Error saving log file")
End Try End Try
End Sub End Sub
Public Shared Function NotNull(Of T)(value As Object, defaultValue As T) As T
If value Is Nothing OrElse Convert.IsDBNull(value) Then
Return defaultValue
End If
' Versuche den Wert in den gewünschten Typ zu konvertieren
Try
Return CType(value, T)
Catch ex As InvalidCastException
' Falls die Konvertierung fehlschlägt, gib den Default zurück
Return defaultValue
End Try
End Function
Public Shared Function NotNullNullable(Of T As Structure)(value As Object, defaultValue As Nullable(Of T)) As Nullable(Of T)
If value Is Nothing OrElse Convert.IsDBNull(value) Then
Return defaultValue
End If
Try
' Direkte Casts sind robust, wandeln aber DBNull nicht das ist bereits oben abgefangen.
Return DirectCast(value, Nullable(Of T))
Catch
Try
' Fallback: in T casten und zu Nullable machen
Return New Nullable(Of T)(DirectCast(value, T))
Catch
Return defaultValue
End Try
End Try
End Function
Public Shared Function NotNullString(value As Object, defaultValue As Object) As String
If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
Return CStr(value)
End Function
Public Shared Function NotNullDate(value As Object, defaultValue As DateTime) As DateTime?
If value Is Nothing OrElse Convert.IsDBNull(value) Then Return defaultValue
Return DirectCast(value, DateTime)
End Function
Public Shared Function NewShortGuid() As String
' Neue GUID erzeugen
Dim g As Guid = Guid.NewGuid()
' In Base64 umwandeln
Dim b64 As String = Convert.ToBase64String(g.ToByteArray())
' Unerwünschte Zeichen ersetzen/entfernen
b64 = b64.Replace("=", "").Replace("+", "-").Replace("/", "_")
' Ergebnis zurückgeben
Return b64
End Function
End Class End Class

View File

@ -104,17 +104,17 @@ Public Class ClassControlCreator
Private Function TransformDataRow(row As DataRow) As ControlDBProps Private Function TransformDataRow(row As DataRow) As ControlDBProps
Dim x As Integer = row.Item("X_LOC") Dim x As Integer = row.Item("X_LOC")
Dim y As Integer = row.Item("Y_LOC") Dim y As Integer = row.Item("Y_LOC")
Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE) Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE) Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY) Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
Dim family As FontFamily = New FontFamily(familyString) Dim family As FontFamily = New FontFamily(familyString)
Dim oGuid As Integer = row.Item("GUID") Dim oGuid As Integer = row.Item("GUID")
Dim oControlName As String = NotNull(row.Item("NAME"), "") Dim oControlName As String = ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), "")
Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "") Dim oAttribute As String = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
Dim oLocation As New Point(x, y) Dim oLocation As New Point(x, y)
Dim oFont As New Font(family, size, style, GraphicsUnit.Point) Dim oFont As New Font(family, size, style, GraphicsUnit.Point)
Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR)) Dim oColor As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
Dim oReadOnly As Boolean = row.Item("READ_ONLY") Dim oReadOnly As Boolean = row.Item("READ_ONLY")
Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM") Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM")
If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then
@ -171,7 +171,7 @@ Public Class ClassControlCreator
Public Function CreateNewTextBox(location As Point) As TextEdit Public Function CreateNewTextBox(location As Point) As TextEdit
Dim control As New TextEdit With { Dim control As New TextEdit With {
.Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}", .Name = $"{PREFIX_TEXTBOX}_{ClassAllgemeineFunktionen.NewShortGuid()}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Location = location, .Location = location,
.ReadOnly = True, .ReadOnly = True,
@ -184,7 +184,7 @@ Public Class ClassControlCreator
Public Function CreateNewLabel(location As Point) As Label Public Function CreateNewLabel(location As Point) As Label
Dim control As New Label With { Dim control As New Label With {
.Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}", .Name = $"{PREFIX_LABEL}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Text = DEFAULT_TEXT, .Text = DEFAULT_TEXT,
.AutoSize = True, .AutoSize = True,
.Location = location, .Location = location,
@ -196,7 +196,7 @@ Public Class ClassControlCreator
Public Function CreateNewCheckbox(location As Point) As CheckBox Public Function CreateNewCheckbox(location As Point) As CheckBox
Dim control As New CheckBox With { Dim control As New CheckBox With {
.Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}", .Name = $"{PREFIX_CHECKBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
.AutoSize = True, .AutoSize = True,
.Text = DEFAULT_TEXT, .Text = DEFAULT_TEXT,
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
@ -209,7 +209,7 @@ Public Class ClassControlCreator
Public Function CreateNewCombobox(location As Point) As Windows.Forms.ComboBox Public Function CreateNewCombobox(location As Point) As Windows.Forms.ComboBox
Dim control As New Windows.Forms.ComboBox With { Dim control As New Windows.Forms.ComboBox With {
.Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}", .Name = $"{PREFIX_COMBOBOX}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location .Location = location
@ -220,7 +220,7 @@ Public Class ClassControlCreator
Public Function CreateNewDatetimepicker(location As Point) As DateTimePicker Public Function CreateNewDatetimepicker(location As Point) As DateTimePicker
Dim control As New DateTimePicker With { Dim control As New DateTimePicker With {
.Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}", .Name = $"{PREFIX_DATETIMEPICKER}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -232,7 +232,7 @@ Public Class ClassControlCreator
Public Function CreateNewDatagridview(location As Point) As DataGridView Public Function CreateNewDatagridview(location As Point) As DataGridView
Dim control As New DataGridView With { Dim control As New DataGridView With {
.Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}", .Name = $"{PREFIX_DATAGRIDVIEW}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -252,7 +252,7 @@ Public Class ClassControlCreator
Friend Function CreateNewLookupControl(location As Point) As LookupControl3 Friend Function CreateNewLookupControl(location As Point) As LookupControl3
Dim control As New LookupControl3 With { Dim control As New LookupControl3 With {
.Name = $"{PREFIX_LOOKUP}_{clsTools.ShortGuid}", .Name = $"{PREFIX_LOOKUP}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location .Location = location
@ -262,7 +262,7 @@ Public Class ClassControlCreator
Public Function CreateNewTable(location As Point) As GridControl Public Function CreateNewTable(location As Point) As GridControl
Dim oControl As New GridControl With { Dim oControl As New GridControl With {
.Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}", .Name = $"{PREFIX_TABLE}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE), .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location, .Location = location,
@ -282,7 +282,7 @@ Public Class ClassControlCreator
Public Function CreateNewLine(location As Point) As LineLabel Public Function CreateNewLine(location As Point) As LineLabel
Dim control As New LineLabel With { Dim control As New LineLabel With {
.Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}", .Name = $"{PREFIX_LINE}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Text = "---------------------------------", .Text = "---------------------------------",
.Size = New Size(100, 5), .Size = New Size(100, 5),
.Location = location .Location = location
@ -292,7 +292,7 @@ Public Class ClassControlCreator
End Function End Function
Public Function CreateNewButton(location As Point) As Button Public Function CreateNewButton(location As Point) As Button
Dim control As New Button With { Dim control As New Button With {
.Name = $"{PREFIX_BUTTON}_{clsTools.ShortGuid}", .Name = $"{PREFIX_BUTTON}_{ClassAllgemeineFunktionen.NewShortGuid}",
.Size = New Size(108, 28), .Size = New Size(108, 28),
.Cursor = Cursors.Hand, .Cursor = Cursors.Hand,
.Location = location .Location = location
@ -605,7 +605,7 @@ Public Class ClassControlCreator
control.Text = "------------------------------" control.Text = "------------------------------"
control.BorderStyle = BorderStyle.None control.BorderStyle = BorderStyle.None
control.AutoSize = False control.AutoSize = False
control.BackColor = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR)) control.BackColor = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), DEFAULT_COLOR))
control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT")) control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
Return control Return control

View File

@ -114,12 +114,12 @@ Public Class ClassFinalIndex
props.VectorIndex = isVector props.VectorIndex = isVector
If type = INDEX_TYPE_STRING Or type = INDEX_TYPE_VECTOR_STRING Then If type = INDEX_TYPE_STRING Or type = INDEX_TYPE_VECTOR_STRING Then
value = NotNull(value, "") value = ClassAllgemeineFunktionen.NotNullString(value, "")
props.StringValue = value props.StringValue = value
ElseIf type = INDEX_TYPE_INTEGER Or type = INDEX_TYPE_INTEGER64 Or type = INDEX_TYPE_VECTOR_INTEGER_64 Then ElseIf type = INDEX_TYPE_INTEGER Or type = INDEX_TYPE_INTEGER64 Or type = INDEX_TYPE_VECTOR_INTEGER_64 Then
Try Try
value = NotNull(Of Integer)(value, 0) value = ClassAllgemeineFunktionen.NotNullString(value, 0)
If value = String.Empty Then If value = String.Empty Then
props.IntegerValue = 0 props.IntegerValue = 0
Else Else
@ -138,7 +138,7 @@ Public Class ClassFinalIndex
If value = "SQL-Command" Then If value = "SQL-Command" Then
props.FloatValue = 0 props.FloatValue = 0
Else Else
value = NotNull(Of Double)(value, 0) value = ClassAllgemeineFunktionen.NotNullString(value, 0)
If value = String.Empty Then If value = String.Empty Then
props.FloatValue = 0 props.FloatValue = 0
@ -148,7 +148,7 @@ Public Class ClassFinalIndex
End If End If
ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then ElseIf type = INDEX_TYPE_BOOLEAN Or type = INDEX_TYPE_VECTOR_BOOLEAN Then
value = NotNull(value, "False") value = ClassAllgemeineFunktionen.NotNullString(value, "False")
If value = "1" Or value.ToLower = "true" Then If value = "1" Or value.ToLower = "true" Then
props.BoolValue = True props.BoolValue = True

View File

@ -521,6 +521,10 @@ Public Class ClassInit
oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE" oSql = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
BASEDATA_DT_LANGUAGE = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE", New GetDatatableOptions(oSql, DatabaseType.ECM)) BASEDATA_DT_LANGUAGE = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE", New GetDatatableOptions(oSql, DatabaseType.ECM))
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() oStopWatch.Done()
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)

View File

@ -12,7 +12,7 @@ Public Class ClassRegexEditor
Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService) Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
Dim oRegexString As String = NotNull(value, String.Empty) Dim oRegexString As String = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
If oService IsNot Nothing Then If oService IsNot Nothing Then
Using oform As New frmRegexEditor() Using oform As New frmRegexEditor()

View File

@ -124,7 +124,7 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_DATA)> <Category(ClassConstants.CAT_DATA)>
Public Property SQLCommand() As SQLValue Public Property SQLCommand() As SQLValue
Get Get
Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_sql_command, "")) ', _sql_connection
End Get End Get
Set(ByVal value As SQLValue) Set(ByVal value As SQLValue)
_sql_command = value.Value _sql_command = value.Value
@ -150,7 +150,7 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_BEHAVIOUR)> <Category(ClassConstants.CAT_BEHAVIOUR)>
Public Property Enable_SQL() As SQLValue Public Property Enable_SQL() As SQLValue
Get Get
Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL, "")) ', _sql_connection
End Get End Get
Set(ByVal value As SQLValue) Set(ByVal value As SQLValue)
_Enable_SQL = value.Value _Enable_SQL = value.Value
@ -163,7 +163,7 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_BEHAVIOUR)> <Category(ClassConstants.CAT_BEHAVIOUR)>
Public Property Enable_SQL_OnLoad() As SQLValue Public Property Enable_SQL_OnLoad() As SQLValue
Get Get
Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Enable_SQL_ONLOAD, "")) ', _sql_connection
End Get End Get
Set(ByVal value As SQLValue) Set(ByVal value As SQLValue)
_Enable_SQL_ONLOAD = value.Value _Enable_SQL_ONLOAD = value.Value
@ -335,7 +335,7 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_DISPLAY)> <Category(ClassConstants.CAT_DISPLAY)>
Public Property CtrlImage() As ImageValue Public Property CtrlImage() As ImageValue
Get Get
Return New ImageValue(NotNull(_image_Value, "")) Return New ImageValue(ClassAllgemeineFunktionen.NotNullString(_image_Value, ""))
End Get End Get
Set(ByVal value As ImageValue) Set(ByVal value As ImageValue)
_image_Value = value.Value _image_Value = value.Value
@ -346,7 +346,7 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_VALIDATION)> <Category(ClassConstants.CAT_VALIDATION)>
Public Property Override_SQL() As SQLValue Public Property Override_SQL() As SQLValue
Get Get
Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection Return New SQLValue(ClassAllgemeineFunktionen.NotNullString(_Override_SQL, "")) ', _sql_connection
End Get End Get
Set(ByVal value As SQLValue) Set(ByVal value As SQLValue)
_Override_SQL = value.Value _Override_SQL = value.Value

View File

@ -32,10 +32,15 @@ Module ModuleRuntimeVariables
Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable
Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
Public Property CURRENT_ProfilGUID As Integer Public Property CURRENT_ProfilGUID As Integer
Public Property CURRENT_ProfilName As String Public Property CURRENT_ProfilName As String
Public Property CURRENT_PROFILE_LOG_INDEX As String Public Property CURRENT_PROFILE_LOG_INDEX As String
Public Property PROFILE_SHOW_DOCUMENT As Boolean = True Public Property PROFILE_SHOW_DOCUMENT As Boolean = True
Public Property PROFILE_NOT_RESP_COMMENT As Boolean = True
Public Property CURRENT_DOC_GUID As Int64 Public Property CURRENT_DOC_GUID As Int64
Public Property CURRENT_DOC_ID As Int64 Public Property CURRENT_DOC_ID As Int64

View File

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

View File

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

View File

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

View File

@ -1,5 +0,0 @@
BASE MODULE
===========
This module is intended for often used constants and datastructures.
Therefor it is important that this module does not have any dependencies on other modules!!

View File

@ -145,7 +145,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> <Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer"> <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.4.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\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Controls.LookupGrid"> <Reference Include="DigitalData.Controls.LookupGrid">
@ -154,11 +155,11 @@
<Reference Include="DigitalData.Controls.SnapPanel"> <Reference Include="DigitalData.Controls.SnapPanel">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.GUIs.Common, Version=2.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Base, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
@ -166,7 +167,7 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Database, Version=2.3.6.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference> </Reference>
@ -177,15 +178,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Interfaces, Version=2.3.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Interfaces">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Language">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.License"> <Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
@ -194,18 +189,10 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<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"> <Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath> <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
@ -391,8 +378,8 @@
</Reference> </Reference>
<Reference Include="System.IdentityModel" /> <Reference Include="System.IdentityModel" />
<Reference Include="System.IO.Compression" /> <Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath> <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath> <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
@ -456,9 +443,7 @@
<Compile Include="ClassAnnotation.vb" /> <Compile Include="ClassAnnotation.vb" />
<Compile Include="ClassConfig.vb" /> <Compile Include="ClassConfig.vb" />
<Compile Include="ClassConstants.vb" /> <Compile Include="ClassConstants.vb" />
<Compile Include="\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\SchreiberM\Downloads\taskFlow\ClassControlCreator.vb"> <Compile Include="ClassControlCreator.vb" />
<Link>ClassControlCreator.vb</Link>
</Compile>
<Compile Include="ClassDragDrop.vb" /> <Compile Include="ClassDragDrop.vb" />
<Compile Include="ClassFinalIndex.vb" /> <Compile Include="ClassFinalIndex.vb" />
<Compile Include="ClassFinalizeDoc.vb" /> <Compile Include="ClassFinalizeDoc.vb" />
@ -1241,22 +1226,6 @@
<None Include="Changelog.md" /> <None Include="Changelog.md" />
<Content Include="DD_Icons_ICO_PMANAGER_48px.ico" /> <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />
<Content Include="DD_taskFLOW_ICON.ico" /> <Content Include="DD_taskFLOW_ICON.ico" />
<Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
<Content Include="GdPicture.NET.14.barcode.1d.reader.dll" />
<Content Include="GdPicture.NET.14.barcode.2d.reader.64.dll" />
<Content Include="GdPicture.NET.14.barcode.2d.reader.dll" />
<Content Include="GdPicture.NET.14.filters.64.dll" />
<Content Include="GdPicture.NET.14.filters.dll" />
<Content Include="GdPicture.NET.14.image.gdimgplug.64.dll" />
<Content Include="GdPicture.NET.14.image.gdimgplug.dll" />
<Content Include="GdPicture.NET.14.Imaging.ML.64.dll" />
<Content Include="GdPicture.NET.14.Imaging.ML.dll" />
<Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
<Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
<Content Include="GdPicture.NET.14.machine.vision.64.dll" />
<Content Include="GdPicture.NET.14.machine.vision.dll" />
<Content Include="GdPicture.NET.14.twain.client.64.dll" />
<Content Include="GdPicture.NET.14.twain.client.dll" />
<Content Include="MailLicense.xml"> <Content Include="MailLicense.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -1284,7 +1253,6 @@
<None Include="Resources\DD_taskFLOW_BOOT.png" /> <None Include="Resources\DD_taskFLOW_BOOT.png" />
<None Include="Resources\DD_taskFLOW_ICON.png" /> <None Include="Resources\DD_taskFLOW_ICON.png" />
<None Include="Resources\AttachFileHS.png" /> <None Include="Resources\AttachFileHS.png" />
<Content Include="README.txt" />
<Content Include="task.ico" /> <Content Include="task.ico" />
<None Include="Resources\searchFlow_icon.png" /> <None Include="Resources\searchFlow_icon.png" />
<None Include="Resources\taskFlow_icon.png" /> <None Include="Resources\taskFlow_icon.png" />
@ -1357,16 +1325,16 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.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')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText> <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup> </PropertyGroup>
<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\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.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\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'))" />
</Target> </Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" /> <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')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@ -225,14 +225,14 @@ Public Class clsPatterns
Case GetType(TextEdit) Case GetType(TextEdit)
Try Try
oReplaceValue = Utils.NotNull(DirectCast(oControl, TextEdit).EditValue, String.Empty) oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, TextEdit).EditValue, String.Empty)
Catch ex As Exception Catch ex As Exception
LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}") LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
oReplaceValue = "" oReplaceValue = ""
End Try End Try
Case GetType(MemoEdit) Case GetType(MemoEdit)
Try Try
oReplaceValue = Utils.NotNull(DirectCast(oControl, MemoEdit).EditValue, String.Empty) oReplaceValue = ClassAllgemeineFunktionen.NotNullString(DirectCast(oControl, MemoEdit).EditValue, String.Empty)
Catch ex As Exception Catch ex As Exception
LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}") LOGGER.Warn($"Error in ReplaceValue MemoEdit: {ex.Message}")
oReplaceValue = "" oReplaceValue = ""

View File

@ -40,6 +40,7 @@ Partial Class frmAdmin_notResponsibleConfig
Me.Label2 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label()
Me.Label9 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label()
Me.cmbAttrComment = New System.Windows.Forms.ComboBox() Me.cmbAttrComment = New System.Windows.Forms.ComboBox()
Me.checkCommentMuss = New System.Windows.Forms.CheckBox()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
@ -193,11 +194,22 @@ Partial Class frmAdmin_notResponsibleConfig
Me.cmbAttrComment.Size = New System.Drawing.Size(295, 24) Me.cmbAttrComment.Size = New System.Drawing.Size(295, 24)
Me.cmbAttrComment.TabIndex = 106 Me.cmbAttrComment.TabIndex = 106
' '
'checkCommentMuss
'
Me.checkCommentMuss.AutoSize = True
Me.checkCommentMuss.Location = New System.Drawing.Point(548, 259)
Me.checkCommentMuss.Name = "checkCommentMuss"
Me.checkCommentMuss.Size = New System.Drawing.Size(208, 17)
Me.checkCommentMuss.TabIndex = 110
Me.checkCommentMuss.Text = "Begründung muss eingetragen werden"
Me.checkCommentMuss.UseVisualStyleBackColor = True
'
'frmAdmin_notResponsibleConfig 'frmAdmin_notResponsibleConfig
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(778, 340) Me.ClientSize = New System.Drawing.Size(778, 340)
Me.Controls.Add(Me.checkCommentMuss)
Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.Label9)
Me.Controls.Add(Me.cmbAttrComment) Me.Controls.Add(Me.cmbAttrComment)
Me.Controls.Add(Me.txtPROFILE_NOT_RESPONSIBLE_QUEST) Me.Controls.Add(Me.txtPROFILE_NOT_RESPONSIBLE_QUEST)
@ -236,4 +248,5 @@ Partial Class frmAdmin_notResponsibleConfig
Friend WithEvents Label2 As Label Friend WithEvents Label2 As Label
Friend WithEvents Label9 As Label Friend WithEvents Label9 As Label
Friend WithEvents cmbAttrComment As ComboBox Friend WithEvents cmbAttrComment As ComboBox
Friend WithEvents checkCommentMuss As CheckBox
End Class End Class

View File

@ -165,52 +165,53 @@
<data name="SimpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="SimpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0
bGUATmV4dDtBcnJvdztEb3duKXvBAwAACnFJREFUWEeVVgdUlUcWHnfTdlNxk3WTmD0REXDFBoIUYekP bGUATmV4dDtBcnJvdztEb3duKXvBAwAACqBJREFUWEeNlwdYVFcWx4+buptsEtxk3SRmv4gIKCoCihRh
sGIBUaOoFHvDREMRERQQEOmIYDdqYqICFoogKErUJJIISi8qqKEpSs9+uXceDzWb3T0753xn5p+5937f GdogKoIFRI2iUuwNEw2ogKCAgEhHpIglamIHpA0gKEjUJJgI6sDQixCa9GL2n+/eeUMmbp3v+3/3vfvu
vVPeE/7JViJgr7UIPGAjgg/bitAjtiLsS4WI+FohIk8qRFSqQsSk24m403Yi/py9oDbgvyHmjI3YmW4l Ped3zj33znvkk2hBfimW5H/aigLPWVPweWsK+VpMYZfFFH5NTBE3xBSVbkMxGTYUmzWfiGjcf1PUTSs6
Ik9ZivBvLETIV+Zi21EzseWwqfDfbyJ8U0zE57uMxGfxhmRObVOypbj3dK+of7pPNLTvF/c7Dkg86DhI nm5B4dfNKfSKiIK+MaMjF0zp0DkT8kk1pv1JxvTlCUP6ItaA2SI6mGhOTf0p1Nx/iloGUunZ4Gmu1sEz
OCQedh5iMxXBHwh/JLxEePk34DkGr7PdgHtPD4q7Tw+IO0/2i9q2faLm8R5R/ShFVLbuFuvjx5MJNd/d 1Dp4ltqGzio7/QMRvUJErxLRay+J9TGx52zcuKb+M9TYf5oa+lKprvcU1fYkU83zJJJ1n6Q9sXPlAPtP
FmS0Rwqob1eKaJAiDvKyiliSBh+20I1KtdkSl2FbkJBl+31itqI3KUfRG59h/UPcOevLO05YBPnvMRlH iqixP5kDNA/IIVo4xBllx9xp4DmRbsQNq0Mx2dbFcbnW38dLxC8S8sUvYrMtf4jJsiw5dlUU4JNsPJuI
tq+wPUEKudNGAh7vE9UqAS3JYn2cAS1R800yJ4XJ4u6TFKoECWmnahCoqTJ+OeSIuVNUunXZnlxHnC/x XhdgOEhDbyrV9ZyiGgVAVyLtidEXABLMqKEvkRr7kqiJgQykcClF/FrQeTPHiHRLaXKBA/IqPPHoWSik
ws374ShrjMaDjsMSZY0xNBeGrOK1SD4/FRGnzMsCDhjPJd9XCVJIbR95VWuyqGhJEl6xfQK8E81EXVsi 7ZFoHTzHJW2PwqNnIcgt34XEvMUIu24m9TtttIqI3lCA1AnOq7sTqaorgTyjBQCveFOq742nhr4T1NiX
idhFIpJIxG6elllvjDUcGnbcovBgnjN+qg9FfftuVD7ajpImfxQ3+eDGw3X44eFa/NToTfBFeUso7jzZ QE39JxXOX9kXbTA55JKo9EyhE35qDkbzwEnInh9FRYcPyju8Uda2Gz+07cJP7V74qX0/KruC0dB3Eg+b
jSKy3X9hFrYeM7nq5q+jTbG4IrIalS27REVzolgXq0+f1DYmmNDexNEexZOQBJ5i8pe8k4xttn9l0Zx7 g5F6azkOXzS+5+ozXVPICM+GrOsEVXXG0+7oOXKAfXHGVNsTQ3W9sVTfG6dw/qpXgpHV0W9EnQWPP0dt
61PUtEWh6OeNuHZ/Ba4/YKyU+O4hj5fj2oNl+LZhKa7UL8Hlex643rAO5a07kXXTC1uPTmheFTHWgWJy bwQe/rwP959txYNWpm1c37Wx6y2437oZ37Zswt3mjShpcseDlt2o7D6O3EeeOHxhXuf2MB1bIRscQtoZ
NaSIsuZ4sTZaj4bUPoszElWPo0hENH9K8g0x423Dj1t1Xa/djJuNPrhCQQvrCQ2eROSJq/eVvQqFDR5E S7si9eQAX8QYUnVPBNX2RI453xs11zr0ksXwgzpfPGr3xt0md5Q2u6O0xQPftnjg3jN5q1BpizvuNruh
7o6Ce4tx8c5C5NctQG7NfHzfsAGFVZux7YhZ97KQUf0iSptixeooXeYTYm2Uvqh8FMFDWXbPwNHagYdM uGkDbjesQ1H9WhTUrsH3LXtRWu2LI+dNRzYHzRyDeNoRTTsidOUAuyLmkOx52FjaPfy1Nf3PmrTfr/PG
G6/V+uDb+hW4dMdVouDuQiJYhMv1C58Dfd/jebIh5N+Zjwt185BTOxfnq1yQWemMvBoSV7kJfnsNm5zX t81bcafBhau4cR2Km9ajpHmdktajpIn1u+BOkwuKGtbgVv1q5NetQl61M3JkTiisdcdd2UEcSDHocNqp
aI4kDrkdqyLHMqcQ7sE6oqw1hIdcnle8kwwun73B5fRETo0LLtTOQR4FzKubi4t35xE+wfwtw2C0YCCM PkOxHNvDdeQAboHTSdodxC5Zel73StAvySxj6fRAfq0zbtWtRGHdKhTWr8LtxtW43fgZ1hyaAsO142G0
FzLehomrGlyDNJFb54Lz5JNd7YyMylk4Vz4Tp8sckVO9CKe+W451MWMLieMNAh9MTliIT/yHcydLvzp8 juldGLuowCVAHQX1zsirdYakxgnZsuXIqlyGDKkD8mvW4/p3W7A7SqeUiN4WCpMFTPSZz9Sx1O8InbUq
zNzwr2xwtWE1MqtmIItwvnqWRE6NE2XmRCTOMFn0DqrrHqDmzkPZV9Y8gOlCNSKeRVnPJPLpOFvuiPSy 9Bsr3GvZgZzqpcitXoq8muVc+bWOyK9zREG9E4zXv4ea+lbUNrTxVlbbCpN1KpDULEeObBmyZUuQWemA
KUi7PQUnSibhUu1KBH9hDVf/4QuJ6zUCJyzEvE1a3PHHq16xemXZJUtxrmI6zpRPwdmKKRRsGgmZhsxq dKkd0p7Y4WrFQtyp24bAryzh4jN1HRG9KQRMtPqghiL6Nzyj9aSSik3IqlqCm5V2yKyyQ7bMHrnV9sip
R+qnE8l0mLqrobunBz29vbLv6OqRc+cqHclnKk6Tb1rpZKTenkjk9jh+U4FviifiTNFyrIgYVUFcbxH6 cUBu9RJIapbAxE0FI6OjGH3xgreDw6O8L0vmgMyqxciotEPa00W48WQBrlbMx6VHYlwpX4CbD7dga9jM
qyCzd/LSsAvYZ0bldkXqLTukldlRBg5UwokUcBKJIlROljD3UEMnEXf19KKruxedJOCfNMd26WSfWuqA KiJ6RzkLPHpHTzUbv1OmKKxzwY3HNkiT2iBdaosM6QJkVC5EVtVCZMkWcZm5q2BodBTDoy8wPPICQ8Oj
U7fs8XWxgshtcexHaxy5YYWM8gXw22OGacvUpxCn6lZIAa+4fK4ZGZvmRIa25GhFyq1x8rYNThHSymwJ +Ie7Ch+XLl2AG09tcf3xfFwuF+PSI2tc/NES58sskF25FgeSTWG/WdVOaVdwgNedv1QPj05zxPkya1wu
CiKwI0EOsFxKAoi0s1uZfXtnj5xLvW2Hk7co2xIiLrbFlzetcfRHS3xRZIlD35nj4HUbxKc7YfYGzVji t8DVCktce2KF60+skCa1RppUjIxKG2RIbWG+SYU7HRqRRz8wNMr7bjyxwbXHYlypEONSuTW+fmSJCz+a
fJ3AL6xU8docH62ClFwnxF40RkKBEQkxJyEWcN40GBaearBapgbr5X1YMRBPO7rxtJNA/RMCz1sxSIgF 46uH5jj7nRnOPLBCbLojVuxVjyait4QTllO8udJbozipwBHRt40QV2yI82VmuFwugtPBiRB5qMBiswos
wZx8Zvp8iMMUZ/81MyRcoriXJmBv3mwQFx9G3oZ+AX928dFq3FswHdEXDLAzTx8xeeORdNkY+wsmY+ba twjaOh79gyPoHxrhbd/gCO+3YNqkAtEmFZh5qGCZ98c4V2aG1PumiLtjhLg785BSuAIrvTVYMbJlGAP4
MSivqkVpVQNuVdTjdmUD2tq7JB4/VaKkogEl5co1tp2xTg8p+ZNkjLh8I8TkjycYYt+VGZjnp91EnGoE k7O3RntK8RJE3tLH8cI5iCqci4QSI6QWL8KyXbNQWV2Hp9UteFzVjCeyFvQODHP19MtVUdWCikr5MzZ2
PgdSxeuzvbW6k6/YIyJXF5G54/pFJBaYIuALU2yKd0fvL/9C65MutLR1orWti8bUE/i75XEnmh51SZuA 6W49JBUt5DZiigwRVTQXUUUGOHV3KVYf0OwgIhWhDjjFWyu8NEYS785HWIEuwgtmj0HEF5vA7ysTHIx1
hCXYfMiUyM0Qd9FQkkdd0MeOXH3sKZyIub7a3cQ5kMC/olLAG84btbrjL5oj/LwuduToSRFRVI3oPAMk w4tf/onuvmF09Q6hu3cY3X1DXOy+q2cIHc+H+Ri/uI3wPWuChBJTxNw24M4jbs3BsYI5SC5dgFX7NUeI
F1phQZA2MgqO08H7BT+3dqCZCJsfd6DxERN34OeWDnkgs66cwPxALSKylhlHkT/H4XgRObq0DRZwoWSJ aLzwL8oB3nbapzESe9sMoXm6OJavxyEibukjslAfiaUWWBugieziSxge/QU/dw+is2cInT2DaH/OHA/i
8y8vCJj5qWbjjiwTEjAWEdl9IhgXxilFXLbDNC913L1fjSftPXjY0k7owIPmDtm3tXej/mEd2WggpcBe 565BXpC5d69ijb8GkkstecQRhfrcDrMXlq+LuDsiOHtpMIC//A5g2efq7cdyjRGap4MwiQDBdGu2HKLE
+nDW7M9xmJwRmT0BThs0eQv6BfAZeN1x1bDL274xRniWLsIyxyAse4zSgZx35OrJLCLSLeEWaC3vPmfe Bvaeqmh8VoO+gVG0dQ2grWsQrZ2DvO0dGEFzWz3sPdWQVDyfz2FRs/nMDnPOFC6ZB8e96mwJxgBYDbzl
0NSOhsZ2OeY5zyAFwtMs5dbtpIxVWTM43g5KLPiECRxXaVwlzv4zwAL+5LBEPXpjyngy1EVo5miEZo+W sH1KyZErRgjN1UVIziyESGbJJ+Tr4ViBHo8iLN0crv6WfO+zyFs6BtDSPsCvWZ9HgBihaeZ86Y4XzB6L
TrIifdsSm2+MtYm62H1iGxH+gnoirycRPE45GYI1CWNpzycoRTPIj/3Ds8dSUqNprIfP9xjCwX1IInG+ monZOybRReBVYzhsV7unXAMM4I+2G1Uj9yXNRYhEF8E52giWaPNJPCPCskQXGWFXvC5OXj2CkdFf0Nw+
cAtetXD5aMrCLaPIeBxCzo1ESMZIhGaM6q+GDERILLDAHH91XL+VT1ewR+L70gI4+w3BLlpT2THYjxMJ gOaOAX6ddC0IO+N0EHN7nhyaKU+Xzw+V6CAkRxuheXr4MtkAtm6T4l/eBW+InD+xW3doJkIlsxGUNQNB
zRwlY0VQ7EWBo2A6a7AzcfI7wNzKl5Dw9uRlQyv9jo6WAoLP6cieHTnAdspge19VYs7TQfIdjUdPWiXm 2TMQnD1zLBvcUJ4O4otFWOmjigePi9A/OMr1/dNiOB2YhBPForFxTGweCyQ4Zya3FSaZjfX+M2GyfKKT
+ekiOtOC1p6Rsn1IBpGTvyqO37ExmLJCo5q4/krgl3CAcFgylHrlW0BVcJ/nPwLbM8Zi65kR2HZ2hBQS cA6MHUQsFe8u2jxZduCCNgcIzJrOWzaRGTiao42jQlai8kRw3q+N533dXKsP6CIyR4QQFqnglI0Pytbm
rBLSJyYsWw+BXxrBN2EuNu36BAHHjKhyenJ9u8qOk6AqBp/VkXHCKOb8zSNg5jR4OXGpyj9A2HuqUy+r 8xV2DlycBbutajVE9FfhJBxHthsnj50FIudP3Fb7aOFotg4O39TCkUwtDhKoABFgQiR68P/aEPvjVuHg
wCfyHQdP9Wtrdo0gASOliK3k/EyIsiosaGfOeHju1IZnpBbtuaEkk1sn15WkzzASa5NGgGLfII5n2XNT ic/gd9EQoRI9/vyoYhwLInsGAjOnczsh2TpY46sFU8eJW5TSP47me6gqssAq8j1bD9X7O09o4fDNGRzi
uKuLs7eW8FAexjHWgwwnrxzW7H1kBIJIQNDpf8heVuQ5QYz4PDPE55thmyR8Rsq2Kp+gMzrwPqqDqSuG cKYyiDwrDOh4/lx4HNeER7gGwvMNuDO+dEL22JzfNAO7ErRg66Fa9rvo2U/spkqZjzeOFeMsywkGi7ZN
tuiYvWtGHPx/QJk9N4Wbukgv9hBpxW78yWfhDcOpH86Ytlqje/1+LWxJH04gEaeHK8UQAk+zsBeJGHK+ 6fQ6r4WAm1oIyJjGW54RJSCm2EJTxBaZ4gh3+JtTNlYxJ+DmdHhdmI7FWyd3TTd931R4H5BHzwFcVSm9
by6Q7NiPYziu0ejWn/S+C8V+h8CVHqDwkJX/NwGqrXjLYPIHsyYuHdq6PF6zT4QSgSTkRbAgAq/T9/O2 3J3Syl3ZLauFtw0Wf7zUfofayJ5UDRxKn4pD6dMQkDFVDpMxDf4ZDOz3jph4v9DnnzGNz2M2HHaqjcxZ
KxI0MWmpxiN9+/fnUEx+evnv2IA04lO4ybOnEuD2vACViDeHG71rYLv44x+cvDWw/qAWNlPQgHRtBKRR +KEzy7CQ6XFid575fwFQLMU7+os+Wr5g0+TuLbHqAoRc/hkviwFNgz97nvHbOKatcepYuEnt+Zz5H64U
T+BvJuJ+83NzbOvsMwy2i4YUaRoMNKZYnLkkZzAX88rGA55gsBBqKhG8HXxX3zOc9uFyxeIhtY5eQ7E4 jl72OjYurdydxK689hQArsoACog/TzV8X996w6c/OHqpYc8ZDfimT4Vfuib80qZysXvmiLW+Sn1srJP3
TAPr9mpiwyEt+KdpY3OqNjYc1sK6fVpwozVHeooVi9XrDKcOXkm+fyO8SZBlZ6h4fiPAo68KvBUePK0S FFivn/RQXX+8kRA5dy4HcOV+xwBYBxMDUYJgy8H26gcG9h9vEW+YVOfgORkbQtSwO0Ude89qwCdNE743
wYeFTyxfm0FjrAZNNp399zgr1yFF1q4fl9IBBsPGdUiplevHRaazP4ofbTloKtm+T+Cs+b8fJ9JP/rsC NLH3nAZ2n9KAa4gaHDzVIN6gWm+weOI2IvobC0SRdoVz5uclAHchC2wp3JUhWLGwimXbZsIsiwmLTFb8
/hOoPS+ES8gV4cDvETi7D/rAY75e/L7zKWfR/cS/F5vx/zSVEL6qHJhLyoKYiMFjnuM1tlHZ/48mxK89 PcbCZdJDS5dPn4rdVMFk5TLpqYXLpw9NVnwSq20+YTERfShEzd79FK9e3Pm/BfhPegmEpZBlhBn+QIju
+oEotzUUCQAAAABJRU5ErkJggg== I0Hsmm0vdr6zKld8kvH5L9tVsv9//xQgbKsqvowZEHPExK4VX8j860fQ//z9Cj36gSjD0TzyAAAAAElF
TkSuQmCC
</value> </value>
</data> </data>
<data name="frmAdmin_notResponsibleConfig.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="frmAdmin_notResponsibleConfig.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@ -21,12 +21,18 @@ Public Class frmAdmin_notResponsibleConfig
End Sub End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}" Dim oUpd = $"UPDATE TBPM_PROFILE SET NOT_RESP_COMMENT = '{checkCommentMuss.Checked}', NOT_RESP_SQL = '{oNotResponsible_SQL.Replace("'", "''")}',NOT_RESP_COMMENT_ATTRIBUTE = '{cmbAttrComment.Text}', CHANGED_WHO = '{User.UserName}' WHERE GUID = {oProfilID}"
If DatabaseECM.ExecuteNonQuery(oUpd) = True Then If DatabaseECM.ExecuteNonQuery(oUpd) = True Then
oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_QUEST','{txtPROFILE_NOT_RESPONSIBLE_QUEST.Text}','','{USER_USERNAME}','{oProfilID}',0" oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_QUEST{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_QUEST','{txtPROFILE_NOT_RESPONSIBLE_QUEST.Text}','','{USER_USERNAME}','{oProfilID}',0"
LOGGER.Debug($"oUpd: {oUpd}")
If DatabaseECM.ExecuteNonQuery(oUpd) Then If DatabaseECM.ExecuteNonQuery(oUpd) Then
oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_REJECTION_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_REJECTION_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
bstitmInfo.Caption = "Data saved successfully - " + Now.ToString oUpd = $"EXEC PRDD_GUI_LANGUAGE_PHRASE 'PM','PROFILE_NOT_RESPONSIBLE_CAPT{oProfilID}','{USER_LANGUAGE}','PROFILE_NOT_RESPONSIBLE_CAPT','{txtCaption_NotResponsible.Text}','','{USER_USERNAME}','{oProfilID}',0"
If DatabaseECM.ExecuteNonQuery(oUpd) Then
bstitmInfo.Caption = "Data saved successfully - " + Now.ToString
LOGGER.Debug($"oUpd: {oUpd}")
End If
End If End If
@ -38,10 +44,11 @@ Public Class frmAdmin_notResponsibleConfig
Private Sub frmAdmin_notResponsibleConfig_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmAdmin_notResponsibleConfig_Load(sender As Object, e As EventArgs) Handles Me.Load
Try Try
Dim oNR_Act_Attr As String Dim oNR_Act_Attr As String
Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE FROM TBPM_PROFILE WHERE GUID = {oProfilID}" Dim oSQL = $"SELECT NOT_RESP_SQL, NOT_RESP_COMMENT_ATTRIBUTE,NOT_RESP_COMMENT FROM TBPM_PROFILE WHERE GUID = {oProfilID}"
Dim oDT = DatabaseECM.GetDatatable(oSQL) Dim oDT = DatabaseECM.GetDatatable(oSQL)
oNotResponsible_SQL = oDT.Rows(0).Item("NOT_RESP_SQL") oNotResponsible_SQL = oDT.Rows(0).Item("NOT_RESP_SQL")
oNR_Act_Attr = oDT.Rows(0).Item("NOT_RESP_COMMENT_ATTRIBUTE") oNR_Act_Attr = oDT.Rows(0).Item("NOT_RESP_COMMENT_ATTRIBUTE")
checkCommentMuss.Checked = oDT.Rows(0).Item("NOT_RESP_COMMENT")
LOGGER.Debug($"oNR_Act_Attr: {oNR_Act_Attr}") LOGGER.Debug($"oNR_Act_Attr: {oNR_Act_Attr}")

View File

@ -674,17 +674,17 @@ Public Class frmAdministration
pgFinalIndexes.SelectedObject = Nothing pgFinalIndexes.SelectedObject = Nothing
Dim guid As Integer = focusedRow.Item("GUID") Dim guid As Integer = focusedRow.Item("GUID")
Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing) Dim index As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("INDEXNAME"), Nothing)
Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "") Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SQL_COMMAND"), "")
' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0) ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONNECTION_ID"), 0)
Dim value As String = NotNull(focusedRow.Item("VALUE"), "") Dim value As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("VALUE"), "")
Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True) Dim active As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ACTIVE"), True)
Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "") Dim description As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("DESCRIPTION"), "")
Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False) Dim preventDuplicates As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("PREVENT_DUPLICATES"), False)
Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False) Dim allowNewValues As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("ALLOW_NEW_VALUES"), False)
Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add") Dim VectorBehaviour As String = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add")
Dim oSequence As Int16 = NotNull(focusedRow.Item("SEQUENCE"), 0) Dim oSequence As Int16 = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("SEQUENCE"), 0)
Dim oIndetermined As Boolean = NotNull(focusedRow.Item("CONTINUE_INDETERMINED"), False) Dim oIndetermined As Boolean = ClassAllgemeineFunktionen.NotNullString(focusedRow.Item("CONTINUE_INDETERMINED"), False)
CURRENT_INDEX_ID = guid CURRENT_INDEX_ID = guid
Dim obj As New FinalIndexProperties With { Dim obj As New FinalIndexProperties With {
@ -1074,25 +1074,25 @@ Public Class frmAdministration
Else Else
value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex) value = FINALINDICES.GetValue(obj, obj.IndexName, MyIndicies, MyIndicies_Types, obj.VectorIndex)
End If End If
value = NotNull(value, String.Empty) value = ClassAllgemeineFunktionen.NotNullString(value, String.Empty)
Dim guid = obj.GUID Dim guid = obj.GUID
Dim oProfileId As Integer = PROFILGUIDTextBox.Text Dim oProfileId As Integer = PROFILGUIDTextBox.Text
focusedRowHandle = 199 focusedRowHandle = 199
focusedRowHandle = viewFinalIndex.FocusedRowHandle focusedRowHandle = viewFinalIndex.FocusedRowHandle
'Dim connectionId As Integer = obj.ConnectionId 'Dim connectionId As Integer = obj.ConnectionId
' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1) ' Dim connectionId As Integer = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.ConnectionId, 1)
Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''") Dim sqlCommand As String = ClassAllgemeineFunktionen.NotNullString(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
Dim indexName As String = NotNull(obj.IndexName, String.Empty) Dim indexName As String = ClassAllgemeineFunktionen.NotNullString(obj.IndexName, String.Empty)
Dim isVectorIndex As Boolean = obj.VectorIndex Dim isVectorIndex As Boolean = obj.VectorIndex
Dim addedWho As String = USER_USERNAME Dim addedWho As String = USER_USERNAME
Dim description As String = obj.Description Dim description As String = obj.Description
Dim active As Integer = IIf(obj.Active, 1, 0) Dim active As Integer = IIf(obj.Active, 1, 0)
Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0) Dim preventDuplicates As Integer = IIf(obj.PreventDuplicates, 1, 0)
Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0) Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0)
Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty) Dim IF_VEKTOR_BEHAVIOUR As String = ClassAllgemeineFunktionen.NotNullString(obj.VectorBehaviour, String.Empty)
Dim oDescription As String = NotNull(obj.Description, String.Empty) Dim oDescription As String = ClassAllgemeineFunktionen.NotNullString(obj.Description, String.Empty)
Dim oSequence As Integer = obj.Sequence Dim oSequence As Integer = obj.Sequence
Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState
If indexName = String.Empty Then If indexName = String.Empty Then

View File

@ -330,7 +330,6 @@ Public Class frmConnection
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical) MsgBox("Error while loading Databases. Default Database will be set!" & vbCrLf & ex.Message, MsgBoxStyle.Critical)
DD_LIB_Standards.clsLogger.Add("Error while loading Databases:" & ex.Message)
Finally Finally
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Try End Try

View File

@ -1,12 +1,10 @@
Imports System.ComponentModel Imports System.ComponentModel
Imports DD_LIB_Standards
Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
Imports DigitalData.Controls.LookupGrid Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Language
Imports System.Drawing Imports System.Drawing
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DevExpress.Utils.Filtering.Internal Imports DevExpress.Utils.Filtering.Internal
@ -52,7 +50,7 @@ Public Class frmFormDesigner
ORDER BY NAME" ORDER BY NAME"
) )
CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable(). CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable().
Select(Function(row) row.ItemEx("NAME", String.Empty)). Select(Function(row) ClassAllgemeineFunktionen.NotNullString(row.Item("NAME"), String.Empty)).
ToList() ToList()
_Logger.debug("Reloading control name list done!") _Logger.debug("Reloading control name list done!")
End Sub End Sub
@ -79,7 +77,7 @@ Public Class frmFormDesigner
' Try ' Try
' Windream initialisieren ' Windream initialisieren
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
clsWindream.Create_Session() 'clsWindream.Create_Session()
bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else Else
bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitButton.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@ -90,7 +88,7 @@ Public Class frmFormDesigner
Dim unsortedIndicies Dim unsortedIndicies
Dim sortedIndicies As List(Of String) Dim sortedIndicies As List(Of String)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
unsortedIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList() unsortedIndicies = WINDREAM_MOD.GetIndiciesByObjecttype(CURRENT_OBJECTTYPE).ToList()
sortedIndicies = unsortedIndicies '.OrderBy(Function(index As String) index).ToList() sortedIndicies = unsortedIndicies '.OrderBy(Function(index As String) index).ToList()
sortedIndicies = sortedIndicies.OrderBy(Function(index As String) index).ToList sortedIndicies = sortedIndicies.OrderBy(Function(index As String) index).ToList
Else Else
@ -112,7 +110,7 @@ Public Class frmFormDesigner
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
Windream_ChoiceLists = New List(Of String) Windream_ChoiceLists = New List(Of String)
Windream_ChoiceLists.Add(String.Empty) Windream_ChoiceLists.Add(String.Empty)
Windream_ChoiceLists.AddRange(clsWD_GET.GetChoiceLists()) Windream_ChoiceLists.AddRange(WINDREAM_MOD.GetChoiceLists())
End If End If
'Catch ex As Exception 'Catch ex As Exception
@ -146,7 +144,7 @@ Public Class frmFormDesigner
Dim missingIndexControls As New List(Of String) Dim missingIndexControls As New List(Of String)
For Each row As DataRow In dt.Rows For Each row As DataRow In dt.Rows
If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then If ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
missingIndexControls.Add(row.Item("NAME")) missingIndexControls.Add(row.Item("NAME"))
End If End If
Next Next
@ -176,7 +174,7 @@ Public Class frmFormDesigner
Private Function IsVectorIndex(IndexName As String) As Boolean Private Function IsVectorIndex(IndexName As String) As Boolean
Dim oType As Integer Dim oType As Integer
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -185,9 +183,9 @@ Public Class frmFormDesigner
End Function End Function
Private Function IsNotBooleanIndex(IndexName As String) As Boolean Private Function IsNotBooleanIndex(IndexName As String) As Boolean
Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -195,9 +193,9 @@ Public Class frmFormDesigner
End Function End Function
Private Function IsNotDateIndex(IndexName As String) As Boolean Private Function IsNotDateIndex(IndexName As String) As Boolean
Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -205,9 +203,9 @@ Public Class frmFormDesigner
End Function End Function
Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean
Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -215,9 +213,9 @@ Public Class frmFormDesigner
End Function End Function
Private Function IsNotVectorDateIndex(IndexName As String) As Boolean Private Function IsNotVectorDateIndex(IndexName As String) As Boolean
Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -225,9 +223,9 @@ Public Class frmFormDesigner
End Function End Function
Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean
Dim oType As Integer '= clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
If IDB_ACTIVE = False Then If IDB_ACTIVE = False Then
oType = clsWD_GET.GetTypeOfIndexAsIntByName(IndexName) oType = WINDREAM_MOD.GetIndexType(IndexName)
Else Else
oType = IDBData.GetTypeOfIndex(IndexName) oType = IDBData.GetTypeOfIndex(IndexName)
End If End If
@ -248,12 +246,12 @@ Public Class frmFormDesigner
Dim name As String = row.Item("NAME") Dim name As String = row.Item("NAME")
Dim x As Integer = row.Item("X_LOC") Dim x As Integer = row.Item("X_LOC")
Dim y As Integer = row.Item("Y_LOC") Dim y As Integer = row.Item("Y_LOC")
Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular) Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10) Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial") Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
Dim family As FontFamily = New FontFamily(familyString) Dim family As FontFamily = New FontFamily(familyString)
Dim font As New Font(family, size, style, GraphicsUnit.Point) Dim font As New Font(family, size, style, GraphicsUnit.Point)
Dim color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), 0)) Dim color As Color = IntToColor(ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0))
' Jetzt die Control spezifischen Eigenschaften zuweisen ' Jetzt die Control spezifischen Eigenschaften zuweisen
@ -581,17 +579,17 @@ Public Class frmFormDesigner
obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC")) obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
obj.Name = row.Item("NAME") obj.Name = row.Item("NAME")
obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT")) obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing) obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "") obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")
Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular) Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10) Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), "Arial") Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
Dim family As FontFamily = New FontFamily(familyString) Dim family As FontFamily = New FontFamily(familyString)
obj.Font = New Font(family, size, style) obj.Font = New Font(family, size, style)
Dim color As Integer = NotNull(row.Item("FONT_COLOR"), 0) Dim color As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)
obj.TextColor = IntToColor(color) obj.TextColor = IntToColor(color)
@ -614,11 +612,11 @@ Public Class frmFormDesigner
obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED")) obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED"))
obj.Required = StrToBool(row.Item("VALIDATION")) obj.Required = StrToBool(row.Item("VALIDATION"))
obj.Active = StrToBool(row.Item("CONTROL_ACTIVE")) obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
obj.Index = NotNull(row.Item("INDEX_NAME"), "") obj.Index = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "")
obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing) obj.DefaultValue = ClassAllgemeineFunktionen.NotNullString(row.Item("DEFAULT_VALUE"), Nothing)
' Default value for ConnectionID ' Default value for ConnectionID
Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0) Dim oConnectionId = ClassAllgemeineFunktionen.NotNullString(row.Item("CONNECTION_ID"), 0)
obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG")) obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
Return obj Return obj
End Function End Function
@ -679,9 +677,9 @@ Public Class frmFormDesigner
Dim check As CheckBox = sender Dim check As CheckBox = sender
Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies) Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, oRow, Source_AllIndicies)
checkProps.Text = check.Text checkProps.Text = check.Text
checkProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) checkProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
checkProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) checkProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) checkProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
props = checkProps props = checkProps
ElseIf TypeOf sender Is LookupControl3 Then ElseIf TypeOf sender Is LookupControl3 Then
Dim oLookup As LookupControl3 = sender Dim oLookup As LookupControl3 = sender
@ -690,20 +688,20 @@ Public Class frmFormDesigner
lookupProps.PreventDuplicates = StrToBool(oRow.Item("VKT_PREVENT_MULTIPLE_VALUES")) lookupProps.PreventDuplicates = StrToBool(oRow.Item("VKT_PREVENT_MULTIPLE_VALUES"))
lookupProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM")) lookupProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
lookupProps.DisplayAsComboBox = False lookupProps.DisplayAsComboBox = False
lookupProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) lookupProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
lookupProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) lookupProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
lookupProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) lookupProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
props = lookupProps props = lookupProps
ElseIf TypeOf sender Is TextEdit Then ElseIf TypeOf sender Is TextEdit Then
'Dim txt As TextEdit = sender 'Dim txt As TextEdit = sender
Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies) Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies)
txtProps.Regex = NotNull(oRow.Item("REGEX_MATCH"), String.Empty) txtProps.Regex = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MATCH"), String.Empty)
txtProps.RegexMessage = NotNull(oRow.Item("REGEX_MESSAGE_DE"), String.Empty) txtProps.RegexMessage = ClassAllgemeineFunktionen.NotNullString(oRow.Item("REGEX_MESSAGE_DE"), String.Empty)
txtProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) txtProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
txtProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) txtProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
txtProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) txtProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
txtProps.DisplayFormat = oRow.ItemEx("FORMAT_STRING", ClassControlCreator.CONTROL_TYPE_TEXT) txtProps.DisplayFormat = ClassAllgemeineFunktionen.NotNullString(oRow.Item("FORMAT_STRING"), ClassControlCreator.CONTROL_TYPE_TEXT)
props = txtProps props = txtProps
@ -711,18 +709,18 @@ Public Class frmFormDesigner
Dim cmb As Windows.Forms.ComboBox = sender Dim cmb As Windows.Forms.ComboBox = sender
Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, oRow, Source_AllIndicies) Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, oRow, Source_AllIndicies)
cmbProps.ChoiceLists = Windream_ChoiceLists cmbProps.ChoiceLists = Windream_ChoiceLists
cmbProps.ChoiceList = NotNull(oRow.Item("CHOICE_LIST"), String.Empty) cmbProps.ChoiceList = ClassAllgemeineFunktionen.NotNullString(oRow.Item("CHOICE_LIST"), String.Empty)
cmbProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) cmbProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
cmbProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) cmbProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
cmbProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) cmbProps.SetControlData = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SET_CONTROL_DATA"), ""))
props = cmbProps props = cmbProps
cmbProps.DisplayAsLookUpControl = False cmbProps.DisplayAsLookUpControl = False
ElseIf TypeOf sender Is DateTimePicker Then ElseIf TypeOf sender Is DateTimePicker Then
Dim dtp As DateTimePicker = sender Dim dtp As DateTimePicker = sender
Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, oRow, Source_AllIndicies) Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, oRow, Source_AllIndicies)
dtpProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) dtpProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
dtpProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) dtpProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
props = dtpProps props = dtpProps
ElseIf TypeOf sender Is DataGridView Then ElseIf TypeOf sender Is DataGridView Then
@ -737,17 +735,17 @@ Public Class frmFormDesigner
Dim oGridControl As GridControl = sender Dim oGridControl As GridControl = sender
Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, oRow, Source_VectorIndicies) Dim oGridProps As GridControlProperties = CreatePropsObjectWithIndicies(New GridControlProperties, oRow, Source_VectorIndicies)
oGridProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM")) oGridProps.AllowAddNewValues = StrToBool(oRow.Item("VKT_ADD_ITEM"))
oGridProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) oGridProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
oGridProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) oGridProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
props = oGridProps props = oGridProps
ElseIf TypeOf sender Is Button Then ElseIf TypeOf sender Is Button Then
Dim oButton As Button = sender Dim oButton As Button = sender
Dim oButtonProps As ButtonProperties = CreatePropsObject(New ButtonProperties, oRow, Source_VectorIndicies) Dim oButtonProps As ButtonProperties = CreatePropsObject(New ButtonProperties, oRow, Source_VectorIndicies)
oButtonProps.Text = oButton.Text oButtonProps.Text = oButton.Text
oButtonProps.SQLCommand = New SQLValue(oRow.Item("SQL_UEBERPRUEFUNG")) oButtonProps.SQLCommand = New SQLValue(oRow.Item("SQL_UEBERPRUEFUNG"))
oButtonProps.Override_SQL = New SQLValue(NotNull(oRow.Item("SQL2"), "")) oButtonProps.Override_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL2"), ""))
oButtonProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) oButtonProps.Enable_SQL = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE"), ""))
oButtonProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) oButtonProps.Enable_SQL_OnLoad = New SQLValue(ClassAllgemeineFunktionen.NotNullString(oRow.Item("SQL_ENABLE_ON_LOAD"), ""))
If Not IsDBNull(oRow.Item("IMAGE_CONTROL")) Then If Not IsDBNull(oRow.Item("IMAGE_CONTROL")) Then
Dim obimg() As Byte = oRow.Item("IMAGE_CONTROL") Dim obimg() As Byte = oRow.Item("IMAGE_CONTROL")
Dim oBitmap As Bitmap = ByteArrayToBitmap(obimg) Dim oBitmap As Bitmap = ByteArrayToBitmap(obimg)
@ -980,7 +978,7 @@ Public Class frmFormDesigner
Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click
Try Try
Dim oGuid = clsTools.ShortGuid() Dim oGuid = ClassAllgemeineFunktionen.NewShortGuid()
Dim oColumnName As String = "colNew" & oGuid Dim oColumnName As String = "colNew" & oGuid
Dim oColumnCaption As String = "New Column " & oGuid Dim oColumnCaption As String = "New Column " & oGuid
If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then

View File

@ -83,6 +83,7 @@ Partial Class frmMain
Me.BBtnItmNotfications = New DevExpress.XtraBars.BarButtonItem() Me.BBtnItmNotfications = New DevExpress.XtraBars.BarButtonItem()
Me.BSIVERSION1 = New DevExpress.XtraBars.BarStaticItem() Me.BSIVERSION1 = New DevExpress.XtraBars.BarStaticItem()
Me.barbtnitmsaveLogfiles = New DevExpress.XtraBars.BarButtonItem() Me.barbtnitmsaveLogfiles = New DevExpress.XtraBars.BarButtonItem()
Me.bsitmCount = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -193,9 +194,6 @@ Partial Class frmMain
Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlWorkflows, System.ComponentModel.ISupportInitialize).BeginInit()
@ -214,8 +212,6 @@ Partial Class frmMain
CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl1.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'ImageListProfile 'ImageListProfile
@ -259,6 +255,7 @@ Partial Class frmMain
'GridControlWorkflows 'GridControlWorkflows
' '
resources.ApplyResources(Me.GridControlWorkflows, "GridControlWorkflows") resources.ApplyResources(Me.GridControlWorkflows, "GridControlWorkflows")
Me.GridControlWorkflows.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlWorkflows.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlWorkflows.MainView = Me.GridViewWorkflows Me.GridControlWorkflows.MainView = Me.GridViewWorkflows
Me.GridControlWorkflows.MenuManager = Me.RibbonControl1 Me.GridControlWorkflows.MenuManager = Me.RibbonControl1
Me.GridControlWorkflows.Name = "GridControlWorkflows" Me.GridControlWorkflows.Name = "GridControlWorkflows"
@ -274,6 +271,7 @@ Partial Class frmMain
Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseForeColor = True Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseForeColor = True
Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseTextOptions = True Me.GridViewWorkflows.Appearance.ViewCaption.Options.UseTextOptions = True
Me.GridViewWorkflows.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near Me.GridViewWorkflows.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
Me.GridViewWorkflows.DetailHeight = 442
Me.GridViewWorkflows.GridControl = Me.GridControlWorkflows Me.GridViewWorkflows.GridControl = Me.GridControlWorkflows
Me.GridViewWorkflows.Name = "GridViewWorkflows" Me.GridViewWorkflows.Name = "GridViewWorkflows"
Me.GridViewWorkflows.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewWorkflows.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@ -293,11 +291,13 @@ Partial Class frmMain
' '
'RibbonControl1 'RibbonControl1
' '
Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(37, 38, 37, 38)
Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles}) Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage_Change, Me.BarButtonItem10, Me.BBtnItmNotfications, Me.BSIVERSION1, Me.barbtnitmsaveLogfiles, Me.bsitmCount})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 56 Me.RibbonControl1.MaxItemId = 57
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.OptionsMenuMinWidth = 403
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen})
Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize})
Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013
@ -726,6 +726,13 @@ Partial Class frmMain
Me.barbtnitmsaveLogfiles.Name = "barbtnitmsaveLogfiles" Me.barbtnitmsaveLogfiles.Name = "barbtnitmsaveLogfiles"
Me.barbtnitmsaveLogfiles.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Me.barbtnitmsaveLogfiles.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
' '
'bsitmCount
'
resources.ApplyResources(Me.bsitmCount, "bsitmCount")
Me.bsitmCount.Id = 56
Me.bsitmCount.Name = "bsitmCount"
Me.bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
'
'RibbonPageStart 'RibbonPageStart
' '
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW}) Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW})
@ -852,6 +859,7 @@ Partial Class frmMain
Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1) Me.RibbonStatusBar1.ItemLinks.Add(Me.BSIVERSION1)
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync)
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDebug)
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmCount)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@ -979,6 +987,7 @@ Partial Class frmMain
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlBottom) Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlBottom)
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlLeft) Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlLeft)
Me.DocumentViewerBarManager1.DockControls.Add(Me.barDockControlRight) 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.Form = Me
Me.DocumentViewerBarManager1.ImageStream = CType(resources.GetObject("DocumentViewerBarManager1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer) 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}) 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})
@ -1594,29 +1603,11 @@ Partial Class frmMain
Me.BarButtonItem9.Name = "BarButtonItem9" Me.BarButtonItem9.Name = "BarButtonItem9"
Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
' '
'XtraTabControl1
'
resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
Me.XtraTabControl1.Name = "XtraTabControl1"
Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
'
'XtraTabPage1
'
Me.XtraTabPage1.Name = "XtraTabPage1"
resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
'
'XtraTabPage2
'
Me.XtraTabPage2.Name = "XtraTabPage2"
resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
'
'frmMain 'frmMain
' '
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True
resources.ApplyResources(Me, "$this") resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.XtraTabControl1)
Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonControl1)
@ -1649,8 +1640,6 @@ Partial Class frmMain
CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False)
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@ -1824,7 +1813,5 @@ Partial Class frmMain
Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents GridViewWorkflows As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents BSIVERSION1 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem Friend WithEvents barbtnitmsaveLogfiles As DevExpress.XtraBars.BarButtonItem
Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents bsitmCount As DevExpress.XtraBars.BarStaticItem
Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
End Class End Class

View File

@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAVABCwFQAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAWgBCwFoAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -176,13 +176,19 @@
<data name="GridControlWorkflows.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlWorkflows.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="GridControlWorkflows.EmbeddedNavigator.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="GridControlWorkflows.Location" type="System.Drawing.Point, System.Drawing"> <data name="GridControlWorkflows.Location" type="System.Drawing.Point, System.Drawing">
<value>233, 24</value> <value>285, 30</value>
</data> </data>
<data name="GridViewWorkflows.Appearance.ViewCaption.Font" type="System.Drawing.Font, System.Drawing"> <data name="GridViewWorkflows.Appearance.ViewCaption.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 12pt</value> <value>Segoe UI, 12pt</value>
</data> </data>
<data name="GridControlWorkflows.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="bbtniRefresh.Caption" xml:space="preserve"> <data name="bbtniRefresh.Caption" xml:space="preserve">
<value>Aktualisieren</value> <value>Aktualisieren</value>
</data> </data>
@ -1487,9 +1493,15 @@
OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value> </value>
</data> </data>
<data name="bsitmCount.Caption" xml:space="preserve">
<value>0 Filtered Rows</value>
</data>
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="RibbonControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="RibbonPageStart.Text" xml:space="preserve"> <data name="RibbonPageStart.Text" xml:space="preserve">
<value>Start</value> <value>Start</value>
</data> </data>
@ -1500,13 +1512,16 @@
<value>Aktionen</value> <value>Aktionen</value>
</data> </data>
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1178, 158</value> <value>1440, 194</value>
</data> </data>
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 666</value> <value>0, 841</value>
</data>
<data name="RibbonStatusBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing"> <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>1178, 22</value> <value>1440, 28</value>
</data> </data>
<data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
<value>RibbonStatusBar1</value> <value>RibbonStatusBar1</value>
@ -1518,7 +1533,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
<value>4</value> <value>3</value>
</data> </data>
<data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
<value>RibbonControl1</value> <value>RibbonControl1</value>
@ -1530,10 +1545,10 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
<value>5</value> <value>4</value>
</data> </data>
<data name="GridControlWorkflows.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlWorkflows.Size" type="System.Drawing.Size, System.Drawing">
<value>715, 354</value> <value>1155, 617</value>
</data> </data>
<data name="GridControlWorkflows.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlWorkflows.TabIndex" type="System.Int32, mscorlib">
<value>10</value> <value>10</value>
@ -1566,10 +1581,13 @@
<value>Top</value> <value>Top</value>
</data> </data>
<data name="Panel2.Location" type="System.Drawing.Point, System.Drawing"> <data name="Panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>233, 0</value> <value>285, 0</value>
</data>
<data name="Panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="Panel2.Size" type="System.Drawing.Size, System.Drawing"> <data name="Panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>715, 24</value> <value>1155, 30</value>
</data> </data>
<data name="Panel2.TabIndex" type="System.Int32, mscorlib"> <data name="Panel2.TabIndex" type="System.Int32, mscorlib">
<value>9</value> <value>9</value>
@ -1642,7 +1660,7 @@
<value>863, 17</value> <value>863, 17</value>
</metadata> </metadata>
<data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing"> <data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 30</value> <value>262, 30</value>
</data> </data>
<data name="&gt;&gt;cmsNavPane.Name" xml:space="preserve"> <data name="&gt;&gt;cmsNavPane.Name" xml:space="preserve">
<value>cmsNavPane</value> <value>cmsNavPane</value>
@ -1772,11 +1790,14 @@
<data name="NavBarControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="NavBarControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="NavBarControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="resource.ExpandedWidth" type="System.Int32, mscorlib"> <data name="resource.ExpandedWidth" type="System.Int32, mscorlib">
<value>233</value> <value>285</value>
</data> </data>
<data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 378</value> <value>285, 647</value>
</data> </data>
<data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib"> <data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib">
<value>5</value> <value>5</value>
@ -1796,14 +1817,20 @@
<data name="&gt;&gt;NavBarControl1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;NavBarControl1.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="Panel1.Font" type="System.Drawing.Font, System.Drawing"> <data name="Panel1.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9pt</value> <value>Tahoma, 9pt</value>
</data> </data>
<data name="Panel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>230, 288</value> <value>0, 194</value>
</data>
<data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="Panel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>948, 378</value> <value>1440, 647</value>
</data> </data>
<data name="Panel1.TabIndex" type="System.Int32, mscorlib"> <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>4</value>
@ -1818,7 +1845,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
<value>3</value> <value>2</value>
</data> </data>
<data name="RibbonPageGroup1.Text" xml:space="preserve"> <data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>Allgemein</value> <value>Allgemein</value>
@ -1854,10 +1881,13 @@
<value>Tahoma, 9.75pt, style=Bold</value> <value>Tahoma, 9.75pt, style=Bold</value>
</data> </data>
<data name="lblCaptionMainGrid.Location" type="System.Drawing.Point, System.Drawing"> <data name="lblCaptionMainGrid.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value> <value>4, 4</value>
</data>
<data name="lblCaptionMainGrid.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data> </data>
<data name="lblCaptionMainGrid.Size" type="System.Drawing.Size, System.Drawing"> <data name="lblCaptionMainGrid.Size" type="System.Drawing.Size, System.Drawing">
<value>127, 16</value> <value>169, 21</value>
</data> </data>
<data name="lblCaptionMainGrid.TabIndex" type="System.Int32, mscorlib"> <data name="lblCaptionMainGrid.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -1878,7 +1908,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
<value>219, 26</value> <value>261, 26</value>
</data> </data>
<data name="tsmiValidationProfil.Text" xml:space="preserve"> <data name="tsmiValidationProfil.Text" xml:space="preserve">
<value>Starte Validierung für Profil</value> <value>Starte Validierung für Profil</value>
@ -1893,7 +1923,7 @@
<value>250, 56</value> <value>250, 56</value>
</metadata> </metadata>
<data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 100</value> <value>349, 100</value>
</data> </data>
<data name="&gt;&gt;ContextMenuNotifyIcon.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuNotifyIcon.Name" xml:space="preserve">
<value>ContextMenuNotifyIcon</value> <value>ContextMenuNotifyIcon</value>
@ -1988,22 +2018,22 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 30</value> <value>348, 30</value>
</data> </data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve"> <data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
<value>Popup Erinnerung deaktivieren</value> <value>Popup Erinnerung deaktivieren</value>
</data> </data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>287, 6</value> <value>345, 6</value>
</data> </data>
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 30</value> <value>348, 30</value>
</data> </data>
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve"> <data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
<value>In den Vordergrund</value> <value>In den Vordergrund</value>
</data> </data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>290, 30</value> <value>348, 30</value>
</data> </data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve"> <data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
<value>Out of Range - Fenster wiederherstellen</value> <value>Out of Range - Fenster wiederherstellen</value>
@ -2033,10 +2063,13 @@
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 688</value> <value>0, 869</value>
</data>
<data name="barDockControlBottom.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>1178, 0</value> <value>1440, 0</value>
</data> </data>
<data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
<value>barDockControlBottom</value> <value>barDockControlBottom</value>
@ -2048,7 +2081,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;barDockControlBottom.ZOrder" xml:space="preserve"> <data name="&gt;&gt;barDockControlBottom.ZOrder" xml:space="preserve">
<value>8</value> <value>7</value>
</data> </data>
<data name="barDockControlLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="barDockControlLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value> <value>Left</value>
@ -2056,8 +2089,11 @@
<data name="barDockControlLeft.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlLeft.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="barDockControlLeft.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 688</value> <value>0, 869</value>
</data> </data>
<data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
<value>barDockControlLeft</value> <value>barDockControlLeft</value>
@ -2069,16 +2105,19 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;barDockControlLeft.ZOrder" xml:space="preserve"> <data name="&gt;&gt;barDockControlLeft.ZOrder" xml:space="preserve">
<value>6</value> <value>5</value>
</data> </data>
<data name="barDockControlRight.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="barDockControlRight.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Right</value> <value>Right</value>
</data> </data>
<data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
<value>1178, 0</value> <value>1440, 0</value>
</data>
<data name="barDockControlRight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 688</value> <value>0, 869</value>
</data> </data>
<data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
<value>barDockControlRight</value> <value>barDockControlRight</value>
@ -2090,7 +2129,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;barDockControlRight.ZOrder" xml:space="preserve"> <data name="&gt;&gt;barDockControlRight.ZOrder" xml:space="preserve">
<value>7</value> <value>6</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
@ -2099,67 +2138,10 @@
<value>147</value> <value>147</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>9, 19</value> <value>11, 24</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1178, 688</value> <value>1440, 869</value>
</data>
<data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>31, 181</value>
</data>
<data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 207</value>
</data>
<data name="XtraTabPage1.Text" xml:space="preserve">
<value>XtraTabPage1</value>
</data>
<data name="&gt;&gt;XtraTabPage1.Name" xml:space="preserve">
<value>XtraTabPage1</value>
</data>
<data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
<value>XtraTabControl1</value>
</data>
<data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 230</value>
</data>
<data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 207</value>
</data>
<data name="XtraTabPage2.Text" xml:space="preserve">
<value>XtraTabPage2</value>
</data>
<data name="&gt;&gt;XtraTabPage2.Name" xml:space="preserve">
<value>XtraTabPage2</value>
</data>
<data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
<value>XtraTabControl1</value>
</data>
<data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve">
<value>XtraTabControl1</value>
</data>
<data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
<value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
<value>2</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 12pt</value> <value>Tahoma, 12pt</value>
@ -2331,7 +2313,7 @@
</value> </value>
</data> </data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value> <value>5, 6, 5, 6</value>
</data> </data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms"> <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>Manual</value> <value>Manual</value>
@ -2675,6 +2657,12 @@
<data name="&gt;&gt;barbtnitmsaveLogfiles.Type" xml:space="preserve"> <data name="&gt;&gt;barbtnitmsaveLogfiles.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;bsitmCount.Name" xml:space="preserve">
<value>bsitmCount</value>
</data>
<data name="&gt;&gt;bsitmCount.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
<value>RibbonPageStart</value> <value>RibbonPageStart</value>
</data> </data>
@ -3615,8 +3603,11 @@
<data name="PrintPreviewBarCheckItem19.Hint" xml:space="preserve"> <data name="PrintPreviewBarCheckItem19.Hint" xml:space="preserve">
<value>Graphisches Dokument</value> <value>Graphisches Dokument</value>
</data> </data>
<data name="barDockControlTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
<value>1178, 0</value> <value>1440, 0</value>
</data> </data>
<data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve">
<value>barDockControlTop</value> <value>barDockControlTop</value>
@ -3628,7 +3619,7 @@
<value>$this</value> <value>$this</value>
</data> </data>
<data name="&gt;&gt;barDockControlTop.ZOrder" xml:space="preserve"> <data name="&gt;&gt;barDockControlTop.ZOrder" xml:space="preserve">
<value>9</value> <value>8</value>
</data> </data>
<data name="RibbonPage2.Text" xml:space="preserve"> <data name="RibbonPage2.Text" xml:space="preserve">
<value>RibbonPage2</value> <value>RibbonPage2</value>

View File

@ -1,24 +1,25 @@
Imports System.Globalization Imports System.ComponentModel
Imports DevExpress.Utils Imports System.Globalization
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid
Imports DevExpress.XtraNavBar
Imports DevExpress.XtraGrid.Columns
Imports System.Threading
Imports System.ComponentModel
Imports System.IO Imports System.IO
Imports DevExpress.XtraPrinting Imports System.Threading
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.Windream
Imports DigitalData.GUIs.Common
Imports DevExpress.XtraGrid.Views.BandedGrid
Imports DevExpress.XtraBars.Ribbon
Imports DigitalData.Modules.ZooFlow
Imports DevExpress.LookAndFeel Imports DevExpress.LookAndFeel
Imports DigitalData.Modules.Base Imports DevExpress.Utils
Imports DevExpress.XtraBars.Ribbon
Imports DevExpress.XtraExport.Helpers
Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Columns
Imports DevExpress.XtraGrid.Views.BandedGrid
Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Base
Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
Imports DevExpress.XtraNavBar
Imports DevExpress.XtraPrinting
Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.Windream
Imports DigitalData.Modules.ZooFlow
Public Class frmMain Public Class frmMain
Private Property FormHelper As FormHelper Private Property FormHelper As FormHelper
@ -1404,8 +1405,8 @@ Public Class frmMain
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentCulture = cultureInfo Thread.CurrentThread.CurrentCulture = cultureInfo
Thread.CurrentThread.CurrentUICulture = cultureInfo Thread.CurrentThread.CurrentUICulture = cultureInfo
cultureInfo.DefaultThreadCurrentCulture = cultureInfo CultureInfo.DefaultThreadCurrentCulture = cultureInfo
cultureInfo.DefaultThreadCurrentUICulture = cultureInfo CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
@ -2159,12 +2160,10 @@ Public Class frmMain
RestoreLayout() RestoreLayout()
Try Try
Dim oSQLFormat = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
Dim dtColFormat As DataTable = Await DatabaseFallback.GetDatatableECMAsync(oSQLFormat)
For Each oColumn As DevExpress.XtraGrid.Columns.GridColumn In GridViewWorkflows.Columns For Each oColumn As DevExpress.XtraGrid.Columns.GridColumn In GridViewWorkflows.Columns
For Each oRow As DataRow In dtColFormat.Rows For Each oRow As DataRow In BASEDATA_TBDD_COLUMNS_FORMAT.Rows
Dim colName = oRow("COLUMN_TITLE").ToString() Dim colName = oRow("COLUMN_TITLE").ToString()
If oColumn.FieldName = colName Then If oColumn.FieldName = colName Then
@ -2179,7 +2178,10 @@ Public Class frmMain
If oColumn.ColumnType = GetType(DateTime) And oColumn.DisplayFormat.FormatString <> "dd.MM.yyyy HH:mm:ss" Then If oColumn.ColumnType = GetType(DateTime) And oColumn.DisplayFormat.FormatString <> "dd.MM.yyyy HH:mm:ss" Then
oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss" oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss"
End If End If
ElseIf oSollFormatType = "Numeric" Then
If oColumn.ColumnType <> GetType(Int32) Then
oColumn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric
End If
End If End If
End If End If
Next Next
@ -2888,13 +2890,16 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
End If End If
If Ev_Filter_Panel_Closed = False Then If Ev_Filter_Panel_Closed = False Then
Dim oTermFilterActive As String = S.Filter_aktiv Dim oTermFilterActive As String = String.Format("{0} ({1})", S.Filter_aktiv, GridViewWorkflows.RowCount)
If GridViewWorkflows.ActiveFilterString <> String.Empty Then If GridViewWorkflows.ActiveFilterString <> String.Empty Then
If Not lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then If lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
lblCaptionMainGrid.Text += $"|{oTermFilterActive}"
Else
Ev_Filter_Panel_Closed = False Ev_Filter_Panel_Closed = False
End If End If
lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bsitmCount.Caption = oTermFilterActive
Else
bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
End If End If
End If End If
@ -2971,7 +2976,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
Timer5Mins.Stop() Timer5Mins.Stop()
TimerRefresh.Stop() TimerRefresh.Stop()
TimerReminder.Stop() TimerReminder.Stop()
LOGGER.Info("Inactivity recognized. Automatic Logout in process!") LOGGER.Info("Inactivity recognized. Automatic Logout In process!")
Hide() Hide()
ClassAllgemeineFunktionen.LoginOut("LOGOUT") ClassAllgemeineFunktionen.LoginOut("LOGOUT")
TimerInactivity.Stop() TimerInactivity.Stop()
@ -3006,8 +3011,8 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
MyProcess.StartInfo.FileName = bbtniCW.Tag MyProcess.StartInfo.FileName = bbtniCW.Tag
MyProcess.Start() MyProcess.Start()
Else Else
LOGGER.Warn($"easyFLOW-Exe not found [{bbtniCW.Tag}]") LOGGER.Warn($"easyFLOW-Exe Not found [{bbtniCW.Tag}]")
FormHelper.ShowInfoMessage("Clipboard Watcher could not be started!", omsgTitleWarning) FormHelper.ShowInfoMessage("Clipboard Watcher could Not be started!", omsgTitleWarning)
End If End If
Catch ex As Exception Catch ex As Exception
@ -3092,7 +3097,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
Private Sub BarButtonItemFileLink_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemFileLink.ItemClick Private Sub BarButtonItemFileLink_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemFileLink.ItemClick
Dim oReceipiant = "" Dim oReceipiant = ""
Dim oFocusedDocGUID = GridViewWorkflows.GetFocusedRowCellValue(GridViewWorkflows.Columns("GUID")) Dim oFocusedDocGUID = GridViewWorkflows.GetFocusedRowCellValue(GridViewWorkflows.Columns("GUID"))
Dim oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID},1)" Dim oSQL = $"Select [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID}, 1)"
Dim oFilePath = DatabaseFallback.GetScalarValueECM(oSQL) Dim oFilePath = DatabaseFallback.GetScalarValueECM(oSQL)
If File.Exists(oFilePath) Then If File.Exists(oFilePath) Then
Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>" Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
@ -3146,6 +3151,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
If CURRENT_DT_PROFILE.Rows.Count = 1 Then If CURRENT_DT_PROFILE.Rows.Count = 1 Then
CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME") CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME")
PROFILE_SHOW_DOCUMENT = CURRENT_DT_PROFILE.Rows(0).Item("SHOW_DOCUMENT") PROFILE_SHOW_DOCUMENT = CURRENT_DT_PROFILE.Rows(0).Item("SHOW_DOCUMENT")
PROFILE_NOT_RESP_COMMENT = CURRENT_DT_PROFILE.Rows(0).Item("NOT_RESP_COMMENT")
ActiveWorkflowType = 1 ActiveWorkflowType = 1
Else Else
Exit Sub Exit Sub
@ -3260,6 +3266,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
GridLayout_Changed("GridViewWFItems_SubstituteFilter") GridLayout_Changed("GridViewWFItems_SubstituteFilter")
End Sub End Sub
Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
@ -3292,7 +3299,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}") LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype) Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
If oResult = True Then If oResult = True Then
WM_AHWF_docPath = oTargetPath WM_AHWF_docPath = oTargetPath
Dim oDocID = WINDREAM_MOD.NewDocumentID Dim oDocID = WINDREAM_MOD.NewDocumentID

View File

@ -323,7 +323,7 @@ Public Class frmMassValidator
lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM") lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
lookup.Properties.MultiSelect = oMultiselect lookup.Properties.MultiSelect = oMultiselect
If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then If ClassAllgemeineFunktionen.NotNullString(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")} lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
End If End If
@ -449,7 +449,7 @@ Public Class frmMassValidator
End If End If
Dim idxname As String = controlRow.Item("INDEX_NAME") Dim idxname As String = controlRow.Item("INDEX_NAME")
' Wenn kein defaultValue existiert, leeren String setzen ' Wenn kein defaultValue existiert, leeren String setzen
Dim defaultValue As String = NotNull(controlRow.Item("DEFAULT_VALUE"), String.Empty) Dim defaultValue As String = ClassAllgemeineFunktionen.NotNullString(controlRow.Item("DEFAULT_VALUE"), String.Empty)
indexname = idxname indexname = idxname
Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE") Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE")
LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString) LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString)
@ -474,7 +474,7 @@ Public Class frmMassValidator
If wertWD = "" And defaultValue <> "" Then If wertWD = "" And defaultValue <> "" Then
oControl.Text = defaultValue oControl.Text = defaultValue
Else Else
oControl.Text = NotNull(wertWD, defaultValue) oControl.Text = ClassAllgemeineFunktionen.NotNullString(wertWD, defaultValue)
End If End If
End If End If

View File

@ -126,7 +126,10 @@
</data> </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="SplitContainerButtons.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerButtons.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 289</value> <value>2, 358</value>
</data>
<data name="SplitContainerButtons.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="SplitContainerReject_NotResp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="SplitContainerReject_NotResp.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
@ -134,6 +137,9 @@
<data name="SplitContainerReject_NotResp.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerReject_NotResp.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="SplitContainerReject_NotResp.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="btnReject.Appearance.Font" type="System.Drawing.Font, System.Drawing"> <data name="btnReject.Appearance.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9.75pt</value> <value>Segoe UI, 9.75pt</value>
</data> </data>
@ -188,8 +194,11 @@
<data name="btnReject.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnReject.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="btnReject.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="btnReject.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnReject.Size" type="System.Drawing.Size, System.Drawing">
<value>197, 50</value> <value>253, 62</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnReject.TabIndex" type="System.Int32, mscorlib"> <data name="btnReject.TabIndex" type="System.Int32, mscorlib">
@ -283,8 +292,11 @@
<data name="btnNotResponsible.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnNotResponsible.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="btnNotResponsible.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="btnNotResponsible.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnNotResponsible.Size" type="System.Drawing.Size, System.Drawing">
<value>182, 50</value> <value>235, 62</value>
</data> </data>
<data name="btnNotResponsible.TabIndex" type="System.Int32, mscorlib"> <data name="btnNotResponsible.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -317,7 +329,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="SplitContainerReject_NotResp.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerReject_NotResp.Size" type="System.Drawing.Size, System.Drawing">
<value>389, 50</value> <value>500, 62</value>
</data> </data>
<data name="SplitContainerReject_NotResp.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerReject_NotResp.TabIndex" type="System.Int32, mscorlib">
<value>46</value> <value>46</value>
@ -410,8 +422,11 @@
<data name="btnSave.Location" type="System.Drawing.Point, System.Drawing"> <data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="btnSave.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="btnSave.Size" type="System.Drawing.Size, System.Drawing"> <data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
<value>250, 50</value> <value>323, 62</value>
</data> </data>
<data name="btnSave.TabIndex" type="System.Int32, mscorlib"> <data name="btnSave.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -447,7 +462,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerButtons.Size" type="System.Drawing.Size, System.Drawing">
<value>649, 50</value> <value>835, 62</value>
</data> </data>
<data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerButtons.TabIndex" type="System.Int32, mscorlib">
<value>45</value> <value>45</value>
@ -468,7 +483,10 @@
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 158</value> <value>0, 194</value>
</data>
<data name="SplitContainer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="PanelValidatorControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> <data name="PanelValidatorControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value> <value>Top, Bottom, Left, Right</value>
@ -477,10 +495,13 @@
<value>Segoe UI, 8.25pt</value> <value>Segoe UI, 8.25pt</value>
</data> </data>
<data name="PanelValidatorControl.Location" type="System.Drawing.Point, System.Drawing"> <data name="PanelValidatorControl.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 58</value> <value>8, 72</value>
</data>
<data name="PanelValidatorControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing"> <data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
<value>642, 225</value> <value>824, 279</value>
</data> </data>
<data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib"> <data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -508,10 +529,13 @@
<value>None</value> <value>None</value>
</data> </data>
<data name="DESCRIPTIONLabel.Location" type="System.Drawing.Point, System.Drawing"> <data name="DESCRIPTIONLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 33</value> <value>8, 41</value>
</data>
<data name="DESCRIPTIONLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing"> <data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>643, 26</value> <value>826, 32</value>
</data> </data>
<data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib"> <data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -541,10 +565,13 @@
<value>None</value> <value>None</value>
</data> </data>
<data name="TITLELabel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="TITLELabel1.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 5</value> <value>6, 6</value>
</data>
<data name="TITLELabel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="TITLELabel1.Size" type="System.Drawing.Size, System.Drawing">
<value>643, 28</value> <value>826, 35</value>
</data> </data>
<data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib"> <data name="TITLELabel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -570,8 +597,11 @@
<data name="pnlMain.Location" type="System.Drawing.Point, System.Drawing"> <data name="pnlMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="pnlMain.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="pnlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>653, 341</value> <value>839, 422</value>
</data> </data>
<data name="pnlMain.TabIndex" type="System.Int32, mscorlib"> <data name="pnlMain.TabIndex" type="System.Int32, mscorlib">
<value>25</value> <value>25</value>
@ -607,10 +637,10 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value> <value>5, 6, 5, 6</value>
</data> </data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing"> <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>519, 341</value> <value>668, 422</value>
</data> </data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib"> <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -619,7 +649,7 @@
<value>DocumentViewer1</value> <value>DocumentViewer1</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainer1.Panel2</value> <value>SplitContainer1.Panel2</value>
@ -640,10 +670,13 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
<value>1176, 341</value> <value>1512, 422</value>
</data> </data>
<data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib"> <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>653</value> <value>839</value>
</data>
<data name="SplitContainer1.SplitterWidth" type="System.Int32, mscorlib">
<value>5</value>
</data> </data>
<data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>37</value> <value>37</value>
@ -672,8 +705,11 @@
<data name="barDockControlTop.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlTop.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="barDockControlTop.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
<value>1176, 0</value> <value>1512, 0</value>
</data> </data>
<data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve">
<value>barDockControlTop</value> <value>barDockControlTop</value>
@ -691,10 +727,13 @@
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 521</value> <value>0, 644</value>
</data>
<data name="barDockControlBottom.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>1176, 0</value> <value>1512, 0</value>
</data> </data>
<data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
<value>barDockControlBottom</value> <value>barDockControlBottom</value>
@ -714,8 +753,11 @@
<data name="barDockControlLeft.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlLeft.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="barDockControlLeft.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 521</value> <value>0, 644</value>
</data> </data>
<data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
<value>barDockControlLeft</value> <value>barDockControlLeft</value>
@ -733,10 +775,13 @@
<value>Right</value> <value>Right</value>
</data> </data>
<data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing"> <data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
<value>1176, 0</value> <value>1512, 0</value>
</data>
<data name="barDockControlRight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing"> <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 521</value> <value>0, 644</value>
</data> </data>
<data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve"> <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
<value>barDockControlRight</value> <value>barDockControlRight</value>
@ -757,10 +802,10 @@
<value>82</value> <value>82</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 17</value> <value>9, 21</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1176, 521</value> <value>1512, 644</value>
</data> </data>
<data name="bsiError.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing"> <data name="bsiError.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt, style=Bold</value> <value>Tahoma, 8.25pt, style=Bold</value>
@ -1234,6 +1279,9 @@
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="RibbonControl1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="RibbonPageFile.Text" xml:space="preserve"> <data name="RibbonPageFile.Text" xml:space="preserve">
<value>Datei</value> <value>Datei</value>
</data> </data>
@ -1290,13 +1338,16 @@
<value>Combo</value> <value>Combo</value>
</data> </data>
<data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1176, 158</value> <value>1512, 194</value>
</data> </data>
<data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 499</value> <value>0, 616</value>
</data>
<data name="RibbonStatusBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing"> <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>1176, 22</value> <value>1512, 28</value>
</data> </data>
<data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
<value>RibbonStatusBar1</value> <value>RibbonStatusBar1</value>
@ -1524,7 +1575,7 @@
</value> </value>
</data> </data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 4, 3, 4</value> <value>4, 5, 4, 5</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>frmValidator</value> <value>frmValidator</value>
@ -1953,11 +2004,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s AAAAAAAAiwEAAAAGDAAAABDDlmZmbmVuIChTdHJnK08pBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp
ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC
b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAb dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAb
w5ZmZm5lbiBTaWUgZWluZSBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRl w5ZmZm5lbiBTaWUgZWluZSBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRl
bUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4 bUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4
E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNz E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNz
@ -1989,11 +2040,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls AAAAAAAAiwEAAAAGDAAAABZTcGVpY2hlcm4gYWxzIChTdHJnK1MpBQgAAAAcRGV2RXhwcmVzcy5VdGls
cy5Ub29sVGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50 cy5Ub29sVGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50
CE1heFdpZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRl CE1heFdpZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRl
ZmF1bHRCb29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRv ZmF1bHRCb29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRv
b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAA b2xUaXBJdGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAA
Bg8AAAAYU3BlaWNoZXJuIGRlciBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw Bg8AAAAYU3BlaWNoZXJuIGRlciBQREYtRGF0ZWkuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw
SXRlbUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUlu SXRlbUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUlu
ZGV4E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHBy ZGV4E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHBy
@ -2025,11 +2076,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s AAAAAAAAiwEAAAAGDAAAABBEcnVja2VuIChTdHJnK1ApBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29s
VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp VGlwSXRlbQcAAAANQWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdp
ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC ZHRoEk93bmVyQWxsb3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRC
b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ b29sZWFuAwAAABNTeXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAAN dGVtSW1hZ2VPcHRpb25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAAN
RGF0ZWkgZHJ1Y2tlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMF RGF0ZWkgZHJ1Y2tlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMF
AAAACEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERp AAAACEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERp
c3RhbmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw c3RhbmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlw
@ -2061,11 +2112,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt AAAAAAAAiwEAAAAGDAAAAAlWb3JoZXJpZ2UFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt
BwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lkdGgST3du BwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lkdGgST3du
ZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4D ZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4D
AAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFn AAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFn
ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAABlWb3JoZXJp ZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAABlWb3JoZXJp
Z2UgU2VpdGUgYW56ZWlnZW4uBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0 Z2UgU2VpdGUgYW56ZWlnZW4uBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0
aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9U aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9U
ZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRv ZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRv
@ -2097,11 +2148,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H AAAAAAAAiwEAAAAGDAAAAAhOw6RjaHN0ZQUIAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0H
AAAADUFsbG93SHRtbFRleHQESWNvbgxJbWFnZU9wdGlvbnMKTGVmdEluZGVudAhNYXhXaWR0aBJPd25l AAAADUFsbG93SHRtbFRleHQESWNvbgxJbWFnZU9wdGlvbnMKTGVmdEluZGVudAhNYXhXaWR0aBJPd25l
ckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMA ckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMA
AAATU3lzdGVtLkRyYXdpbmcuSWNvbgkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdl AAATU3lzdGVtLkRyYXdpbmcuSWNvbgkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdl
T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAAA8AQAAAAYPAAAAF07DpGNoc3Rl T3B0aW9ucwIAAAAICAECAAAAAfP////8////AgAAAAoJDgAAAAAAAACLAQAAAAYPAAAAF07DpGNoc3Rl
IFNlaXRlIGFuemVpZ2VuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9u IFNlaXRlIGFuemVpZ2VuBQsAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9u
cwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9UZXh0 cwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9UZXh0
RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRvb2xU RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplCQAAACZEZXZFeHByZXNzLlV0aWxzLlRvb2xU
@ -2133,11 +2184,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU AAAAAAAAiwEAAAAGDAAAAA9GaW5kZW4gKFN0cmcrRikFCAAAABxEZXZFeHByZXNzLlV0aWxzLlRvb2xU
aXBJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lk aXBJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25zCkxlZnRJbmRlbnQITWF4V2lk
dGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJv dGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJlc3MuVXRpbHMuRGVmYXVsdEJv
b2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0 b2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0
ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAPAEAAAAGDwAAAAtU ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAHz/////P///wIAAAAKCQ4AAAAAAAAAiwEAAAAGDwAAAAtU
ZXh0IHN1Y2hlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMFAAAA ZXh0IHN1Y2hlbgULAAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMFAAAA
CEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERpc3Rh CEltYWdlVXJpDFN2Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERpc3Rh
bmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSW1h bmNlAQQEAAATU3lzdGVtLkRyYXdpbmcuU2l6ZQkAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSW1h
@ -2217,11 +2268,11 @@
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN AAAAAAAAiwEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN
QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs
b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT
eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp
b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAAIsBAAAABg8AAAApw4RuZGVybiBkZXIg
Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k
ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl

View File

@ -93,9 +93,6 @@ Public Class frmValidator
Public Property _FormLoaded As Boolean = False Public Property _FormLoaded As Boolean = False
Private Property _FormClosing As Boolean = False Private Property _FormClosing As Boolean = False
Private Property _ControlHandleStarted As Boolean = False Private Property _ControlHandleStarted As Boolean = False
Private Property _ItemWorked As Boolean = False
Private Property Override As Boolean = False Private Property Override As Boolean = False
Private Property OverrideAll As Boolean = False Private Property OverrideAll As Boolean = False
Private Property Override_SQLCommand As String = "" Private Property Override_SQLCommand As String = ""
@ -193,7 +190,6 @@ Public Class frmValidator
Validator = New Validator(LOGCONFIG) Validator = New Validator(LOGCONFIG)
Override = False Override = False
_ItemWorked = False
SplitContainer1.Panel2Collapsed = True SplitContainer1.Panel2Collapsed = True
first_control = Nothing first_control = Nothing
_FormClosing = False _FormClosing = False
@ -296,7 +292,7 @@ Public Class frmValidator
PROFIL_FINISH_SQL = oProfileRow.Item("SQL_BTN_FINISH") PROFIL_FINISH_SQL = oProfileRow.Item("SQL_BTN_FINISH")
PROFIL_VEKTORINDEX = oProfileRow.Item("PM_VEKTOR_INDEX") PROFIL_VEKTORINDEX = oProfileRow.Item("PM_VEKTOR_INDEX")
PROFIL_CURRENCY_ATTRIBUTE = oProfileRow.Item("CURRENCY_ATTRIBUTE") PROFIL_CURRENCY_ATTRIBUTE = oProfileRow.Item("CURRENCY_ATTRIBUTE")
PROFILE_NOT_RESP_COMMENT = oProfileRow.Item("NOT_RESP_COMMENT")
PROFIL_REJECT_ACTIONS_ATTRIBUTE = oProfileRow.Item("REJECT_ACTIONS_ATTRIBUTE") PROFIL_REJECT_ACTIONS_ATTRIBUTE = oProfileRow.Item("REJECT_ACTIONS_ATTRIBUTE")
PROFIL_REJECT_COMMENT_ATTRIBUTE = oProfileRow.Item("REJECT_COMMENT_ATTRIBUTE") PROFIL_REJECT_COMMENT_ATTRIBUTE = oProfileRow.Item("REJECT_COMMENT_ATTRIBUTE")
PROFIL_NOT_RESP_COMMENT_ATTR = oProfileRow.Item("NOT_RESP_COMMENT_ATTRIBUTE") PROFIL_NOT_RESP_COMMENT_ATTR = oProfileRow.Item("NOT_RESP_COMMENT_ATTRIBUTE")
@ -541,12 +537,9 @@ Public Class frmValidator
If CURRENT_DOC_GUID <> 0 Then If CURRENT_DOC_GUID <> 0 Then
Try Try
If _ItemWorked = False Then Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}" DatabaseFallback.ExecuteNonQueryECM(sql)
DatabaseFallback.ExecuteNonQueryECM(sql) 'PRTF_PROFILE_FILES_WORK("FreeFile")
'PRTF_PROFILE_FILES_WORK("FreeFile")
End If
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Error(ex) MyValidationLogger.Error(ex)
@ -1250,7 +1243,7 @@ Public Class frmValidator
End If End If
SetControlValues_FromControl(oTextbox) SetControlValues_FromControl(oTextbox)
Controls2beEnabled(oTextbox.Name)
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER) ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
End Sub End Sub
@ -1487,7 +1480,7 @@ Public Class frmValidator
Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG") Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG")
Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString() Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString()
sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue) sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue)
'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1), $"oControlID[{CONTROL_ID}]") 'Dim resultDT: DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1), $"oControlID[{CONTROL_ID}")
Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With { Dim resultDT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With {
.ConnectionId = ROW.Item("CONNECTION_ID") .ConnectionId = ROW.Item("CONNECTION_ID")
}) })
@ -1697,7 +1690,7 @@ Public Class frmValidator
Dim oControl As Control = oControlObject2Set Dim oControl As Control = oControlObject2Set
Dim oMeta As ClassControlCreator.ControlMetadata = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata) Dim oMeta As ClassControlCreator.ControlMetadata = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata)
MyValidationLogger.Debug($"Got the Control2Set: {oControlId2Set}..Setting the values..") MyValidationLogger.Debug(String.Format("Got the Control2Set: {0}..Setting the values..", {oControl.Name}))
Select Case True Select Case True
@ -1759,8 +1752,42 @@ Public Class frmValidator
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Warn($"Error while Control2Set (Combobox): {ex.Message}") MyValidationLogger.Warn($"Error while Control2Set (Combobox): {ex.Message}")
End Try End Try
Case oControl.GetType() = GetType(DevExpress.XtraEditors.DateEdit)
Try
Dim oDateEdit As DevExpress.XtraEditors.DateEdit = DirectCast(oControl, DevExpress.XtraEditors.DateEdit)
Dim parsed As DateTime
If String.IsNullOrWhiteSpace(oControlCaption) Then
oDateEdit.EditValue = Nothing
ElseIf DateTime.TryParse(oControlCaption, parsed) Then
oDateEdit.EditValue = parsed
ElseIf DateTime.TryParse(oControlCaption, CultureInfo.CurrentCulture, DateTimeStyles.None, parsed) Then
oDateEdit.EditValue = parsed
ElseIf DateTime.TryParse(oControlCaption, CultureInfo.InvariantCulture, DateTimeStyles.None, parsed) Then
oDateEdit.EditValue = parsed
Else
oDateEdit.EditValue = Nothing
End If
Catch ex As Exception
MyValidationLogger.Warn($"Error While Control2Set (DateEdit): {ex.Message}")
End Try
Case oControl.GetType() = GetType(System.Windows.Forms.DateTimePicker)
Try
Dim dtp As System.Windows.Forms.DateTimePicker = DirectCast(oControl, System.Windows.Forms.DateTimePicker)
Dim parsed As DateTime
If String.IsNullOrWhiteSpace(oControlCaption) Then
dtp.Value = DateTimePicker.MinimumDateTime
ElseIf DateTime.TryParse(oControlCaption, parsed) _
OrElse DateTime.TryParse(oControlCaption, CultureInfo.CurrentCulture, DateTimeStyles.None, parsed) _
OrElse DateTime.TryParse(oControlCaption, CultureInfo.InvariantCulture, DateTimeStyles.None, parsed) Then
dtp.Value = parsed
Else
dtp.Value = DateTimePicker.MinimumDateTime
End If
Catch ex As Exception
MyValidationLogger.Warn($"Error While Control2Set (DateTimePicker): {ex.Message}")
End Try
Case oControl.GetType() = GetType(Windows.Forms.CheckBox) Case oControl.GetType() = GetType(Windows.Forms.CheckBox)
Dim oBitValue As Boolean Dim oBitValue As Boolean
@ -1779,7 +1806,7 @@ Public Class frmValidator
End Try End Try
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Warn($"Error while Control2Set (Checkbox): {ex.Message}") MyValidationLogger.Warn($"Error while Control2Set (Checkbox) {ex.Message}")
End Try End Try
@ -1793,7 +1820,7 @@ Public Class frmValidator
End If End If
If oFound = False Then If oFound = False Then
MyValidationLogger.Debug($"Could not find the Control2Set with ID {oControlGUID2Set} on panel!!!") MyValidationLogger.Debug($"Could Not find the Control2Set with ID {oControlGUID2Set} on panel!!!")
End If End If
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Error(ex) MyValidationLogger.Error(ex)
@ -1807,10 +1834,10 @@ Public Class frmValidator
Dim oLOOKUPValue = SelectedValues.Item(0 Dim oLOOKUPValue = SelectedValues.Item(0
) )
Dim oLOOKUPName = LookupControl.Name Dim oLOOKUPName = LookupControl.Name
MyValidationLogger.Debug($"oLOOKUPValue is [{oLOOKUPValue}]!") MyValidationLogger.Debug($"oLOOKUPValue Is [{oLOOKUPValue}]!")
Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid
Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone() Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{oLOOKUPName}%'" Dim oExpression = $"SQL_UEBERPRUEFUNG Like '%#CTRL#{oLOOKUPName}%'"
DT_CONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) DT_CONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
If oFilteredDatatable.Rows.Count > 0 Then If oFilteredDatatable.Rows.Count > 0 Then
MyValidationLogger.Debug($"We got {oFilteredDatatable.Rows.Count} depending controls!!") MyValidationLogger.Debug($"We got {oFilteredDatatable.Rows.Count} depending controls!!")
@ -1822,7 +1849,7 @@ Public Class frmValidator
Dim oDEPENDING_CtrlName = oRowDependingControl.Item("NAME") Dim oDEPENDING_CtrlName = oRowDependingControl.Item("NAME")
MyValidationLogger.Debug($"Control {oDEPENDING_CtrlName} is depending on lookUp {oLOOKUPName}..") MyValidationLogger.Debug($"Control {oDEPENDING_CtrlName} is depending on lookUp {oLOOKUPName}..")
If _DependingControl_In_Action = True Then If _DependingControl_In_Action = True Then
MyValidationLogger.Debug($"..but _dependingControl_in_action = True ==> Exit Sub!") MyValidationLogger.Info($"..but _dependingControl_in_action = True ==> Exit Sub!")
Exit Sub Exit Sub
End If End If
If Not IsDBNull(oRowDependingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) Then If Not IsDBNull(oRowDependingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) Then
@ -1845,6 +1872,7 @@ Public Class frmValidator
Case oControl.GetType() = GetType(DevExpress.XtraEditors.TextEdit) Or oControl.GetType() = GetType(MemoEdit) Case oControl.GetType() = GetType(DevExpress.XtraEditors.TextEdit) Or oControl.GetType() = GetType(MemoEdit)
Try Try
Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0) Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
MyValidationLogger.Debug(String.Format("Setting EditValue with value [{0}]", oValue))
oValue = ObjectEx.NotNull(Of Object)(oValue, Nothing) oValue = ObjectEx.NotNull(Of Object)(oValue, Nothing)
Try Try
'oControl.Text = oValue 'oControl.Text = oValue
@ -1956,6 +1984,7 @@ Public Class frmValidator
Dim oSqlCommand = IIf(IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")), "", oRowDependingControl.Item("SQL_UEBERPRUEFUNG")) Dim oSqlCommand = IIf(IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")), "", oRowDependingControl.Item("SQL_UEBERPRUEFUNG"))
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
_DependingControl_In_Action = True _DependingControl_In_Action = True
MyValidationLogger.Debug($"_DependingControl_In_Action: Control {oDEPENDING_CtrlName} ...")
'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"CheckBox_DependingControls - oControlID: {oControlID}") 'Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"), $"CheckBox_DependingControls - oControlID: {oControlID}")
Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With { Dim oDTDEPENDING_RESULT As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With {
.ConnectionId = oRowDependingControl.Item("CONNECTION_ID") .ConnectionId = oRowDependingControl.Item("CONNECTION_ID")
@ -2228,6 +2257,7 @@ Public Class frmValidator
If Not IsDBNull(oRowEnablingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")) Then If Not IsDBNull(oRowEnablingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")) Then
Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE")) Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE"))
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
MyValidationLogger.Debug($"_DependingControl_In_Action: oENABLE_CtrlName {oENABLE_CtrlName} ...")
_DependingControl_In_Action = True _DependingControl_In_Action = True
Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID") Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID")
@ -2249,7 +2279,7 @@ Public Class frmValidator
End If End If
Next Next
_DependingControl_In_Action = False
If oFound = False Then If oFound = False Then
MyValidationLogger.Debug($"Could not find the enabling Control with ID {oENABLE_GUID} on panel!!!") MyValidationLogger.Debug($"Could not find the enabling Control with ID {oENABLE_GUID} on panel!!!")
End If End If
@ -2418,7 +2448,7 @@ Public Class frmValidator
MyValidationLogger.Debug("SQL Check is not configured!") MyValidationLogger.Debug("SQL Check is not configured!")
Return True Return True
End If End If
If check.ToString.Length > 0 And dr.Item("INDEX_NAME") <> "DD PM-ONLY FOR DISPLAY" Then If check.ToString.Length > 0 And Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(dr.Item("INDEX_NAME")) Then
Dim cs As String = DatabaseFallback.GetConnectionString(dr.Item("CONNECTION_ID")) Dim cs As String = DatabaseFallback.GetConnectionString(dr.Item("CONNECTION_ID"))
If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then If allgFunk.CheckValue_Exists(dr.Item("SQL_UEBERPRUEFUNG"), "@Eingabe", control.Text, dr.Item("TYP"), cs, CURRENT_ProfilGUID) = True Then
@ -2676,7 +2706,7 @@ Public Class frmValidator
' ############ Infos eintragen ################# ' ############ Infos eintragen #################
If Amount_Docs2Validate >= 1 Then If Amount_Docs2Validate > 1 Then
Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate) Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
bsiInformation.Caption = omsg bsiInformation.Caption = omsg
@ -3305,10 +3335,13 @@ Public Class frmValidator
Exit For Exit For
End If End If
If oSourceIndexName Is Nothing = False Then If oSourceIndexName Is Nothing = False Then
If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then If oLoadIndex = False Then
' Wenn kein Index exisitiert, defaultValue laden MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
oTextBox.EditValue = oDefaultValue If Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
MyValidationLogger.Debug("Indexwert soll nicht geladen werden.") ' Wenn kein Index exisitiert, defaultValue laden
oTextBox.EditValue = oDefaultValue
End If
Exit Select Exit Select
End If End If
@ -3412,13 +3445,16 @@ Public Class frmValidator
Exit For Exit For
End If End If
If oSourceIndexName Is Nothing = False Then If oSourceIndexName Is Nothing = False Then
If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then If oLoadIndex = False Then
If oDefaultValue = String.Empty Then
oMyCombobox.SelectedIndex = -1
Else
oMyCombobox.Text = oDefaultValue
End If
MyValidationLogger.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.") MyValidationLogger.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.")
If Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
If oDefaultValue = String.Empty Then
oMyCombobox.SelectedIndex = -1
Else
oMyCombobox.Text = oDefaultValue
End If
End If
Exit Select Exit Select
End If End If
@ -3498,6 +3534,7 @@ Public Class frmValidator
End If End If
If oSourceIndexName Is Nothing = False Then If oSourceIndexName Is Nothing = False Then
If oLoadIndex = False Then If oLoadIndex = False Then
MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
MyValidationLogger.Debug("Indexwert soll nicht geladen werden.") MyValidationLogger.Debug("Indexwert soll nicht geladen werden.")
Exit Select Exit Select
End If End If
@ -3558,12 +3595,26 @@ Public Class frmValidator
End If End If
Dim oRowData As New List(Of Object) Dim oRowData As New List(Of Object)
MyValidationLogger.Debug(String.Format("Now creating the rows for DevexpressGrid ..."))
Dim oMSG = ""
Try
For index = 1 To oColValuesfromSource.Length
oMSG = ""
Dim oValue = oColValuesfromSource(index - 1)
oMSG = String.Format("...Index [{0}] - Value [{1}]", index, oValue)
MyValidationLogger.Debug(oMSG)
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
Dim oConvertedValue = ClassFormat.GetConvertedValue(oValue, oColumnType)
oRowData.Add(oConvertedValue)
Next
Catch ex As Exception
MyValidationLogger.Warn(String.Format("Unexpected error while working on IDB Fill GridControl: {0}", oControl.Name))
If Not oMSG = String.Empty Then
MyValidationLogger.Warn(String.Format("oMSG: {0}", oMSG))
End If
MyValidationLogger.Error(ex)
End Try
For index = 1 To oColValuesfromSource.Length
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
oRowData.Add(oConvertedValue)
Next
oDataSource.Rows.Add(oRowData.ToArray()) oDataSource.Rows.Add(oRowData.ToArray())
@ -3662,7 +3713,7 @@ Public Class frmValidator
MyValidationLogger.Error(ex) MyValidationLogger.Error(ex)
MyValidationLogger.Info(">> Unexpected error in FillIndexValues(GridControl: " & oMyGridControl.Name & "): " & ex.Message, True) MyValidationLogger.Info(">> Unexpected error in FillIndexValues(GridControl: " & oMyGridControl.Name & "): " & ex.Message, True)
MyValidationLogger.Info(">> Controltype: " & oControlType) MyValidationLogger.Info(">> Controltype: " & oControlType)
MyValidationLogger.Info(">> Indexname windream: " & oIndexName) MyValidationLogger.Info(">> Attributname: " & oIndexName)
errormessage = "Unexpected error in FillIndexValues(Combobox: " & oMyGridControl.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" errormessage = "Unexpected error in FillIndexValues(Combobox: " & oMyGridControl.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
@ -3680,8 +3731,9 @@ Public Class frmValidator
Dim myCheckBox As CheckBox = oControl Dim myCheckBox As CheckBox = oControl
If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then If oLoadIndex = False Or {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
MyValidationLogger.Debug("Indexwert soll nicht geladen werden.") MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
Exit Select
End If End If
@ -4233,7 +4285,6 @@ Public Class frmValidator
Sub Finish_WFStep(Optional includeFI As Boolean = True) Sub Finish_WFStep(Optional includeFI As Boolean = True)
btnSave.Enabled = False btnSave.Enabled = False
MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...") MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...")
_ItemWorked = True
Dim oErrorOcurred As Boolean = False Dim oErrorOcurred As Boolean = False
If OverrideAll = False Then If OverrideAll = False Then
'Eingaben auf Form überprüfen 'Eingaben auf Form überprüfen
@ -4276,7 +4327,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
End If End If
If Not IsNothing(oSQLCommand) Then If Not IsNothing(oSQLCommand) Then
Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID) Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID)
@ -4288,7 +4338,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
Else Else
MyValidationLogger.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, Continuing with next Attribute and Replacing with empty String") MyValidationLogger.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, Continuing with next Attribute and Replacing with empty String")
oResultfromSQL = "" oResultfromSQL = ""
@ -4302,7 +4351,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
Else Else
MyValidationLogger.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") MyValidationLogger.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute")
Continue For Continue For
@ -4347,7 +4395,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
End If End If
Else Else
MyValidationLogger.Debug("Now the final indexing...") MyValidationLogger.Debug("Now the final indexing...")
@ -4379,12 +4426,10 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
End If End If
End If End If
If oErrorOcurred = True Then If oErrorOcurred = True Then
_ItemWorked = False
Exit For Exit For
End If End If
Next Next
@ -4544,7 +4589,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
End If End If
End If End If
@ -4558,7 +4602,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
MyValidationLogger.Info("Unexpected error in Finish: " & ex.Message, True) MyValidationLogger.Info("Unexpected error in Finish: " & ex.Message, True)
Exit Sub Exit Sub
End Try End Try
@ -4568,7 +4611,6 @@ Public Class frmValidator
errormessage = oErrMsgMissingInput errormessage = oErrMsgMissingInput
frmError.ShowDialog() frmError.ShowDialog()
oErrorOcurred = True oErrorOcurred = True
_ItemWorked = False
Exit Sub Exit Sub
End If End If
Else Else
@ -4583,7 +4625,6 @@ Public Class frmValidator
End If End If
If oErrorOcurred = True Then If oErrorOcurred = True Then
MsgBox("Unhandled error occured in Finish Workflow-Step...Please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) MsgBox("Unhandled error occured in Finish Workflow-Step...Please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
_ItemWorked = False
Else Else
'PRTF_PROFILE_FILES_WORK("Worked") 'PRTF_PROFILE_FILES_WORK("Worked")
MyValidationLogger.Debug("Validation of document ended successfully!") MyValidationLogger.Debug("Validation of document ended successfully!")
@ -4762,10 +4803,10 @@ Public Class frmValidator
Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA") Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA")
'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist 'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist
If oDBControlName = oControl.Name And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then If oDBControlName = oControl.Name And Not {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oIndexName) Then
MyValidationLogger.Debug("Indexierung für Control (" & oControlId & ") '" & oControlName & "' gestartet. Indexname '" & oIndexName & "'") MyValidationLogger.Debug("Indexierung für Control (" & oControlId & ") '" & oControlName & "' gestartet. Indexname '" & oIndexName & "'")
If oIndexName = "" Then If oIndexName = "" Then
MyValidationLogger.Info(" >> Indexname is unexpected empty.") MyValidationLogger.Info(">> Indexname is unexpected empty.")
Continue For Continue For
End If End If
Select Case True Select Case True
@ -5942,7 +5983,6 @@ Public Class frmValidator
My.Settings.Save() My.Settings.Save()
End Sub End Sub
Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) Private Sub btnSave_MouseHover(sender As Object, e As EventArgs)
'Dim oMsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("F2forSave")
ToolTip1.Show(S.F2_für_Speichern, btnSave) ToolTip1.Show(S.F2_für_Speichern, btnSave)
End Sub End Sub
@ -6011,7 +6051,6 @@ Public Class frmValidator
Private Sub bbtniRefresh_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtniRefresh.ItemClick Private Sub bbtniRefresh_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtniRefresh.ItemClick
Reload_Controls("") Reload_Controls("")
Try Try
'btnSave.Text = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.ValidationButton")
btnSave.Text = S.Speichern___Nächster_Vorgang__F2_ btnSave.Text = S.Speichern___Nächster_Vorgang__F2_
Catch ex As Exception Catch ex As Exception
@ -6268,7 +6307,7 @@ Public Class frmValidator
If USER_LANGUAGE <> "de-DE" Then If USER_LANGUAGE <> "de-DE" Then
oCaption = "Confirmation - " oCaption = "Confirmation - "
End If End If
Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion, oCaption + oProfileNotResponsibleText, oCommentSoFar) Dim frmDialog As New frmYesNo(oProfileNotResponsibleQuestion, oCaption + oProfileNotResponsibleText, oCommentSoFar, PROFILE_NOT_RESP_COMMENT)
frmDialog.ShowDialog() frmDialog.ShowDialog()
' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) ' result = MessageBox.Show(oProfileNotResponsibleQuestion, ADDITIONAL_TITLE, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
If frmDialog.DialogResult = DialogResult.OK Then If frmDialog.DialogResult = DialogResult.OK Then

View File

@ -150,7 +150,7 @@ Partial Class frmValidatorSearch
' '
Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1)
resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2") resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2")
Me.SplitContainerControlDoc.SplitterPosition = 351 Me.SplitContainerControlDoc.SplitterPosition = 468
' '
'XtraTabControlDocs 'XtraTabControlDocs
' '
@ -162,12 +162,13 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc1 'XtraTabPageDoc1
' '
Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1) Me.XtraTabPageDoc1.Controls.Add(Me.GridControlDocSearch1)
Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1"
resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1") resources.ApplyResources(Me.XtraTabPageDoc1, "XtraTabPageDoc1")
Me.XtraTabPageDoc1.Name = "XtraTabPageDoc1"
' '
'GridControlDocSearch1 'GridControlDocSearch1
' '
resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1") resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1")
Me.GridControlDocSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlDocSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode1.RelationName = "Level1" GridLevelNode1.RelationName = "Level1"
Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1 Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1
@ -180,6 +181,7 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch1.DetailHeight = 458
Me.GridViewDocSearch1.GridControl = Me.GridControlDocSearch1 Me.GridViewDocSearch1.GridControl = Me.GridControlDocSearch1
Me.GridViewDocSearch1.Name = "GridViewDocSearch1" Me.GridViewDocSearch1.Name = "GridViewDocSearch1"
Me.GridViewDocSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDocSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -194,12 +196,13 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc2 'XtraTabPageDoc2
' '
Me.XtraTabPageDoc2.Controls.Add(Me.GridControlDocSearch2) Me.XtraTabPageDoc2.Controls.Add(Me.GridControlDocSearch2)
Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2"
resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2") resources.ApplyResources(Me.XtraTabPageDoc2, "XtraTabPageDoc2")
Me.XtraTabPageDoc2.Name = "XtraTabPageDoc2"
' '
'GridControlDocSearch2 'GridControlDocSearch2
' '
resources.ApplyResources(Me.GridControlDocSearch2, "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.MainView = Me.GridViewDocSearch2
Me.GridControlDocSearch2.Name = "GridControlDocSearch2" Me.GridControlDocSearch2.Name = "GridControlDocSearch2"
Me.GridControlDocSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch2}) Me.GridControlDocSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch2})
@ -210,6 +213,7 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch2.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch2.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewDocSearch2.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch2.DetailHeight = 458
Me.GridViewDocSearch2.GridControl = Me.GridControlDocSearch2 Me.GridViewDocSearch2.GridControl = Me.GridControlDocSearch2
Me.GridViewDocSearch2.Name = "GridViewDocSearch2" Me.GridViewDocSearch2.Name = "GridViewDocSearch2"
Me.GridViewDocSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDocSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -224,12 +228,13 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc3 'XtraTabPageDoc3
' '
Me.XtraTabPageDoc3.Controls.Add(Me.GridControlDocSearch3) Me.XtraTabPageDoc3.Controls.Add(Me.GridControlDocSearch3)
Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3"
resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3") resources.ApplyResources(Me.XtraTabPageDoc3, "XtraTabPageDoc3")
Me.XtraTabPageDoc3.Name = "XtraTabPageDoc3"
' '
'GridControlDocSearch3 'GridControlDocSearch3
' '
resources.ApplyResources(Me.GridControlDocSearch3, "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.MainView = Me.GridViewDocSearch3
Me.GridControlDocSearch3.Name = "GridControlDocSearch3" Me.GridControlDocSearch3.Name = "GridControlDocSearch3"
Me.GridControlDocSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch3}) Me.GridControlDocSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch3})
@ -240,6 +245,7 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch3.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch3.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewDocSearch3.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch3.DetailHeight = 458
Me.GridViewDocSearch3.GridControl = Me.GridControlDocSearch3 Me.GridViewDocSearch3.GridControl = Me.GridControlDocSearch3
Me.GridViewDocSearch3.Name = "GridViewDocSearch3" Me.GridViewDocSearch3.Name = "GridViewDocSearch3"
Me.GridViewDocSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDocSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -254,12 +260,13 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc4 'XtraTabPageDoc4
' '
Me.XtraTabPageDoc4.Controls.Add(Me.GridControlDocSearch4) Me.XtraTabPageDoc4.Controls.Add(Me.GridControlDocSearch4)
Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4"
resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4") resources.ApplyResources(Me.XtraTabPageDoc4, "XtraTabPageDoc4")
Me.XtraTabPageDoc4.Name = "XtraTabPageDoc4"
' '
'GridControlDocSearch4 'GridControlDocSearch4
' '
resources.ApplyResources(Me.GridControlDocSearch4, "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.MainView = Me.GridViewDocSearch4
Me.GridControlDocSearch4.Name = "GridControlDocSearch4" Me.GridControlDocSearch4.Name = "GridControlDocSearch4"
Me.GridControlDocSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch4}) Me.GridControlDocSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch4})
@ -270,6 +277,7 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch4.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch4.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch4.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewDocSearch4.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch4.DetailHeight = 458
Me.GridViewDocSearch4.GridControl = Me.GridControlDocSearch4 Me.GridViewDocSearch4.GridControl = Me.GridControlDocSearch4
Me.GridViewDocSearch4.Name = "GridViewDocSearch4" Me.GridViewDocSearch4.Name = "GridViewDocSearch4"
Me.GridViewDocSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDocSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -284,12 +292,13 @@ Partial Class frmValidatorSearch
'XtraTabPageDoc5 'XtraTabPageDoc5
' '
Me.XtraTabPageDoc5.Controls.Add(Me.GridControlDocSearch5) Me.XtraTabPageDoc5.Controls.Add(Me.GridControlDocSearch5)
Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5"
resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5") resources.ApplyResources(Me.XtraTabPageDoc5, "XtraTabPageDoc5")
Me.XtraTabPageDoc5.Name = "XtraTabPageDoc5"
' '
'GridControlDocSearch5 'GridControlDocSearch5
' '
resources.ApplyResources(Me.GridControlDocSearch5, "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.MainView = Me.GridViewDocSearch5
Me.GridControlDocSearch5.Name = "GridControlDocSearch5" Me.GridControlDocSearch5.Name = "GridControlDocSearch5"
Me.GridControlDocSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch5}) Me.GridControlDocSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch5})
@ -300,6 +309,7 @@ Partial Class frmValidatorSearch
Me.GridViewDocSearch5.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch5.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewDocSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewDocSearch5.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewDocSearch5.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewDocSearch5.DetailHeight = 458
Me.GridViewDocSearch5.GridControl = Me.GridControlDocSearch5 Me.GridViewDocSearch5.GridControl = Me.GridControlDocSearch5
Me.GridViewDocSearch5.Name = "GridViewDocSearch5" Me.GridViewDocSearch5.Name = "GridViewDocSearch5"
Me.GridViewDocSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewDocSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -313,9 +323,11 @@ Partial Class frmValidatorSearch
' '
'DocumentViewer1 'DocumentViewer1
' '
Me.DocumentViewer1.BackColor = System.Drawing.SystemColors.ControlLightLight
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.FileLoaded = False
Me.DocumentViewer1.Name = "DocumentViewer1" Me.DocumentViewer1.Name = "DocumentViewer1"
Me.DocumentViewer1.Viewer_ForceTemporaryMode = False
' '
'SplitContainerSearches 'SplitContainerSearches
' '
@ -344,12 +356,13 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch1 'XtraTabPageSearch1
' '
Me.XtraTabPageSearch1.Controls.Add(Me.GridControlSearch1) Me.XtraTabPageSearch1.Controls.Add(Me.GridControlSearch1)
Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1"
resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1") resources.ApplyResources(Me.XtraTabPageSearch1, "XtraTabPageSearch1")
Me.XtraTabPageSearch1.Name = "XtraTabPageSearch1"
' '
'GridControlSearch1 'GridControlSearch1
' '
resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1") resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1")
Me.GridControlSearch1.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch1.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode2.RelationName = "Level1" GridLevelNode2.RelationName = "Level1"
Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
Me.GridControlSearch1.MainView = Me.GridViewSearch1 Me.GridControlSearch1.MainView = Me.GridViewSearch1
@ -362,6 +375,7 @@ Partial Class frmValidatorSearch
Me.GridViewSearch1.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch1.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch1.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewSearch1.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch1.DetailHeight = 458
Me.GridViewSearch1.GridControl = Me.GridControlSearch1 Me.GridViewSearch1.GridControl = Me.GridControlSearch1
Me.GridViewSearch1.Name = "GridViewSearch1" Me.GridViewSearch1.Name = "GridViewSearch1"
Me.GridViewSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewSearch1.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -376,12 +390,13 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch2 'XtraTabPageSearch2
' '
Me.XtraTabPageSearch2.Controls.Add(Me.GridControlSearch2) Me.XtraTabPageSearch2.Controls.Add(Me.GridControlSearch2)
Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2"
resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2") resources.ApplyResources(Me.XtraTabPageSearch2, "XtraTabPageSearch2")
Me.XtraTabPageSearch2.Name = "XtraTabPageSearch2"
' '
'GridControlSearch2 'GridControlSearch2
' '
resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2") resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2")
Me.GridControlSearch2.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch2.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode3.RelationName = "Level1" GridLevelNode3.RelationName = "Level1"
Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3})
Me.GridControlSearch2.MainView = Me.GridViewSearch2 Me.GridControlSearch2.MainView = Me.GridViewSearch2
@ -394,6 +409,7 @@ Partial Class frmValidatorSearch
Me.GridViewSearch2.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch2.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch2.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch2.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewSearch2.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch2.DetailHeight = 458
Me.GridViewSearch2.GridControl = Me.GridControlSearch2 Me.GridViewSearch2.GridControl = Me.GridControlSearch2
Me.GridViewSearch2.Name = "GridViewSearch2" Me.GridViewSearch2.Name = "GridViewSearch2"
Me.GridViewSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewSearch2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -408,12 +424,13 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch3 'XtraTabPageSearch3
' '
Me.XtraTabPageSearch3.Controls.Add(Me.GridControlSearch3) Me.XtraTabPageSearch3.Controls.Add(Me.GridControlSearch3)
Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3"
resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3") resources.ApplyResources(Me.XtraTabPageSearch3, "XtraTabPageSearch3")
Me.XtraTabPageSearch3.Name = "XtraTabPageSearch3"
' '
'GridControlSearch3 'GridControlSearch3
' '
resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3") resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3")
Me.GridControlSearch3.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch3.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode4.RelationName = "Level1" GridLevelNode4.RelationName = "Level1"
Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4}) Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
Me.GridControlSearch3.MainView = Me.GridViewSearch3 Me.GridControlSearch3.MainView = Me.GridViewSearch3
@ -426,6 +443,7 @@ Partial Class frmValidatorSearch
Me.GridViewSearch3.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch3.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch3.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch3.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewSearch3.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch3.DetailHeight = 458
Me.GridViewSearch3.GridControl = Me.GridControlSearch3 Me.GridViewSearch3.GridControl = Me.GridControlSearch3
Me.GridViewSearch3.Name = "GridViewSearch3" Me.GridViewSearch3.Name = "GridViewSearch3"
Me.GridViewSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewSearch3.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -440,12 +458,13 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch4 'XtraTabPageSearch4
' '
Me.XtraTabPageSearch4.Controls.Add(Me.GridControlSearch4) Me.XtraTabPageSearch4.Controls.Add(Me.GridControlSearch4)
Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4"
resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4") resources.ApplyResources(Me.XtraTabPageSearch4, "XtraTabPageSearch4")
Me.XtraTabPageSearch4.Name = "XtraTabPageSearch4"
' '
'GridControlSearch4 'GridControlSearch4
' '
resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4") resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4")
Me.GridControlSearch4.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch4.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode5.RelationName = "Level1" GridLevelNode5.RelationName = "Level1"
Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5}) Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5})
Me.GridControlSearch4.MainView = Me.GridViewSearch4 Me.GridControlSearch4.MainView = Me.GridViewSearch4
@ -458,6 +477,7 @@ Partial Class frmValidatorSearch
Me.GridViewSearch4.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch4.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch4.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch4.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewSearch4.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch4.DetailHeight = 458
Me.GridViewSearch4.GridControl = Me.GridControlSearch4 Me.GridViewSearch4.GridControl = Me.GridControlSearch4
Me.GridViewSearch4.Name = "GridViewSearch4" Me.GridViewSearch4.Name = "GridViewSearch4"
Me.GridViewSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewSearch4.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -472,12 +492,13 @@ Partial Class frmValidatorSearch
'XtraTabPageSearch5 'XtraTabPageSearch5
' '
Me.XtraTabPageSearch5.Controls.Add(Me.GridControlSearch5) Me.XtraTabPageSearch5.Controls.Add(Me.GridControlSearch5)
Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5"
resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5") resources.ApplyResources(Me.XtraTabPageSearch5, "XtraTabPageSearch5")
Me.XtraTabPageSearch5.Name = "XtraTabPageSearch5"
' '
'GridControlSearch5 'GridControlSearch5
' '
resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5") resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5")
Me.GridControlSearch5.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlSearch5.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
GridLevelNode6.RelationName = "Level1" GridLevelNode6.RelationName = "Level1"
Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6}) Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6})
Me.GridControlSearch5.MainView = Me.GridViewSearch5 Me.GridControlSearch5.MainView = Me.GridViewSearch5
@ -490,6 +511,7 @@ Partial Class frmValidatorSearch
Me.GridViewSearch5.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewSearch5.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewSearch5.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime
Me.GridViewSearch5.Appearance.SelectedRow.Options.UseBackColor = True Me.GridViewSearch5.Appearance.SelectedRow.Options.UseBackColor = True
Me.GridViewSearch5.DetailHeight = 458
Me.GridViewSearch5.GridControl = Me.GridControlSearch5 Me.GridViewSearch5.GridControl = Me.GridControlSearch5
Me.GridViewSearch5.Name = "GridViewSearch5" Me.GridViewSearch5.Name = "GridViewSearch5"
Me.GridViewSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewSearch5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
@ -539,6 +561,7 @@ Partial Class frmValidatorSearch
' '
'ToolStrip1 'ToolStrip1
' '
Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButtonFile, Me.ToolStripButtonRefreshSearches}) Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButtonFile, Me.ToolStripButtonRefreshSearches})
resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Name = "ToolStrip1"

View File

@ -125,20 +125,32 @@
<data name="SplitContainerControlDoc.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerControlDoc.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="XtraTabControlDocs.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="XtraTabControlDocs.Location" type="System.Drawing.Point, System.Drawing"> <data name="XtraTabControlDocs.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlDocSearch1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 373</value> <value>583, 933</value>
</data> </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@ -156,8 +168,11 @@
<data name="&gt;&gt;GridControlDocSearch1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlDocSearch1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageDoc1.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value> <value>466, 746</value>
</data> </data>
<data name="XtraTabPageDoc1.Text" xml:space="preserve"> <data name="XtraTabPageDoc1.Text" xml:space="preserve">
<value>XtraTabPage1</value> <value>XtraTabPage1</value>
@ -175,7 +190,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabControlDocs.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabControlDocs.Size" type="System.Drawing.Size, System.Drawing">
<value>351, 582</value> <value>468, 764</value>
</data> </data>
<data name="XtraTabControlDocs.TabIndex" type="System.Int32, mscorlib"> <data name="XtraTabControlDocs.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>4</value>
@ -183,11 +198,17 @@
<data name="GridControlDocSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlDocSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlDocSearch2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 373</value> <value>583, 920</value>
</data> </data>
<data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -204,8 +225,11 @@
<data name="&gt;&gt;GridControlDocSearch2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlDocSearch2.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageDoc2.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value> <value>466, 736</value>
</data> </data>
<data name="XtraTabPageDoc2.Text" xml:space="preserve"> <data name="XtraTabPageDoc2.Text" xml:space="preserve">
<value>XtraTabPage2</value> <value>XtraTabPage2</value>
@ -225,11 +249,17 @@
<data name="GridControlDocSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlDocSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlDocSearch3.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 373</value> <value>583, 916</value>
</data> </data>
<data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -246,8 +276,11 @@
<data name="&gt;&gt;GridControlDocSearch3.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlDocSearch3.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageDoc3.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value> <value>466, 733</value>
</data> </data>
<data name="XtraTabPageDoc3.Text" xml:space="preserve"> <data name="XtraTabPageDoc3.Text" xml:space="preserve">
<value>XtraTabPage1</value> <value>XtraTabPage1</value>
@ -267,11 +300,17 @@
<data name="GridControlDocSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlDocSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlDocSearch4.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 373</value> <value>583, 916</value>
</data> </data>
<data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -288,8 +327,11 @@
<data name="&gt;&gt;GridControlDocSearch4.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlDocSearch4.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageDoc4.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value> <value>466, 733</value>
</data> </data>
<data name="XtraTabPageDoc4.Text" xml:space="preserve"> <data name="XtraTabPageDoc4.Text" xml:space="preserve">
<value>XtraTabPage2</value> <value>XtraTabPage2</value>
@ -309,11 +351,17 @@
<data name="GridControlDocSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlDocSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlDocSearch5.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>233, 373</value> <value>583, 916</value>
</data> </data>
<data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -330,8 +378,11 @@
<data name="&gt;&gt;GridControlDocSearch5.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlDocSearch5.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageDoc5.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value> <value>466, 733</value>
</data> </data>
<data name="XtraTabPageDoc5.Text" xml:space="preserve"> <data name="XtraTabPageDoc5.Text" xml:space="preserve">
<value>XtraTabPage3</value> <value>XtraTabPage3</value>
@ -381,8 +432,11 @@
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing"> <data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="DocumentViewer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing"> <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>286, 582</value> <value>621, 764</value>
</data> </data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib"> <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -391,7 +445,7 @@
<value>DocumentViewer1</value> <value>DocumentViewer1</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value> <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve"> <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainerControlDoc.Panel2</value> <value>SplitContainerControlDoc.Panel2</value>
@ -415,7 +469,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerControlDoc.Size" type="System.Drawing.Size, System.Drawing">
<value>647, 582</value> <value>1101, 764</value>
</data> </data>
<data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerControlDoc.TabIndex" type="System.Int32, mscorlib">
<value>6</value> <value>6</value>
@ -436,7 +490,10 @@
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="SplitContainerSearches.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerSearches.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value> <value>0, 31</value>
</data>
<data name="SplitContainerSearches.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data> </data>
<data name="XtraTabControlSQL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="XtraTabControlSQL.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
@ -444,14 +501,23 @@
<data name="XtraTabControlSQL.Location" type="System.Drawing.Point, System.Drawing"> <data name="XtraTabControlSQL.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlSearch1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 375</value> <value>639, 926</value>
</data> </data>
<data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@ -468,8 +534,11 @@
<data name="&gt;&gt;GridControlSearch1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlSearch1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value> <value>511, 741</value>
</data> </data>
<data name="XtraTabPageSearch1.Text" xml:space="preserve"> <data name="XtraTabPageSearch1.Text" xml:space="preserve">
<value>Search1</value> <value>Search1</value>
@ -487,7 +556,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabControlSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>563, 585</value> <value>513, 769</value>
</data> </data>
<data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib"> <data name="XtraTabControlSQL.TabIndex" type="System.Int32, mscorlib">
<value>4</value> <value>4</value>
@ -495,11 +564,17 @@
<data name="GridControlSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlSearch2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlSearch2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 375</value> <value>639, 915</value>
</data> </data>
<data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -516,8 +591,11 @@
<data name="&gt;&gt;GridControlSearch2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlSearch2.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value> <value>511, 732</value>
</data> </data>
<data name="XtraTabPageSearch2.Text" xml:space="preserve"> <data name="XtraTabPageSearch2.Text" xml:space="preserve">
<value>Search2</value> <value>Search2</value>
@ -537,11 +615,17 @@
<data name="GridControlSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlSearch3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlSearch3.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 375</value> <value>639, 915</value>
</data> </data>
<data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -558,8 +642,11 @@
<data name="&gt;&gt;GridControlSearch3.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlSearch3.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value> <value>511, 732</value>
</data> </data>
<data name="XtraTabPageSearch3.Text" xml:space="preserve"> <data name="XtraTabPageSearch3.Text" xml:space="preserve">
<value>XtraTabPage1</value> <value>XtraTabPage1</value>
@ -579,11 +666,17 @@
<data name="GridControlSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlSearch4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlSearch4.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 375</value> <value>639, 915</value>
</data> </data>
<data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -600,8 +693,11 @@
<data name="&gt;&gt;GridControlSearch4.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlSearch4.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value> <value>511, 732</value>
</data> </data>
<data name="XtraTabPageSearch4.Text" xml:space="preserve"> <data name="XtraTabPageSearch4.Text" xml:space="preserve">
<value>XtraTabPage2</value> <value>XtraTabPage2</value>
@ -621,11 +717,17 @@
<data name="GridControlSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridControlSearch5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </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"> <data name="GridControlSearch5.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </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"> <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>374, 375</value> <value>639, 915</value>
</data> </data>
<data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -642,8 +744,11 @@
<data name="&gt;&gt;GridControlSearch5.ZOrder" xml:space="preserve"> <data name="&gt;&gt;GridControlSearch5.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </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"> <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value> <value>511, 732</value>
</data> </data>
<data name="XtraTabPageSearch5.Text" xml:space="preserve"> <data name="XtraTabPageSearch5.Text" xml:space="preserve">
<value>XtraTabPage3</value> <value>XtraTabPage3</value>
@ -676,19 +781,22 @@
<value>595, 17</value> <value>595, 17</value>
</metadata> </metadata>
<data name="tsslblSQL.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsslblSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 17</value> <value>115, 20</value>
</data> </data>
<data name="tsslblSQL.Text" xml:space="preserve"> <data name="tsslblSQL.Text" xml:space="preserve">
<value>No action so far</value> <value>No action so far</value>
</data> </data>
<data name="statlbl.Size" type="System.Drawing.Size, System.Drawing"> <data name="statlbl.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 17</value> <value>0, 20</value>
</data> </data>
<data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing"> <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 585</value> <value>0, 769</value>
</data>
<data name="StatusStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 19, 0</value>
</data> </data>
<data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>563, 22</value> <value>513, 26</value>
</data> </data>
<data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib"> <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
<value>5</value> <value>5</value>
@ -727,22 +835,22 @@
<value>Bottom</value> <value>Bottom</value>
</data> </data>
<data name="tslblDocID.Size" type="System.Drawing.Size, System.Drawing"> <data name="tslblDocID.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 22</value> <value>79, 28</value>
</data> </data>
<data name="tslblDocID.Text" xml:space="preserve"> <data name="tslblDocID.Text" xml:space="preserve">
<value>tslblDocID</value> <value>tslblDocID</value>
</data> </data>
<data name="tslblState.Size" type="System.Drawing.Size, System.Drawing"> <data name="tslblState.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 22</value> <value>115, 28</value>
</data> </data>
<data name="tslblState.Text" xml:space="preserve"> <data name="tslblState.Text" xml:space="preserve">
<value>No action so far</value> <value>No action so far</value>
</data> </data>
<data name="ToolStrip2.Location" type="System.Drawing.Point, System.Drawing"> <data name="ToolStrip2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 582</value> <value>0, 764</value>
</data> </data>
<data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
<value>647, 25</value> <value>1101, 31</value>
</data> </data>
<data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib"> <data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -775,7 +883,10 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="SplitContainerSearches.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerSearches.Size" type="System.Drawing.Size, System.Drawing">
<value>1214, 607</value> <value>1619, 795</value>
</data>
<data name="SplitContainerSearches.SplitterWidth" type="System.Int32, mscorlib">
<value>5</value>
</data> </data>
<data name="SplitContainerSearches.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerSearches.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -796,13 +907,13 @@
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<data name="DateiÖffnenToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="DateiÖffnenToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>148, 22</value> <value>184, 26</value>
</data> </data>
<data name="DateiÖffnenToolStripMenuItem1.Text" xml:space="preserve"> <data name="DateiÖffnenToolStripMenuItem1.Text" xml:space="preserve">
<value>Öffnen</value> <value>Öffnen</value>
</data> </data>
<data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>148, 22</value> <value>184, 26</value>
</data> </data>
<data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve"> <data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
<value>Eigenschaften</value> <value>Eigenschaften</value>
@ -811,7 +922,7 @@
<value>Magenta</value> <value>Magenta</value>
</data> </data>
<data name="ToolStripDropDownButtonFile.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripDropDownButtonFile.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 22</value> <value>79, 28</value>
</data> </data>
<data name="ToolStripDropDownButtonFile.Text" xml:space="preserve"> <data name="ToolStripDropDownButtonFile.Text" xml:space="preserve">
<value>Datei</value> <value>Datei</value>
@ -820,7 +931,7 @@
<value>Magenta</value> <value>Magenta</value>
</data> </data>
<data name="ToolStripButtonRefreshSearches.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripButtonRefreshSearches.Size" type="System.Drawing.Size, System.Drawing">
<value>131, 22</value> <value>162, 28</value>
</data> </data>
<data name="ToolStripButtonRefreshSearches.Text" xml:space="preserve"> <data name="ToolStripButtonRefreshSearches.Text" xml:space="preserve">
<value>Aktualisiere Ansicht</value> <value>Aktualisiere Ansicht</value>
@ -829,7 +940,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
<value>1214, 25</value> <value>1619, 31</value>
</data> </data>
<data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib"> <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -855,7 +966,7 @@
<data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsMAAALDAE/QCLIAAACbElE
QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@ -870,7 +981,7 @@
</value> </value>
</data> </data>
<data name="EigenschaftenDateiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="EigenschaftenDateiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 30</value> <value>218, 30</value>
</data> </data>
<data name="EigenschaftenDateiToolStripMenuItem.Text" xml:space="preserve"> <data name="EigenschaftenDateiToolStripMenuItem.Text" xml:space="preserve">
<value>Eigenschaften Datei</value> <value>Eigenschaften Datei</value>
@ -922,7 +1033,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYdJREFUOE+NkG0rQ2Ec
h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3 h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
@ -933,28 +1044,28 @@
</value> </value>
</data> </data>
<data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 30</value> <value>218, 30</value>
</data> </data>
<data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve"> <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
<value>Datei öffnen</value> <value>Datei öffnen</value>
</data> </data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 6</value> <value>215, 6</value>
</data> </data>
<data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 30</value> <value>218, 30</value>
</data> </data>
<data name="ToolStripMenuItem1.Text" xml:space="preserve"> <data name="ToolStripMenuItem1.Text" xml:space="preserve">
<value>Aktualisieren</value> <value>Aktualisieren</value>
</data> </data>
<data name="LayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="LayoutZurücksetzenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 30</value> <value>218, 30</value>
</data> </data>
<data name="LayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve"> <data name="LayoutZurücksetzenToolStripMenuItem.Text" xml:space="preserve">
<value>Layout zurücksetzen</value> <value>Layout zurücksetzen</value>
</data> </data>
<data name="ContextMenuStripWMFile.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuStripWMFile.Size" type="System.Drawing.Size, System.Drawing">
<value>190, 130</value> <value>219, 130</value>
</data> </data>
<data name="&gt;&gt;ContextMenuStripWMFile.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStripWMFile.Name" xml:space="preserve">
<value>ContextMenuStripWMFile</value> <value>ContextMenuStripWMFile</value>
@ -966,16 +1077,16 @@
<value>423, 17</value> <value>423, 17</value>
</metadata> </metadata>
<data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 6</value> <value>168, 6</value>
</data> </data>
<data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 30</value> <value>171, 30</value>
</data> </data>
<data name="ToolStripMenuItem4.Text" xml:space="preserve"> <data name="ToolStripMenuItem4.Text" xml:space="preserve">
<value>Aktualisieren</value> <value>Aktualisieren</value>
</data> </data>
<data name="ContextMenuStripSQL.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuStripSQL.Size" type="System.Drawing.Size, System.Drawing">
<value>151, 40</value> <value>172, 40</value>
</data> </data>
<data name="&gt;&gt;ContextMenuStripSQL.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStripSQL.Name" xml:space="preserve">
<value>ContextMenuStripSQL</value> <value>ContextMenuStripSQL</value>
@ -990,10 +1101,10 @@
<value>81</value> <value>81</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value> <value>8, 17</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>1214, 632</value> <value>1619, 826</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt</value> <value>Tahoma, 8.25pt</value>
@ -1031,6 +1142,9 @@
AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAP//AAA= AACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAP//AAA=
</value> </value>
</data> </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"> <data name="$this.Text" xml:space="preserve">
<value>Zusätzliche Suchen</value> <value>Zusätzliche Suchen</value>
</data> </data>

View File

@ -87,6 +87,7 @@ Public Class frmValidatorSearch
'#### SQL Tabs Design Laden '#### SQL Tabs Design Laden
If DTSQL.Rows.Count > 0 Then If DTSQL.Rows.Count > 0 Then
LOGGER.Debug(String.Format("[{0} SQL-Definitions]", DTSQL.Rows.Count))
For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1 For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
XtraTabControlSQL.TabPages(p).PageVisible = False XtraTabControlSQL.TabPages(p).PageVisible = False
@ -102,6 +103,7 @@ Public Class frmValidatorSearch
End If End If
If DTDOC.Rows.Count > 0 Then If DTDOC.Rows.Count > 0 Then
LOGGER.Debug(String.Format("[{0} Doc-Definitions]", DTDOC.Rows.Count))
'#### Doc Tabs Design Laden '#### Doc Tabs Design Laden
For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1 For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
@ -454,7 +456,9 @@ Public Class frmValidatorSearch
End If End If
End If End If
If My.Settings.frmValidatorSearchSize.IsEmpty = False Then If My.Settings.frmValidatorSearchSize.IsEmpty = False Then
Size = My.Settings.frmValidatorSearchSize If My.Settings.frmValidatorSearchSize.Height > 100 And My.Settings.frmValidatorSearchSize.Width > 100 Then
Me.Size = My.Settings.frmValidatorSearchSize
End If
End If End If
SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
@ -462,6 +466,22 @@ Public Class frmValidatorSearch
End Sub End Sub
Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Try
If My.Settings.frmValidatorSearchPosition.X > 0 And My.Settings.frmValidatorSearchPosition.Y > 0 Then
Me.Location = My.Settings.frmValidatorSearchPosition
End If
If Me.Size.Height > 100 And Me.Size.Width > 100 Then
Me.Size = My.Settings.frmValidatorSearchSize
Else
Me.Size = New Size(500, 800)
End If
SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
Catch ex As Exception
LOGGER.Error(ex)
End Try
formLoaded = True formLoaded = True
End Sub End Sub

View File

@ -56,7 +56,7 @@ Partial Class frmYesNo
' '
resources.ApplyResources(Me.PictureEdit1, "PictureEdit1") resources.ApplyResources(Me.PictureEdit1, "PictureEdit1")
Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Name = "PictureEdit1"
Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.White
Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True
Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
@ -64,7 +64,7 @@ Partial Class frmYesNo
' '
'txtQuestion 'txtQuestion
' '
Me.txtQuestion.BackColor = System.Drawing.SystemColors.Control Me.txtQuestion.BackColor = System.Drawing.Color.White
Me.txtQuestion.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtQuestion.BorderStyle = System.Windows.Forms.BorderStyle.None
resources.ApplyResources(Me.txtQuestion, "txtQuestion") resources.ApplyResources(Me.txtQuestion, "txtQuestion")
Me.txtQuestion.Name = "txtQuestion" Me.txtQuestion.Name = "txtQuestion"

View File

@ -187,7 +187,7 @@
<value>1</value> <value>1</value>
</data> </data>
<data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing"> <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>242, 277</value> <value>243, 265</value>
</data> </data>
<data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value> <value>4, 4, 4, 4</value>
@ -273,7 +273,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="txtQuestion.Size" type="System.Drawing.Size, System.Drawing"> <data name="txtQuestion.Size" type="System.Drawing.Size, System.Drawing">
<value>378, 68</value> <value>378, 54</value>
</data> </data>
<data name="txtQuestion.TabIndex" type="System.Int32, mscorlib"> <data name="txtQuestion.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
@ -330,7 +330,7 @@
<value>True</value> <value>True</value>
</data> </data>
<data name="txtReason.Size" type="System.Drawing.Size, System.Drawing"> <data name="txtReason.Size" type="System.Drawing.Size, System.Drawing">
<value>428, 139</value> <value>429, 135</value>
</data> </data>
<data name="txtReason.TabIndex" type="System.Int32, mscorlib"> <data name="txtReason.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -354,7 +354,7 @@
<value>7, 16</value> <value>7, 16</value>
</data> </data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing"> <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>452, 326</value> <value>453, 316</value>
</data> </data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing"> <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 9.75pt</value> <value>Tahoma, 9.75pt</value>

View File

@ -3,18 +3,20 @@
Public Class frmYesNo Public Class frmYesNo
Dim oQuestion As String Dim oQuestion As String
Dim oCaption As String Dim oCaption As String
Dim CommentInput As Boolean
Public oComment As String Public oComment As String
Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String) Public Sub New(pQuestion As String, pCaption As String, pCommentSoFar As String, pCommentInput As Boolean)
MyBase.New() MyBase.New()
oQuestion = pQuestion oQuestion = pQuestion
oCaption = pCaption oCaption = pCaption
oComment = pCommentSoFar oComment = pCommentSoFar
CommentInput = pCommentInput
InitializeComponent() InitializeComponent()
' Add any initialization after the InitializeComponent() call. ' Add any initialization after the InitializeComponent() call.
End Sub End Sub
Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
If txtReason.Text = String.Empty Then If txtReason.Text = String.Empty And CommentInput = True Then
Dim oStop As String Dim oStop As String
If USER_LANGUAGE = "de-DE" Then If USER_LANGUAGE = "de-DE" Then
oStop = "Bitte eine Begründung eingeben!" oStop = "Bitte eine Begründung eingeben!"
@ -42,6 +44,15 @@ Public Class frmYesNo
Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load Private Sub frmYesNo_Load(sender As Object, e As EventArgs) Handles Me.Load
txtQuestion.Text = oQuestion txtQuestion.Text = oQuestion
txtReason.Text = oComment txtReason.Text = oComment
If CommentInput = False Then
LabelControl1.Visible = False
txtReason.Visible = False
Me.Size = New Drawing.Size(455, 170)
Else
LabelControl1.Visible = True
txtReason.Visible = True
Me.Size = New Drawing.Size(455, 330)
End If
Me.Text = oCaption Me.Text = oCaption
End Sub End Sub
End Class End Class

View File

@ -1,19 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" /> <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
<package id="DigitalData.Controls.DocumentViewer" version="1.9.8" targetFramework="net462" />
<package id="DigitalData.GUIs.Common" version="2.6.2" targetFramework="net462" />
<package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
<package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
<package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
<package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
<package id="DigitalData.Modules.Filesystem" version="1.3.3" targetFramework="net462" />
<package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
<package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
<package id="DigitalData.Modules.Patterns" version="1.3.1" targetFramework="net462" />
<package id="DigitalData.Modules.Windows" version="1.5.1" targetFramework="net462" />
<package id="DocumentFormat.OpenXml" version="3.2.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="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="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" 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.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
@ -35,7 +25,7 @@
<package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" /> <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
<package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" /> <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
<package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" /> <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" /> <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" /> <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
<package id="System.Management" version="9.0.0" targetFramework="net462" /> <package id="System.Management" version="9.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.6.0" targetFramework="net462" /> <package id="System.Memory" version="4.6.0" targetFramework="net462" />