11 Commits

Author SHA1 Message Date
Developer01
daf1c16b30 DocumentViewer Aufruf über Pfad (txtDateien) 2025-08-22 08:46:26 +02:00
Developer01
468f6e8ff0 Nochmal ProfileID 2025-08-22 08:11:06 +02:00
Developer01
c577177493 ProfileID in FormDesigner 2025-08-22 08:03:33 +02:00
Developer01
4807ab53b0 Version 2.6.0 für Master 2025-08-21 12:08:04 +02:00
Developer01
03b566574f Indexe leeren wie Vektor, ValidatorSearch und Instanzierung, ShowDocument abfangen 2025-08-21 11:19:48 +02:00
Developer01
a9cc02c4b4 @@Display Only wie ReadOnly behandeln Try1 2025-08-19 13:34:55 +02:00
Developer01
f21dbd3423 LookupControl Rückgabe Wert1','Wert2
VektorBoolean Handling und String.empty zum leeren
2025-08-18 18:28:21 +02:00
Developer01
cbdc5f900c Projekt LUControl und modules aus Projektmappe entfernt 2025-08-18 11:54:33 +02:00
Developer01
329f733ec9 Überarbeitung nach Rückmeldung Marvin (windreamIndexe SQL Editor, Dynmisch verkleinern des pnlValidators, Regexprüfung editvalue, Bedienung Tastaturbefehle, ...) 2025-08-18 11:51:56 +02:00
Developer01
642e65c95b FormatString Currency 2025-08-15 15:07:24 +02:00
Developer01
ffa65a9c07 Prüfen der Offenen Tickets und Push in Master, frmValidator (Fehlerhandling, Currency etc) 2025-08-15 12:55:53 +02:00
19 changed files with 1138 additions and 1022 deletions

View File

@@ -154,7 +154,7 @@
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
<File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
<File Id="GdPicture.NET.14..Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
<File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
<File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
<File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
@@ -166,7 +166,12 @@
<File Id="GdPicture.NET.14.OpenXML" Name="GdPicture.NET.14.OpenXML.dll" />
<File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
<File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" />
<File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll"/>
<File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll"/>
<File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll"/>
<File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/>
<File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
<File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />
</Component>
<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">

View File

@@ -7,10 +7,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windream", "..\..\..\2_DLL Projekte\DDModules\Windream\Windream.vbproj", "{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControl", "..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\LookupControl.vbproj", "{3DCD6D1A-C830-4241-B7E4-27430E7EA483}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -65,46 +61,6 @@ Global
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|x86.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.CD_ROM|x86.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|x86.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Debug|x86.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|x86.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.DVD-5|x86.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|Any CPU.Build.0 = Release|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|x86.ActiveCfg = Release|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.Release|x86.Build.0 = Release|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|Any CPU.Build.0 = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|x86.ActiveCfg = Debug|Any CPU
{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}.SingleImage|x86.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|x86.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.CD_ROM|x86.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|x86.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Debug|x86.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|x86.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.DVD-5|x86.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|Any CPU.Build.0 = Release|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|x86.ActiveCfg = Release|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.Release|x86.Build.0 = Release|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|Any CPU.Build.0 = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|x86.ActiveCfg = Debug|Any CPU
{3DCD6D1A-C830-4241-B7E4-27430E7EA483}.SingleImage|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -110,17 +110,22 @@ Public Class ClassControlCreator
Dim family As FontFamily = New FontFamily(familyString)
Dim oGuid As Integer = row.Item("GUID")
Dim oName As String = NotNull(row.Item("NAME"), "")
Dim oControlName As String = NotNull(row.Item("NAME"), "")
Dim oAttribute As String = NotNull(row.Item("INDEX_NAME"), "")
Dim oLocation As New Point(x, y)
Dim oFont As New Font(family, size, style, GraphicsUnit.Point)
Dim oColor As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
Dim oReadOnly As Boolean = row.Item("READ_ONLY")
Dim oAddNewItems As Boolean = row.Item("VKT_ADD_ITEM")
If oAttribute = "@@DISPLAY_ONLY" And oReadOnly = False Then
Logger.Info($"Override oReadOnly = True for Control [{oControlName}] as Attribute is @@DISPLAY_ONLY and ReadOnly = False")
oReadOnly = True
End If
Return New ControlDBProps() With {
.Guid = oGuid,
.Name = oName,
.Name = oControlName,
.Attribute = oAttribute,
.Location = oLocation,
.Font = oFont,
@@ -305,10 +310,9 @@ Public Class ClassControlCreator
Dim oReadOnly = oControlRow.ItemEx("READ_ONLY", False)
Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty)
Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty)
Dim oIndexname = oControlRow.ItemEx("INDEX_NAME", String.Empty)
Dim oControl As BaseEdit = Nothing
If oHeight > 27 Then
If oHeight >= 27 Then
oControl = CreateBaseControl(New MemoEdit(), oControlRow, designMode)
Else
oControl = CreateBaseControl(New TextEdit(), oControlRow, designMode)
@@ -323,7 +327,7 @@ Public Class ClassControlCreator
oControl.Width = oWidth
If Not designMode Then
oControl.ReadOnly = oReadOnly
'oControl.ReadOnly = oReadOnly
oControl.TabStop = Not oReadOnly
oControl.BackColor = IIf(oReadOnly, Color.LightGray, Color.White)
@@ -332,12 +336,10 @@ Public Class ClassControlCreator
If oFormatString <> String.Empty Then
oControl.Properties.DisplayFormat.FormatType = FormatType.Custom
oControl.Properties.DisplayFormat.FormatString = ClassFormat.GetFormatString(oFormatString)
End If
' For read only controls, don't show the raw value when a user clicks into it
If oReadOnly Then
oControl.Properties.EditFormat.FormatType = FormatType.Custom
oControl.Properties.EditFormat.FormatString = ClassFormat.GetFormatString(oFormatString)
'ElseIf oReadOnly Then
' ' For read only controls, don't show the raw value when a user clicks into it
' oControl.Properties.EditFormat.FormatType = FormatType.Custom
' oControl.Properties.EditFormat.FormatString = ClassFormat.GetFormatString(oFormatString)
End If
Else
oControl.ReadOnly = True

View File

@@ -152,14 +152,20 @@ Public Class ClassPMWindream
'Den Typ des Index-Feldes auslesen
'MsgBox(value.GetType.ToString)
Select Case vType
'Case WMObjectVariableValueTypeUndefined
Case WMObjectVariableValueTypeString
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString")
convertValue = CStr(value)
If value = "DeleteWMAttributeValue" Then
LOGGER.Debug("Indexing simpleAttribute with String.Empty")
convertValue = CStr(String.Empty)
Else
convertValue = CStr(value)
End If
Case WMObjectVariableValueTypeInteger
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger")
If IsNumeric(value) = False Then
If value = "String.Empty" Then
If value = String.Empty Then
LOGGER.Debug("Indexing WMObjectVariableValueTypeInteger with vbEmpty")
convertValue = vbEmpty
Else
frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value
@@ -187,7 +193,8 @@ Public Class ClassPMWindream
Case WMObjectVariableValueTypeFloat
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeFloat")
Try
convertValue = CDbl(value)
value = Replace(value, ".", ",")
convertValue = Convert.ToDouble(value)
Catch ex As Exception
LOGGER.Error(ex)
frmValidator.idxerr_message = "Could't convert value '" & value & "' to double!"
@@ -288,17 +295,9 @@ Public Class ClassPMWindream
LOGGER.Info(" >> Unexpected Error in Logging SetVariableValue for " & aName & ": " & ex.Message, False)
End Try
'Dim ArrValues()
'ReDim ArrValues(0)
'ArrValues(0) = convertValue
'Dim ArrName()
'ReDim ArrName(0)
'ArrName(0) = "Tournr"
'oDocument.SetValues(ArrName, ArrValues)
If convertValue = "String.Empty" Or convertValue = vbEmpty Then
LOGGER.Debug("Now Indexing simpleAttribute with vbEmpty ...")
oDocument.SetVariableValue(aName, String.Empty)
ElseIf _int = True Then
If _int = True Then
oDocument.SetVariableValue(aName, CInt(convertValue))
ElseIf _date = True Then
oDocument.SetVariableValue(aName, CDate(convertValue))
@@ -316,120 +315,135 @@ Public Class ClassPMWindream
Else
'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST
LOGGER.Debug("VEKTORFELD: Vorbereiten des Arrays", False)
Dim myArray()
'Dim anz As Integer = 0
'For Each obj In aValues
'ReDim Preserve myArray(anz)
Select Case vType
Case 4100
'Vektortyp Boolean
'Umwandeln in Boolean
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Select Case obj.ToString.ToLower
Case "falsch"
obj = False
Case "wahr"
obj = True
Case "nein"
obj = False
Case "ja"
obj = True
End Select
myArray(i1) = CBool(obj)
i1 = i1 + 1
Next
Case 4101
'Vektortyp Date
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CDate(obj)
i1 = i1 + 1
Next
Case 4104
'Vektortyp Currency
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(obj))
myArray(i1) = aValueWrapper
i1 = i1 + 1
Next
Case 4097
'Vektortyp ALPHANUMERISCH
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
Case 4098
'Umwandeln in Integer
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CInt(obj)
i1 = i1 + 1
Next
Case 4099
'Umwandeln in Double
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Dim Str As String = obj
myArray(i1) = CDbl(Str.Replace(".", ","))
i1 = i1 + 1
Next
Case 36865
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
Case Else
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
End Select
LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
'Jetzt die Nachindexierung für Vektor-Felder
If myArray(0) = "String.Empty" Then
LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...")
oDocument.SetVariableValue(aName, vbEmpty)
Else
If aValues(0).ToString.Contains("DeleteWMAttributeValue") Then
'Variante um Vektorfeld zu leeren
Dim myArray()
ReDim myArray(aValues.Length - 1)
myArray(0) = String.Empty
LOGGER.Debug("Now Indexing vektor-attribute with String.Empty ...")
oDocument.SetVariableValue(aName, myArray)
Else
Dim myArray()
Select Case vType
Case 4100
'Vektortyp Boolean
'Umwandeln in Boolean
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Select Case obj.ToString.ToLower
Case "falsch"
obj = False
Case "wahr"
obj = True
Case "nein"
obj = False
Case "ja"
obj = True
Case "0"
obj = False
Case "1"
obj = True
End Select
myArray(i1) = CBool(obj)
i1 = i1 + 1
Next
Case 4101
'Vektortyp Date
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CDate(obj)
i1 = i1 + 1
Next
Case 4104
'Vektortyp Currency
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(obj))
myArray(i1) = aValueWrapper
i1 = i1 + 1
Next
Case 4097
'Vektortyp ALPHANUMERISCH
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
Case 4098
'Umwandeln in Integer
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CInt(obj)
i1 = i1 + 1
Next
Case 4099
'Umwandeln in Double
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
Dim Str As String = obj
myArray(i1) = CDbl(Str.Replace(".", ","))
i1 = i1 + 1
Next
Case 36865
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
Case Else
'Umwandeln in String
'Die Größe des Arrays festlegen
ReDim myArray(aValues.Length - 1)
Dim i1 As Integer = 0
'Das Array durchlaufen und Werte für den Index in Array schreiben
For Each obj In aValues
myArray(i1) = CStr(obj)
i1 = i1 + 1
Next
End Select
'Jetzt die Nachindexierung für Vektor-Felder
LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
'If vType = 4097 Or vType = 36865 Then
' If myArray(0) = "DeleteWMAttributeValue" Then
' 'Variante um Vektorfeld zu leeren
' LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...")
' oDocument.SetVariableValue(aName, vbEmpty)
' Else
' oDocument.SetVariableValue(aName, myArray)
' End If
'Else
oDocument.SetVariableValue(aName, myArray)
'End If
End If
LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False)
End If
End If

View File

@@ -359,13 +359,14 @@ LOGGER.Error(ex)
Dim indexnamen() As String = Me.GetIndicesByObjecttype(objekttyp)
If indexnamen Is Nothing Then Return False
MVSource_AllIndicies = MyIndicies
For Each index As String In indexnamen
If index = indexname Then Return True
Next
Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Error(ex)
MsgBox("Beim Prüfen ob ein Index für einen Objekttypen existiert, ist ein Fehler aufgetreten." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Prüfen auf Existenz eines Index in einem Objekttyp")
End Try

View File

@@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("taskFLOW")>
<Assembly: AssemblyCopyright("Copyright © Digital Data 2025")>
<Assembly: AssemblyTrademark("2.5.6.0")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)>
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.6.0")>
<Assembly: AssemblyVersion("2.6.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")>

View File

@@ -156,10 +156,6 @@
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.SnapPanel">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonoRepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
</Reference>
<Reference Include="DigitalData.GUIs.Common, Version=2.5.8.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
</Reference>
<Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">

View File

@@ -238,22 +238,29 @@ Public Class clsPatterns
End Try
Case GetType(LookupControl3)
Dim oLookupControl3 As LookupControl3 = oControl
If oLookupControl3.Properties.SelectedValues.Count >= 1 Then
If oLookupControl3.Properties.SelectedValues.Count > 1 Then
LOGGER.Debug($"LookupControl3 mit mehr als 1 Value")
Dim oIndex As Integer = 0
For Each oString As String In oLookupControl3.Properties.SelectedValues
If oIndex = 0 Then
oReplaceValue = "'" + oString + "'"
oReplaceValue = oString
Else
oReplaceValue += ", '" + oString + "'"
oReplaceValue += "', '" + oString
End If
oIndex += 1
Next
oIsSQL = False
LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")
ElseIf oLookupControl3.Properties.SelectedValues.Count = 1 Then
LOGGER.Debug($"LookupControl3 mit genau einem Value")
oReplaceValue = oLookupControl3.Properties.SelectedValues(0)
Else
LOGGER.Warn($"SelectedValues of LookUpControl scheint emty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
LOGGER.Warn($"SelectedValues of LookUpControl scheint empty oder leer zu sein! Ersetzen mit ErrorReplaceValue!")
oReplaceValue = ERROR_REPLACE_VALUE
End If
LOGGER.Debug($"oReplaceValue nach Durchlaufen selectedValues: {oReplaceValue}")
Case GetType(Windows.Forms.ComboBox)
oReplaceValue = oControl.Text

View File

@@ -113,7 +113,7 @@ Public Class frmAdministration
MyIndicies_Types = New List(Of Integer)
MyIndicies = New List(Of String)
MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList()
MVSource_AllIndicies = MyIndicies
If MyIndicies IsNot Nothing Then
Dim i As Integer = 0
@@ -1235,6 +1235,13 @@ Public Class frmAdministration
.PlaceholdersManualTitle = "Controls",
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
}
If IDB_ACTIVE = False Then
oForm.ATTRIBUTE_STORE = "WM"
oForm.PlaceholdersWindream = MVSource_AllIndicies
Else
oForm.ATTRIBUTE_STORE = "IDB"
End If
oForm.ShowDialog()
If oForm.DialogResult = DialogResult.OK Then

View File

@@ -117,101 +117,29 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 9</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>495, 203</value>
</data>
<data name="&gt;&gt;Label1.Name" xml:space="preserve">
<value>Label1</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
<value>355, 150</value>
</data>
<data name="OK_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 5, 6, 5</value>
</data>
<data name="&gt;&gt;Timer1.Name" xml:space="preserve">
<value>Timer1</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txterror.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="Label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="txterror.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="Label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 0, 6, 0</value>
</data>
<data name="&gt;&gt;txterror.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txterror.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
<value>134, 41</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="&gt;&gt;Label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Fehlermeldung:</value>
</data>
<data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
<value>355, 150</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmError</value>
</data>
<data name="txterror.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 9.75pt</value>
</data>
<data name="&gt;&gt;Timer1.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="txterror.Location" type="System.Drawing.Point, System.Drawing">
<value>19, 35</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;OK_Button.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>12, 23</value>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="OK_Button.Text" xml:space="preserve">
<value>OK</value>
</data>
<data name="&gt;&gt;txterror.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;txterror.Name" xml:space="preserve">
<value>txterror</value>
</data>
<data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
<value>358, 23</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="Label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="&gt;&gt;OK_Button.Name" xml:space="preserve">
<value>OK_Button</value>
</data>
<data name="&gt;&gt;OK_Button.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -219,31 +147,103 @@
<data name="&gt;&gt;OK_Button.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;OK_Button.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="Label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 9</value>
</data>
<data name="Label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 0, 6, 0</value>
</data>
<data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
<value>358, 23</value>
</data>
<data name="Label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="Label1.Text" xml:space="preserve">
<value>Folgender Fehler wurde festgestellt:</value>
</data>
<data name="OK_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 5, 6, 5</value>
<data name="&gt;&gt;Label1.Name" xml:space="preserve">
<value>Label1</value>
</data>
<data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<data name="&gt;&gt;Label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="OK_Button.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
<data name="&gt;&gt;Label1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="txterror.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="txterror.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 9.75pt</value>
</data>
<data name="txterror.Location" type="System.Drawing.Point, System.Drawing">
<value>19, 35</value>
</data>
<data name="txterror.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;OK_Button.Name" xml:space="preserve">
<value>OK_Button</value>
</data>
<data name="txterror.Size" type="System.Drawing.Size, System.Drawing">
<value>470, 107</value>
</data>
<data name="txterror.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;txterror.Name" xml:space="preserve">
<value>txterror</value>
</data>
<data name="&gt;&gt;txterror.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txterror.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;txterror.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>12, 23</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>495, 203</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 5, 6, 5</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Fehlermeldung:</value>
</data>
<data name="&gt;&gt;Timer1.Name" xml:space="preserve">
<value>Timer1</value>
</data>
<data name="&gt;&gt;Timer1.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmError</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

View File

@@ -1,15 +1,24 @@
Imports System.Windows.Forms
Public Class frmError
Public ValidatorError As String = ""
Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
Me.Close()
End Sub
Private Sub frmError_Load(sender As Object, e As System.EventArgs) Handles Me.Load
Me.txterror.Text = errormessage
Me.Label1.Focus()
Me.Timer1.Start()
If ValidatorError <> String.Empty Or errormessage <> String.Empty Then
If ValidatorError <> String.Empty Then
Me.txterror.Text = ValidatorError
Else
Me.txterror.Text = errormessage
End If
Me.Label1.Focus()
Me.Timer1.Start()
Else
Me.Close()
End If
End Sub
Private Sub Timer1_Tick(sender As System.Object, e As System.EventArgs) Handles Timer1.Tick

View File

@@ -49,6 +49,8 @@ Partial Class frmFormDesigner
Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem()
Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem()
Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem()
Me.BarStaticItem2 = New DevExpress.XtraBars.BarStaticItem()
Me.bsitmProfilID = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -125,9 +127,9 @@ Partial Class frmFormDesigner
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen})
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen, Me.BarStaticItem2, Me.bsitmProfilID})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 21
Me.RibbonControl1.MaxItemId = 23
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -283,6 +285,20 @@ Partial Class frmFormDesigner
Me.tslblAenderungen.Name = "tslblAenderungen"
Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
'
'BarStaticItem2
'
resources.ApplyResources(Me.BarStaticItem2, "BarStaticItem2")
Me.BarStaticItem2.Id = 21
Me.BarStaticItem2.Name = "BarStaticItem2"
'
'bsitmProfilID
'
resources.ApplyResources(Me.bsitmProfilID, "bsitmProfilID")
Me.bsitmProfilID.Id = 22
Me.bsitmProfilID.ItemAppearance.Normal.Font = CType(resources.GetObject("bsitmProfilID.ItemAppearance.Normal.Font"), System.Drawing.Font)
Me.bsitmProfilID.ItemAppearance.Normal.Options.UseFont = True
Me.bsitmProfilID.Name = "bsitmProfilID"
'
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight})
@@ -332,6 +348,7 @@ Partial Class frmFormDesigner
'
'RibbonStatusBar1
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmProfilID)
Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
@@ -508,4 +525,6 @@ Partial Class frmFormDesigner
Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel
Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
Friend WithEvents BarStaticItem2 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents bsitmProfilID As DevExpress.XtraBars.BarStaticItem
End Class

View File

@@ -421,6 +421,15 @@
<data name="tslblAenderungen.Caption" xml:space="preserve">
<value>Noch keine Änderungen</value>
</data>
<data name="BarStaticItem2.Caption" xml:space="preserve">
<value>BarStaticItem2</value>
</data>
<data name="bsitmProfilID.Caption" xml:space="preserve">
<value>ProfilID: </value>
</data>
<data name="bsitmProfilID.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -1179,6 +1188,18 @@
<data name="&gt;&gt;tslblAenderungen.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;BarStaticItem2.Name" xml:space="preserve">
<value>BarStaticItem2</value>
</data>
<data name="&gt;&gt;BarStaticItem2.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;bsitmProfilID.Name" xml:space="preserve">
<value>bsitmProfilID</value>
</data>
<data name="&gt;&gt;bsitmProfilID.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;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value>
</data>

View File

@@ -39,6 +39,7 @@ Public Class frmFormDesigner
Private Source_LookupIndicies As List(Of String)
Private CurrentColumnId As Integer = 0
Private pgControls_Focused As Boolean = False
Public Sub Reload_ControlNameList()
_Logger.debug("Reloading control name list")
@@ -74,7 +75,7 @@ Public Class frmFormDesigner
' Profil Name in Fenstertitel setzen
Text = $"Validation Designer - Profil: {ProfileName}"
bsitmProfilID.Caption = $"ProfilID: {ProfileId}"
' Try
' Windream initialisieren
If IDB_ACTIVE = False Then
@@ -474,7 +475,11 @@ Public Class frmFormDesigner
Exit Sub
End If
Mouse_IsPressed = False
If (TypeOf sender Is LookupControl3 Or TypeOf sender Is Windows.Forms.ComboBox) Then
RibPGCtrlheight.Enabled = False
Else
RibPGCtrlheight.Enabled = True
End If
' Control Eigenschaften laden
LoadControlProperties(sender)
@@ -614,8 +619,7 @@ Public Class frmFormDesigner
' Default value for ConnectionID
Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"), oConnectionId)
obj.SQLConnection = oConnectionId
obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
Return obj
End Function
@@ -770,7 +774,7 @@ Public Class frmFormDesigner
If e.ChangeType <> DevExpress.XtraVerticalGrid.RowChangeTypeEnum.Value Then
Exit Sub
End If
pgControls_Focused = True
Dim prop = e.Properties.FieldName
Dim newValue = e.Properties.Value
@@ -948,7 +952,7 @@ Public Class frmFormDesigner
Dim v As SQLValue = value
escapedValue = $"'{v.Value.Replace("'", "''")}'"
UpdateSingleValue("CONNECTION_ID", v.ConnectionId)
'UpdateSingleValue("CONNECTION_ID", v.ConnectionId)
End If
Try
@@ -1301,7 +1305,8 @@ Public Class frmFormDesigner
Height_minus()
Else
Console.WriteLine("e.keycode: " + e.KeyCode.ToString)
If e.KeyCode = e.KeyCode.Delete Then
If e.KeyCode = e.KeyCode.Delete And pgControls_Focused = False Then
Control_Delete()
ElseIf e.KeyCode = e.KeyCode.F5 Then
LoadControls()
@@ -1347,40 +1352,69 @@ Public Class frmFormDesigner
Sub Height_minus()
If CurrentControl Is Nothing = False Then
Dim newHeight As Integer = CurrentControl.Height - 5
Dim oReloadNeeded As Boolean = False
If newHeight <= 22 And TypeOf CurrentControl Is DevExpress.XtraEditors.MemoEdit Then
' TODO: Implement Multiline TextBox
'If newHeight < 22 And TypeOf CurrentControl Is TextBox Then
' DirectCast(CurrentControl, TextBox).Multiline = True
'End If
' Verhindert, dass das Control unsichtbar wird
If newHeight < 1 Then
oReloadNeeded = True
' DirectCast(CurrentControl, TextBox).Multiline = True
ElseIf newHeight <= 20 Then
Exit Sub
End If
CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
pgControlsNew.UpdateData()
UpdateSingleValue("HEIGHT", newHeight)
If UpdateSingleValue("HEIGHT", newHeight) And oReloadNeeded Then
LoadControls()
LoadControlProperties(CurrentControl)
End If
End If
End Sub
Sub Height_plus()
If CurrentControl Is Nothing = False Then
Dim newHeight As Integer = CurrentControl.Height + 5
Dim oReloadNeeded As Boolean = False
' TODO: Implement Multiline Textbox
'If newHeight > 21 And TypeOf CurrentControl Is TextBox Then
' DirectCast(CurrentControl, TextBox).Multiline = True
'End If
If newHeight > 21 And TypeOf CurrentControl Is DevExpress.XtraEditors.TextEdit Then
Console.WriteLine("Multiline directcast")
oReloadNeeded = True
' DirectCast(CurrentControl, TextBox).Multiline = True
End If
CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
pgControlsNew.UpdateData()
UpdateSingleValue("HEIGHT", newHeight)
If UpdateSingleValue("HEIGHT", newHeight) And oReloadNeeded Then
LoadControls()
CurrentControl.Select()
CurrentControl.BackColor = Color.Orange
End If
End If
End Sub
Private Sub pgControlsNew_KeyPress(sender As Object, e As KeyPressEventArgs) Handles pgControlsNew.KeyPress
pgControls_Focused = True
End Sub
Private Sub pgControlsNew_Leave(sender As Object, e As EventArgs) Handles pgControlsNew.Leave
pgControls_Focused = False
End Sub
Private Sub pgControlsNew_KeyUp(sender As Object, e As KeyEventArgs) Handles pgControlsNew.KeyUp
pgControls_Focused = True
End Sub
Private Sub pgControlsNew_Click(sender As Object, e As EventArgs) Handles pgControlsNew.Click
pgControls_Focused = True
End Sub
Private Sub pgControlsNew_GotFocus(sender As Object, e As EventArgs) Handles pgControlsNew.GotFocus
pgControls_Focused = True
End Sub
Private Sub pgControlsNew_Enter(sender As Object, e As EventArgs) Handles pgControlsNew.Enter
pgControls_Focused = True
End Sub
End Class

View File

@@ -259,8 +259,8 @@ Partial Class frmValidator
'
'DocumentViewer1
'
Me.DocumentViewer1.FileLoaded = False
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1")
Me.DocumentViewer1.FileLoaded = False
Me.DocumentViewer1.Name = "DocumentViewer1"
'
'BarManager1
@@ -270,7 +270,6 @@ Partial Class frmValidator
Me.BarManager1.DockControls.Add(Me.barDockControlBottom)
Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
Me.BarManager1.DockControls.Add(Me.barDockControlRight)
Me.BarManager1.DockWindowTabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.BarManager1.Form = Me
Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.PdfFileOpenBarItem1, Me.PdfFileSaveAsBarItem1, Me.PdfFilePrintBarItem2, Me.PdfPreviousPageBarItem2, Me.PdfNextPageBarItem2, Me.PdfFindTextBarItem2, Me.PdfZoomOutBarItem2, Me.PdfZoomInBarItem2, Me.PdfExactZoomListBarSubItem2, Me.PdfZoom10CheckItem2, Me.PdfZoom25CheckItem2, Me.PdfZoom50CheckItem2, Me.PdfZoom75CheckItem2, Me.PdfZoom100CheckItem2, Me.PdfZoom125CheckItem2, Me.PdfZoom150CheckItem2, Me.PdfZoom200CheckItem2, Me.PdfZoom400CheckItem2, Me.PdfZoom500CheckItem2, Me.PdfSetActualSizeZoomModeCheckItem2, Me.PdfSetPageLevelZoomModeCheckItem2, Me.PdfSetFitWidthZoomModeCheckItem2, Me.PdfSetFitVisibleZoomModeCheckItem2, Me.BarButtonItem1})
Me.BarManager1.MaxItemId = 24

View File

@@ -477,10 +477,10 @@
<value>Segoe UI, 8.25pt</value>
</data>
<data name="PanelValidatorControl.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 80</value>
<value>6, 58</value>
</data>
<data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
<value>642, 203</value>
<value>642, 225</value>
</data>
<data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -511,7 +511,7 @@
<value>6, 33</value>
</data>
<data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>643, 46</value>
<value>643, 26</value>
</data>
<data name="DESCRIPTIONLabel.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -600,6 +600,9 @@
<data name="&gt;&gt;SplitContainer1.Panel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DocumentViewer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -607,7 +610,7 @@
<value>4, 5, 4, 5</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>1012, 590</value>
<value>519, 341</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1263,6 +1266,39 @@
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="RibbonPageFile.Text" xml:space="preserve">
<value>Datei</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>Daten</value>
</data>
<data name="RbnPgGrpActions.Text" xml:space="preserve">
<value>Aktionen</value>
</data>
<data name="rbnPgGroupHinweise.Text" xml:space="preserve">
<value>Hinweise</value>
</data>
<data name="rbnPgGroupAttmt.Text" xml:space="preserve">
<value>Anhänge</value>
</data>
<data name="RibbonPageGroupCustom.Text" xml:space="preserve">
<value>Anhänge zu Beleg</value>
</data>
<data name="RibbonPageGroup2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAASZJREFUWEfN
l7ERwjAMRZmAinFeT8cMDMAgbENLyRZ0dKxAG+5zhAuKBDYOiOLd5YykPBJbdmZd180yGQ38mscF8I45
sAK2wB44AZc7utaYflOMYm3+EzUCC2ADHICuEMUqR7m2XpXAEtg5NyhFuaph6xYJrIGjU7QW1VCtKgEl
nJ1in6JaTxKvBPTIpvjnFtV8vI5IQJOm5Z2/Q7VvEzMS0My1SVOje7gCWrvFS63PG+SPYgJ0j7knoAZi
g0MaBMTKE1AXs4EhjQJbT0Ct1AaGNArsPQH1cxsY0ihw8gS0qdjAkEaBy18KpL+C9EmYvgyrGlEjbiNK
b8WieDNqEAg3I5G+HYvUA0lP6pFsKDHFk/joUNqTeizvSf0wGfLdT7MsRgO/5go/tJcKezdCSgAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Information</value>
</data>
<data name="RibbonPage1.Text" xml:space="preserve">
<value>Start</value>
</data>
@@ -2158,39 +2194,6 @@
<data name="PdfExactZoomListBarSubItem2.Caption" xml:space="preserve">
<value>Zoom</value>
</data>
<data name="PdfExactZoomListBarSubItem2.SuperTip" type="DevExpress.Utils.SuperToolTip, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu
NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE
ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi
bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s
VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw
BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh
bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz
LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl
bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF
eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA
Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs
dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz
cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN
QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs
b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT
eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp
b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg
Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k
ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E
cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz
LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO
AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL
</value>
</data>
<data name="PdfZoom10CheckItem2.Caption" xml:space="preserve">
<value>10 %</value>
</data>
@@ -2233,6 +2236,39 @@
<data name="PdfSetFitVisibleZoomModeCheckItem2.Caption" xml:space="preserve">
<value>sichtbare einpassen</value>
</data>
<data name="PdfExactZoomListBarSubItem2.SuperTip" type="DevExpress.Utils.SuperToolTip, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu
NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE
ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi
bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s
VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw
BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh
bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz
LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl
bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF
eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA
Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs
dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz
cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z
CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl
c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA
AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN
QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs
b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT
eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp
b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg
Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ
dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k
ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl
c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E
cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz
LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO
AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL
</value>
</data>
<data name="BarButtonItem1.Caption" xml:space="preserve">
<value>BarButtonItem1</value>
</data>
@@ -2251,39 +2287,6 @@
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>232, 128</value>
</metadata>
<data name="RibbonPageFile.Text" xml:space="preserve">
<value>Datei</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
<value>Daten</value>
</data>
<data name="RbnPgGrpActions.Text" xml:space="preserve">
<value>Aktionen</value>
</data>
<data name="rbnPgGroupHinweise.Text" xml:space="preserve">
<value>Hinweise</value>
</data>
<data name="rbnPgGroupAttmt.Text" xml:space="preserve">
<value>Anhänge</value>
</data>
<data name="RibbonPageGroupCustom.Text" xml:space="preserve">
<value>Anhänge zu Beleg</value>
</data>
<data name="RibbonPageGroup2.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAASZJREFUWEfN
l7ERwjAMRZmAinFeT8cMDMAgbENLyRZ0dKxAG+5zhAuKBDYOiOLd5YykPBJbdmZd180yGQ38mscF8I45
sAK2wB44AZc7utaYflOMYm3+EzUCC2ADHICuEMUqR7m2XpXAEtg5NyhFuaph6xYJrIGjU7QW1VCtKgEl
nJ1in6JaTxKvBPTIpvjnFtV8vI5IQJOm5Z2/Q7VvEzMS0My1SVOje7gCWrvFS63PG+SPYgJ0j7knoAZi
g0MaBMTKE1AXs4EhjQJbT0Ct1AaGNArsPQH1cxsY0ihw8gS0qdjAkEaBy18KpL+C9EmYvgyrGlEjbiNK
b8WieDNqEAg3I5G+HYvUA0lP6pFsKDHFk/joUNqTeizvSf0wGfLdT7MsRgO/5go/tJcKezdCSgAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="RibbonPageGroup2.Text" xml:space="preserve">
<value>Information</value>
</data>
<data name="RibbonPage2.Text" xml:space="preserve">
<value>RibbonPage2</value>
</data>

File diff suppressed because it is too large Load Diff

View File

@@ -138,7 +138,7 @@
<value>0, 0</value>
</data>
<data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 559</value>
<value>233, 373</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -187,7 +187,7 @@
<value>0, 0</value>
</data>
<data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>233, 373</value>
</data>
<data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -205,7 +205,7 @@
<value>0</value>
</data>
<data name="XtraTabPageDoc2.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>349, 559</value>
</data>
<data name="XtraTabPageDoc2.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -229,7 +229,7 @@
<value>0, 0</value>
</data>
<data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>233, 373</value>
</data>
<data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -247,7 +247,7 @@
<value>0</value>
</data>
<data name="XtraTabPageDoc3.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>349, 559</value>
</data>
<data name="XtraTabPageDoc3.Text" xml:space="preserve">
<value>XtraTabPage1</value>
@@ -271,7 +271,7 @@
<value>0, 0</value>
</data>
<data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>233, 373</value>
</data>
<data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -289,7 +289,7 @@
<value>0</value>
</data>
<data name="XtraTabPageDoc4.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>349, 559</value>
</data>
<data name="XtraTabPageDoc4.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -313,7 +313,7 @@
<value>0, 0</value>
</data>
<data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>233, 373</value>
</data>
<data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -331,7 +331,7 @@
<value>0</value>
</data>
<data name="XtraTabPageDoc5.Size" type="System.Drawing.Size, System.Drawing">
<value>349, 553</value>
<value>349, 559</value>
</data>
<data name="XtraTabPageDoc5.Text" xml:space="preserve">
<value>XtraTabPage3</value>
@@ -391,7 +391,7 @@
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainerControlDoc.Panel2</value>
@@ -451,7 +451,7 @@
<value>0, 0</value>
</data>
<data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 562</value>
<value>374, 375</value>
</data>
<data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -499,7 +499,7 @@
<value>0, 0</value>
</data>
<data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>374, 375</value>
</data>
<data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -517,7 +517,7 @@
<value>0</value>
</data>
<data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>561, 562</value>
</data>
<data name="XtraTabPageSearch2.Text" xml:space="preserve">
<value>Search2</value>
@@ -541,7 +541,7 @@
<value>0, 0</value>
</data>
<data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>374, 375</value>
</data>
<data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -559,7 +559,7 @@
<value>0</value>
</data>
<data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>561, 562</value>
</data>
<data name="XtraTabPageSearch3.Text" xml:space="preserve">
<value>XtraTabPage1</value>
@@ -583,7 +583,7 @@
<value>0, 0</value>
</data>
<data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>374, 375</value>
</data>
<data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -601,7 +601,7 @@
<value>0</value>
</data>
<data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>561, 562</value>
</data>
<data name="XtraTabPageSearch4.Text" xml:space="preserve">
<value>XtraTabPage2</value>
@@ -625,7 +625,7 @@
<value>0, 0</value>
</data>
<data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>374, 375</value>
</data>
<data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -643,7 +643,7 @@
<value>0</value>
</data>
<data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
<value>561, 556</value>
<value>561, 562</value>
</data>
<data name="XtraTabPageSearch5.Text" xml:space="preserve">
<value>XtraTabPage3</value>
@@ -855,19 +855,18 @@
<data name="EigenschaftenDateiToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsQAAALEAGtI711AAACkUlE
QVRIS8XQXUhTYRwGcAkiqBuDhKAi6ia8kZp3QeS6iGjqnBtT0UqDNAtSJoKNokFuIUpG0kxKCVtWY5lE
IFmBmuG0D20jQ/Nrs0UzV2Yy9/307uSpA/317pwO/HjPeQ7v/33OSQDwX5GhlMhQSmQoJTKUEhmupMNq
XmtraRh71m6aNlaVHHp8xxC53WjALbMBTfV6NBgrYCjPj5lr9Xq1TX6J6abmCJHhajqtrW1L06a209oD
E/h6BryQW4fFDyUYf65BrU6FmpulML42si30HB4ZrsZyw5RaliN3wXcS7ddzucODLh2WJk5hYUgLX78C
oa6daGs9BvYH2BZ6Do8Mhc43T4Fn7RqDzVKP4MwFXKtWI15CuXc3/B9L8dORC9+LNMw+3YO5extRdyUL
8hYZG0HP5ZGhUPxgy0vgyYCHO9zvuojyIgXcb/QoKczmSmTtk2PqkQz2pm3oa0jC5eOboCpOw/7GZDaC
nssjQ6F4gc7BH9zhHqeJO7zm6l22HsZkTxHyMnKA4e1I3ZWE9esSkbJjDU5olcivyoOsbjMbQc/lkaFQ
j/0dWwCv143qyqPwfJrint8O9nIlRu6nYEviBhQWHIG52RJ/xe1LLt56lvnzvBIyFOILIBr+bfmKxGKw
PeiArkAO5+gMZnzAwUxN/BU5ZyVkKNTd/2+BKDs8EI5hwR/Fl/kIZ9wrUoHeASdbgNaHfZyY4F5oxCNS
gR67gy3sWv4DEdYgEIri+2IYn7+FMekNweEOYNgtcgH+S4Osh/DLea8mo+IUsA+NsoVdy3/Az255c0HA
NQ+8nwUcjCgFKirPQaHIRIZS85dKi/QsNRTKbKQz8VWRqRKngNjIUEpkKCUylBIZSokMpYOEXxgRTAe1
DBDPAAAAAElFTkSuQmCC
JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
OSXfP44vp5Eg4tFg9r0KY88KUKeRovZGOfSv9OB+z4UQyTBfN2RVFFJuBE+g/VoROzzs1mBu/CRmBuUI
9tGIdO2AxXQUMiu18oBzLRNI0NY1Cqu5AWHveVytkWEhQrxnF0IfyvHDUYTg82wEnuzG1N2NqL8sAdUq
Wp0A8wvgcb+PHR5yX4BaQcPzWgtVWT4bIdlLYeKhCPbmrehtTMOlY5sgVWZjX1PG6gR0Dnxnh/ucBnZ4
7ZU7UCsOwWVToDi3EBjahqydaVi/LhWZ29fguFyMkupiiOo3rzzAZn+7cAj8fg9qqo7A93GCfX8z0MNG
DN/LxJbUDSgrPQxji3lxYIYy/UyGMn31AhCP/uL3FWMYWO93QFNKwTnihTcIHMgrSDqQCyG4dPeRAXGG
wXyUwUwojs/TMZYxP08BPf1OdqjpQS8Ls+R5KcM+ngJsdseyDcQYYD4Sx7fZKD59jcLlj8DhmceQh+eA
xJ+Go3/fwEtXnJ8A++DIsg2EgEWmwoB7GngXABwBnjZQWXUWNJ2HXHHBH6Ry5EhkoMX5yBHns3c6T8pP
AN8QQmgIITSEEBpCCA0hhOYnGBFMByIajowAAAAASUVORK5CYII=
</value>
</data>
<data name="EigenschaftenDateiToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@@ -923,14 +922,14 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAAZRJREFUOE+VkO0vQmEY
xvsn/Cn8Az4x1gd8s7GxUeYbG4sNy5BqpZeZkkoyNQ2NNpppGH0wNrJ5X1MtpSWV3rs8p5a0jtNc2/Xc
57l337+d52IBoPW03NA4KTViZE6HGYUJPKF2jG6uqlFy95ACbRxRJ/U9OKqpmyKwYf5KR9eQnLTKcxVL
TObyFlvbB0RgcyTkWu4XDqVhD3RWrO7CYHXOUzNtXDHY/VK09MnIlQZApwXtDhqae38gdC4cfwHEagv2
T29KECFp/Q8gWNwoLJdMRA+Q662kVCuXz2N58wRq8zEzQKLZIqVSZBeJVAahyBcsR3eob+qh2vQA4ZKZ
lEol01mEowl4Ap8w213MgFnFOillpTNZRGIp+N6juH8NwWi7ZAbwpXpSisrkcojGU/CHYnj0hHH18Abd
9jkzYEKkIYWElssjnkgjEI7jxfeB66cgzm68UJkczIBxgYqElkciWQzN7Y/g9jkIp8uLwws3lGv22gAq
NCptKjDqzVry2yqzA0rjAWR6W+0nUAO1/HuxaLC+AebHD8Ec7JqWAAAAAElFTkSuQmCC
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
wJhpMSvnEMv5gMGxKnazhxcEzCwdwMLuywcmrctiF4IAcKkMwtFPuHcvUVrR9HdAO82KfSTTX4jEODwG
P8Bun8sHRuiFX3I684VoPIXntxiuHsJgNk7kAxrKkZczPI9YIoWXcBw3jxGcXr/C7vHKB/p11qzM8wIS
XBrBSAL3z+84uw3hyP8Es2tPPtA3ZoYgCOCSP0sLvERxcReC7/wJO8cBGOe3iwfI0si2ycLIn20eL8zs
HozMFvSODfkA+QIZKIZYJnwD5scPwUx8BNwAAAAASUVORK5CYII=
</value>
</data>
<data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

View File

@@ -77,14 +77,15 @@ Public Class frmValidatorSearch
Return oOperationMode
End Function
Public Sub TabPreload(Panel1Collapsed As Boolean, Panel2Collapsed As Boolean, TabCountSQL As Integer, TabCountDoc As Integer, DTSQL As DataTable, DTDOC As DataTable)
Public Sub TabPreload(TabCountSQL As Integer, TabCountDoc As Integer, DTSQL As DataTable, DTDOC As DataTable)
Try
SplitContainerSearches.Panel1Collapsed = IIf(DTSQL.Rows.Count > 0, False, True)
SplitContainerSearches.Panel2Collapsed = IIf(DTDOC.Rows.Count > 0, False, True)
If Me.InvokeRequired() Then
Me.Invoke(Sub() TabPreload(Panel1Collapsed, Panel2Collapsed, TabCountSQL, TabCountDoc, DTSQL, DTDOC))
Me.Invoke(Sub() TabPreload(TabCountSQL, TabCountDoc, DTSQL, DTDOC))
Else
'#### SQL Tabs Design Laden
SplitContainerSearches.Panel1Collapsed = Panel1Collapsed
SplitContainerSearches.Panel2Collapsed = Panel2Collapsed
If DTSQL.Rows.Count > 0 Then
For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
@@ -686,6 +687,7 @@ Public Class frmValidatorSearch
End Sub
Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click
If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
LOGGER.Debug($"There are [{BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count}] SQLSearches configured!")
_DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
@@ -694,6 +696,7 @@ Public Class frmValidatorSearch
Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
End If
If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count}] DocSearches configured!")
_DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC
Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")