22 Commits

Author SHA1 Message Date
OlgunR
544f710083 Profile_group_color wird aktualisiert - frmMain 2025-09-04 14:37:51 +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
Developer01
c4f77ed2e8 Merge mit Branch 2.5.4.0 2025-08-15 08:29:46 +02:00
OlgunR
aca8634e26 Nuget packages wiederhergestellt 2025-06-06 10:36:08 +02:00
Developer01
ae389d4f3c SupportLink Anpassung aus Master übernommen 2025-06-06 08:43:59 +02:00
Developer01
5431b60f9a Final Indexing überarbeitet 2025-06-03 14:14:44 +02:00
Developer01
f8c822a868 Parameters Refresh 2025-05-08 15:49:54 +02:00
Developer01
21777d216b LookUpControl Width wider 2025-05-02 08:32:19 +02:00
Developer01
e8877ffc99 MS Administration 2025-04-10 15:39:42 +02:00
Developer01
32fce5f142 MS V 2.4.2.1 2025-04-08 14:49:24 +02:00
Developer01
f9ae01b631 V 2.4.0.1 FormDesigner Verbesserungen, Monitoring Bug Objektverweis bei 4. Grid 2025-04-01 08:19:42 +02:00
Developer01
a16308c1cd MS GDPictureUpdate, Bugfix: WindreamPlaceholder nach SQL Editor 2025-03-28 15:26:24 +01:00
Developer01
85bc215cd0 MS SQL ConnectionID raus aus Commands 2025-03-18 08:12:27 +01:00
63 changed files with 1738 additions and 1197 deletions

View File

@@ -0,0 +1 @@
Aber El Raho ist cooler!

View File

@@ -1,5 +1,5 @@
<?define ProgramName="TaskFlow"?>
<?define ProductName="TaskFlow"?>
<?define ProgramName="taskFLOW"?>
<?define ProductName="taskFLOW"?>
<?define Manufacturer="Digital Data"?>
<?define Description="Beschreibung des Programms"?>
<?define Comments="Kommentar wie Copyright-Hinweis"?>
@@ -42,7 +42,7 @@
</Upgrade>
<!-- Legt das Icon fest -->
<Icon Id="AppIcon.exe" SourceFile="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe" />
<Icon Id="AppIcon.exe" SourceFile="..\taskFLOW\bin\$(var.Configuration)\$(var.ProgramName).exe" />
<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
<Property Id="ARPPRODUCTICON" Value="AppIcon.exe" />
@@ -85,8 +85,8 @@
<DirectoryRef Id="INSTALLDIR">
<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
<File Id="MainApplicationExe" Source="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
<File Id="MainApplicationExeConfig" Source="..\TaskFlow\bin\$(var.Configuration)\$(var.ProgramName).exe.config" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes" />
<File Id="MainApplicationExe" Source="..\taskFLOW\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
<File Id="MainApplicationExeConfig" Source="..\taskFLOW\bin\$(var.Configuration)\$(var.ProgramName).exe.config" Name="$(var.ProgramName).exe.config" KeyPath="no" Checksum="yes" />
<!--
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
@@ -154,10 +154,24 @@
<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" />
<File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
<File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
<File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
<File Id="GdPicture.NET.14.RTF" Name="GdPicture.NET.14.RTF.dll" />
<File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" />
<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

@@ -13,12 +13,12 @@
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
<LinkerAdditionalOptions>-b "$(SolutionDir)TaskFlow\bin\$(Configuration)"</LinkerAdditionalOptions>
<LinkerAdditionalOptions>-b "$(SolutionDir)taskFLOW\bin\$(Configuration)"</LinkerAdditionalOptions>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<LinkerAdditionalOptions>-b "$(SolutionDir)TaskFlow\bin\$(Configuration)"</LinkerAdditionalOptions>
<LinkerAdditionalOptions>-b "$(SolutionDir)taskFLOW\bin\$(Configuration)"</LinkerAdditionalOptions>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />
@@ -43,7 +43,7 @@
</Target>
<Target Name="BeforeBuild">
<!-- Get the programs assembly version from the .exe file -->
<GetAssemblyIdentity AssemblyFiles="..\TaskFlow\bin\$(Configuration)\TaskFlow.exe">
<GetAssemblyIdentity AssemblyFiles="..\taskFLOW\bin\$(Configuration)\TaskFlow.exe">
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
</GetAssemblyIdentity>
<!-- Store the assembly version number in ProductVersion preprocessor variable -->

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
@@ -512,7 +514,7 @@ Public Class ClassControlCreator
oView.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CellSelect
oView.OptionsSelection.MultiSelect = True
oView.OptionsClipboard.CopyColumnHeaders = DefaultBoolean.False
'oView.OptionsView.ColumnAutoWidth = True
If oView.OptionsBehavior.ReadOnly = False Then
If row.Item("VKT_ADD_ITEM") = True Then
oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True

View File

@@ -1,4 +1,5 @@
Imports DigitalData.Modules.EDMI.API.Constants
Imports DevExpress.DataAccess.Native.Json
Imports DigitalData.Modules.EDMI.API.Constants
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Public Class ClassFinalizeDoc
@@ -18,10 +19,11 @@ Public Class ClassFinalizeDoc
'Jetzt finale Indexe setzen
LOGGER.Debug("working final indices for doc: " & WMObject.aName)
For Each dr As DataRow In CURRENT_DT_FINAL_INDEXING.Rows
Dim value As String = dr.Item("VALUE").ToString
Dim ovalueString As String = dr.Item("VALUE").ToString
Dim INDEXNAME = dr.Item("INDEXNAME").ToString
Dim oContinueOnIndifferentState As Boolean = CBool(dr.Item("CONTINUE_INDETERMINED"))
If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
Dim VektorBeahaviour = dr.Item("IF_VEKTOR_BEHAVIOUR").ToString
If ovalueString.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
LOGGER.Debug("indexing with dynamic sql...")
'Dim SQL_COMMAND = dr.Item("SQL_COMMAND")
'' Regulären Ausdruck zum Auslesen der Indexe definieren
@@ -52,32 +54,32 @@ Public Class ClassFinalizeDoc
LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement)
Dim oDynamic_value = DatabaseFallback.GetScalarValueECM(sql_Statement) ', CONNECTION_STRING_ECM, "Write_Final_Metadata/dynamic_value")
If Not IsNothing(oDynamic_value) Then
value = oDynamic_value
ovalueString = oDynamic_value
Else
Continue For
End If
Else
If value.StartsWith("v") Then
If ovalueString.StartsWith("v") Then
Select Case dr.Item("VALUE").ToString
Case "vDate"
value = Now.ToShortDateString
ovalueString = Now.ToShortDateString
Case "vUserName"
value = USER_USERNAME
ovalueString = USER_USERNAME
Case Else
value = dr.Item("VALUE")
ovalueString = dr.Item("VALUE")
End Select
End If
End If
Dim result() As String
ReDim Preserve result(0)
result(0) = value
result(0) = ovalueString
Dim oIndexType = WINDREAM.GetTypeOfIndex(INDEXNAME)
LOGGER.Debug($"oIndexType {oIndexType.ToString}")
If oIndexType > 4000 And oIndexType < 5000 Then
'Hier muss nun separat als Vektorfeld indexiert werden
If Indexiere_VektorfeldPM(value, INDEXNAME, WMObject) = True Then
If Indexiere_VektorfeldPM(ovalueString, INDEXNAME, WMObject) = True Then
LOGGER.Debug("FINALER INDEX '" & INDEXNAME.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT")
Else
@@ -87,12 +89,13 @@ Public Class ClassFinalizeDoc
End If
Else
LOGGER.Debug("now indexing..")
If Indexiere_File(INDEXNAME, result, WMObject) = True Then
If WINDREAM_MOD.SetFileIndex(CURRENT_DOC_PATH, INDEXNAME, ovalueString, CURRENT_WMObjecttype) = True Then 'Indexiere_File(INDEXNAME, result, WMObject) = True Then
LOGGER.Debug("FINALER INDEX '" & INDEXNAME & "' WURDE ERFOLGREICH GESETZT")
LOGGER.Debug("")
'Nun das Logging
If CURRENT_PROFILE_LOG_INDEX <> "" Then
Dim logstr = Return_LOGString(value, "DDFINALINDEX", INDEXNAME)
Dim logstr = Return_LOGString(ovalueString, "DDFINALINDEX", INDEXNAME)
Indexiere_VektorfeldPM(logstr, CURRENT_PROFILE_LOG_INDEX, WMObject)
End If
@@ -120,39 +123,73 @@ Public Class ClassFinalizeDoc
End Try
End Function
Private Shared Function Indexiere_File(idxxname As String, idxvalue As Object, WMObject As WINDREAMLib.WMObject)
Dim File_indexiert As Boolean = False
Private Shared Function Indexiere_File(pIndexName As String, pIndexValues As Object, WMObject As WINDREAMLib.WMObject) As Boolean
LOGGER.Debug("### Indexiere_File Begin ###")
Dim indexierung_erfolgreich As Boolean = False
Try
Dim oIndexType As Integer = WINDREAM_MOD.GetIndexType(pIndexName)
If oIndexType > 4095 Then
LOGGER.Debug("Es Handelt sich um einen VektorIndex...")
Dim oExistingItems = WINDREAM_MOD.GetIndexValue(CURRENT_DOC_PATH, pIndexName)
Dim oListofString As New List(Of String)
If pIndexValues.Length = 0 Then
LOGGER.Debug("oSplitArray.Length = 0")
oListofString.Add(pIndexValues(0))
Else
LOGGER.Debug($"pIndexValues.Length is > 0 [{pIndexValues.length}] ...")
For Each oStr In pIndexValues
LOGGER.Debug("pIndexValues - oString : {0}", oStr)
oListofString.Add(oStr)
Next
End If
If oExistingItems.Count > 0 Then
LOGGER.Debug("oOverwrite = False and WMObject already contains [{0}] values in attribute,Values will be concatted", oExistingItems.Count)
oListofString = oExistingItems.Concat(oListofString).ToList()
End If
oListofString = oListofString.Distinct().ToList()
indexierung_erfolgreich = WINDREAM_MOD.SetFileIndexLoS(CURRENT_DOC_PATH, pIndexName, oListofString, CURRENT_WMObjecttype)
Else
Dim oStringValue As String = pIndexValues(0).ToString
indexierung_erfolgreich = WINDREAM_MOD.SetFileIndex(CURRENT_DOC_PATH, pIndexName, oStringValue, CURRENT_WMObjecttype)
End If
Return indexierung_erfolgreich
Catch ex As Exception
LOGGER.Warn("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString)
Return False
End Try
' Try
'Die Arrays vorbereiten
Dim arrIndex() As String = Nothing
Dim arrValue() As String = Nothing
arrIndex = Nothing
arrValue = Nothing
'Den Indexnamen übergeben
ReDim Preserve arrIndex(0)
arrIndex(0) = idxxname
'Das Array der Idnexwerte überprüfen
If idxvalue Is Nothing = False Then
If idxvalue.Length() > 1 Then
LOGGER.Debug("Indexing Index '" & idxxname & "' with Arrayvalue")
Dim anzahl As Integer = 0
For Each indexvalue As String In idxvalue
ReDim Preserve arrValue(anzahl)
arrValue(anzahl) = indexvalue
anzahl += 1
Next
Else
LOGGER.Debug("Indexing Index '" & idxxname & "' with value '" & idxvalue(0) & "'")
ReDim Preserve arrValue(0)
arrValue(0) = idxvalue(0).ToString
End If
'Dim _windreamPM As New ClassPMWindream
'Jetzt das eigentliche Indexieren der Datei
File_indexiert = WINDREAM.RunIndexing(WMObject, arrIndex, arrValue)
''Die Arrays vorbereiten
'Dim arrIndex() As String = Nothing
'Dim arrValue() As String = Nothing
'arrIndex = Nothing
'arrValue = Nothing
''Den Indexnamen übergeben
'ReDim Preserve arrIndex(0)
'arrIndex(0) = idxxname
''Das Array der Idnexwerte überprüfen
'If idxvalue Is Nothing = False Then
' If idxvalue.Length() > 1 Then
' LOGGER.Debug("Indexing Index '" & idxxname & "' with Arrayvalue")
' Dim anzahl As Integer = 0
' For Each indexvalue As String In idxvalue
' ReDim Preserve arrValue(anzahl)
' arrValue(anzahl) = indexvalue
' anzahl += 1
' Next
' Else
' LOGGER.Debug("Indexing Index '" & idxxname & "' with value '" & idxvalue(0) & "'")
' ReDim Preserve arrValue(0)
' arrValue(0) = idxvalue(0).ToString
' End If
' 'Dim _windreamPM As New ClassPMWindream
' 'Jetzt das eigentliche Indexieren der Datei
'File_indexiert = WINDREAM.RunIndexing(WMObject, arrIndex, arrValue)
Return File_indexiert
End If
'Return File_indexiert
' End If
'Catch ex As Exception
' LOGGER.Info("Unvorhergesehener Fehler bei Indexiere_File: " & ex.Message.ToString, True)

View File

@@ -208,6 +208,7 @@ Public Class ClassInit
' We initialize the Class in anycase.
' If there is no client, it will fall back to the db by itself
DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB)
If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then
Return True
ElseIf dbECMInitialized = True And CONNECTION_STRING_IDB <> String.Empty Then
@@ -501,7 +502,6 @@ Public Class ClassInit
BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM))
oStep = "TBPM_PROFILE_SEARCH"
oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With {
.SortByColumn = "PROFILE_ID,TAB_INDEX"
})

View File

@@ -152,20 +152,32 @@ 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
frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value
LOGGER.Debug("Achtung: Value " & value & " kann nicht in Zahl konvertiert werden!")
oDocument.Save()
oDocument.unlock()
Return False
If value = String.Empty Then
LOGGER.Debug("Indexing WMObjectVariableValueTypeInteger with vbEmpty")
convertValue = vbEmpty
Else
frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value
LOGGER.Debug("Achtung: Value " & value & " kann nicht in Zahl konvertiert werden!")
oDocument.Save()
oDocument.unlock()
Return False
End If
Else
convertValue = CInt(value)
End If
convertValue = CInt(value)
_int = True
Case WMObjectVariableValueTypeInteger64bit
LOGGER.Debug("Typ des windream-Indexes: Integer64bit")
@@ -181,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!"
@@ -282,13 +295,8 @@ 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 _int = True Then
oDocument.SetVariableValue(aName, CInt(convertValue))
ElseIf _date = True Then
@@ -307,114 +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
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 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
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("Wert für Index vor Indexierung: [{0}]", myArray)
'Jetzt die Nachindexierung für Vektor-Felder
oDocument.SetVariableValue(aName, myArray)
LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False)
End If
End If

View File

@@ -62,7 +62,7 @@ Public Class ClassParamRefresh
LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]")
ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then
SHOW_MASS_VALIDATOR = False
LOGGER.Debug($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
ElseIf oMode = "PM.NO_CHARTS" Then
SHOW_CHARTS = False
LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]")
@@ -79,7 +79,7 @@ Public Class ClassParamRefresh
IDB_USES_WMFILESTORE = True
ElseIf oMode = "PM.NO_BASICCONF" Then
BASIC_CONF_VISIBLE = False
LOGGER.Debug($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then
SYS_LOCKED_MAINTENANCE = True
ElseIf oMode.StartsWith("PM.IDB_CONID!") Then
@@ -104,13 +104,13 @@ Public Class ClassParamRefresh
End If
ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
EXCEL_OVERVIEW = True
LOGGER.Debug($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
ElseIf oMode = "PM.MONITORING" Then
MONITORING_ACTIVE = True
LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
ElseIf oMode = "PM.GHOSTMODE" Then
GHOSTMODE_ACTIVE = True
LOGGER.Debug($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
@@ -158,6 +158,24 @@ Public Class ClassParamRefresh
Catch ex As Exception
LAST_ADDED_COLUMN = ""
End Try
ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
Try
MON_EDITED_COLUMN = oLEDITEDCOL
LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
End Try
ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
Try
MON_ADDED_COLUMN = oLEDITEDCOL
LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
Catch ex As Exception
End Try
ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")

View File

@@ -16,26 +16,34 @@ Public Class ClassSQLEditor
Dim oValueObject = DirectCast(value, SQLValue)
Dim oSQLString As String = oValueObject.Value
Dim oSQLConnection As Integer = oValueObject.ConnectionId
'Dim oSQLConnection As Integer = oValueObject.ConnectionId
If oService IsNot Nothing AndAlso oSQLString IsNot Nothing Then
'CURRENT_DESIGN_TYPE = "INPUT_INDEX"
Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
oForm.SQLCommand = oSQLString
oForm.SQLConnection = oSQLConnection
oForm.SQLConnection = 0 'oSQLConnection
oForm.PlaceholdersManualPrefix = "CTRL"
oForm.PlaceholdersManualTitle = "Controls"
oForm.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
If oService.ShowDialog(oForm) = DialogResult.OK Then
Dim sql As New SQLValue(oForm.SQLCommand, oForm.SQLConnection)
Dim sql As New SQLValue(oForm.SQLCommand) ', oForm.SQLConnection
' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection
' CURRENT_CONN_ID = oForm.SQLConnection
value = sql
End If
End Using
End If
Return value

View File

@@ -7,18 +7,18 @@ Imports System.Drawing.Design
<TypeConverter(GetType(SQLTypeConverter))>
Public Class SQLValue
Public Property Value As String
Public Property ConnectionId As Integer
'Public Property ConnectionId As Integer
Public Sub New()
Value = ""
End Sub
Public Sub New(value As String)
Me.Value = value
End Sub
'Public Sub New(value As String)
' Me.Value = value
'End Sub
Public Sub New(pValue As String, pConnectionId As Integer)
Public Sub New(pValue As String) ', pConnectionId As Integer)
Value = pValue
ConnectionId = pConnectionId
' ConnectionId = pConnectionId
End Sub
End Class

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

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="1" X="93" Y="35" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
</Shapes>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -84,7 +84,7 @@ Public Module ModuleControlProperties
Private _index_type As String
Private _sql_command As String
Friend _sql_connection As Integer = 0
'Friend _sql_connection As Integer = 0
Private _Enable_SQL As String
Private _Enable_SQL_ONLOAD As String
Private _default_value
@@ -124,36 +124,37 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_DATA)>
Public Property SQLCommand() As SQLValue
Get
Return New SQLValue(NotNull(_sql_command, ""), _sql_connection)
Return New SQLValue(NotNull(_sql_command, "")) ', _sql_connection
End Get
Set(ByVal value As SQLValue)
_sql_command = value.Value
SQLConnection = value.ConnectionId
'SQLConnection = value.ConnectionId
End Set
End Property
<DisplayName("SQL Connection")>
<Category(ClassConstants.CAT_INFORMATION)>
<[ReadOnly](True)>
Public Property SQLConnection() As Integer
Get
Return _sql_connection
End Get
Set(value As Integer)
_sql_connection = value
End Set
End Property
'<DisplayName("SQL Connection")>
'<Category(ClassConstants.CAT_INFORMATION)>
'<[ReadOnly](True)>
'Public Property SQLConnection() As Integer
' Get
' Return _sql_connection
' End Get
' Set(value As Integer)
' _sql_connection = value
' End Set
'End Property
<DisplayName("Enable On Change SQL")>
<Description("SQL Command that determines if a control should be enabled/disabled when another, referenced control changes. Should return 0 or 1. Can include a Control-Placeholder.")>
<Category(ClassConstants.CAT_BEHAVIOUR)>
Public Property Enable_SQL() As SQLValue
Get
Return New SQLValue(NotNull(_Enable_SQL, ""), _sql_connection)
Return New SQLValue(NotNull(_Enable_SQL, "")) ', _sql_connection
End Get
Set(ByVal value As SQLValue)
_Enable_SQL = value.Value
SQLConnection = value.ConnectionId
'SQLConnection = value.ConnectionId
End Set
End Property
@@ -162,11 +163,11 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_BEHAVIOUR)>
Public Property Enable_SQL_OnLoad() As SQLValue
Get
Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, ""), _sql_connection)
Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, "")) ', _sql_connection
End Get
Set(ByVal value As SQLValue)
_Enable_SQL_ONLOAD = value.Value
SQLConnection = value.ConnectionId
'SQLConnection = value.ConnectionId
End Set
End Property
@@ -189,11 +190,11 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_BEHAVIOUR)>
Public Property SetControlData As SQLValue
Get
Return New SQLValue(_set_control_data, _sql_connection)
Return New SQLValue(_set_control_data) ', _sql_connection
End Get
Set(value As SQLValue)
_set_control_data = value.Value
SQLConnection = value.ConnectionId
'SQLConnection = value.ConnectionId
End Set
End Property
End Class
@@ -345,11 +346,11 @@ Public Module ModuleControlProperties
<Category(ClassConstants.CAT_VALIDATION)>
Public Property Override_SQL() As SQLValue
Get
Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection)
Return New SQLValue(NotNull(_Override_SQL, "")) ', _sql_connection
End Get
Set(ByVal value As SQLValue)
_Override_SQL = value.Value
SQLConnection = value.ConnectionId
'SQLConnection = value.ConnectionId
End Set
End Property
End Class

View File

@@ -11,10 +11,10 @@ Module ModuleFinalIndexProperties
<[ReadOnly](True)>
Public Property GUID As Integer
<DisplayName("Connection ID")>
<Category(ClassConstants.CAT_INFORMATION)>
<[ReadOnly](True)>
Public Property ConnectionId As Integer
'<DisplayName("Connection ID")>
'<Category(ClassConstants.CAT_INFORMATION)>
'<[ReadOnly](True)>
'Public Property ConnectionId As Integer
<Category(ClassConstants.CAT_GENERAL)>
Public Property Description As String
@@ -97,6 +97,7 @@ Module ModuleFinalIndexProperties
Public Property VectorBehaviourType As List(Of String)
Public Sub VectorIndexBooleanProvider(attrs As PropertyAttributes)
'Sd
MaybeSetReadOnlyIfNotVectorIndex(attrs)
End Sub
@@ -182,7 +183,12 @@ Module ModuleFinalIndexProperties
If indexType.Contains(type) Then
attrs.IsBrowsable = True
Else
attrs.IsBrowsable = False
If attrs.DisplayName = "Index Behaviour" Then
attrs.IsBrowsable = True
Else
attrs.IsBrowsable = False
End If
End If
End Sub

View File

@@ -91,6 +91,8 @@ Module ModuleRuntimeVariables
Public Property INACTIVITYRecognized As Boolean = False
Public Property LAST_EDITED_COLUMN As String = "NONE"
Public Property LAST_ADDED_COLUMN As String = "NONE"
Public Property MON_EDITED_COLUMN As String = "NONE"
Public Property MON_ADDED_COLUMN As String = "NONE"
Public Property USE_APPSERVER As Boolean = False
Public Property SEARCH1 As String = ""
Public Property SEARCH2 As String = ""
@@ -181,4 +183,6 @@ Module ModuleRuntimeVariables
Public LIC_MODULES As String = "NONE"
Public oSQLLoginAttempt As String
Public MVSource_AllIndicies As List(Of String)
End Module

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("")>

5
app/TaskFlow/README.txt Normal file
View File

@@ -0,0 +1,5 @@
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

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -155,29 +156,28 @@
<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>
<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\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
<Reference Include="DigitalData.GUIs.Common, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Base">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
<Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
<Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Database, Version=2.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
<Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.EDMI.API">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Encryption, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
<Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Filesystem, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Interfaces">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
@@ -188,14 +188,21 @@
<Reference Include="DigitalData.Modules.License">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Patterns">
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
<Reference Include="DigitalData.Modules.Patterns, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Windream">
<Reference Include="DigitalData.Modules.Windows, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Windream, Version=1.9.6.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.ZooFlow">
@@ -210,9 +217,85 @@
<Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
<HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
</Reference>
<Reference Include="FormsUtils">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
</Reference>
<Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Interop.WINDREAMLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
@@ -229,6 +312,9 @@
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Mail">
<HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
@@ -236,6 +322,12 @@
<HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -263,6 +355,9 @@
<Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
<HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
</Reference>
<Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
@@ -277,6 +372,9 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
</Reference>
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Deployment" />
<Reference Include="System.Design" />
@@ -286,6 +384,7 @@
<Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
<Reference Include="System.IdentityModel" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
@@ -1145,6 +1244,22 @@
<None Include="Changelog.md" />
<Content Include="DD_Icons_ICO_PMANAGER_48px.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">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -1172,6 +1287,7 @@
<None Include="Resources\DD_taskFLOW_BOOT.png" />
<None Include="Resources\DD_taskFLOW_ICON.png" />
<None Include="Resources\AttachFileHS.png" />
<Content Include="README.txt" />
<Content Include="task.ico" />
<None Include="Resources\searchFlow_icon.png" />
<None Include="Resources\taskFlow_icon.png" />
@@ -1250,7 +1366,10 @@
<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>
<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.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

View File

@@ -48,6 +48,8 @@ Public Class clsPatterns
Public Const INT_VALUE_MACHINE = "MACHINE"
Public Const INT_VALUE_DOMAIN = "DOMAIN"
Public Const INT_VALUE_DATE = "DATE"
Public Const INT_VALUE_WMDocID = "WMDocID"
Public Const INT_VALUE_IDBID = "IDBObjID"
Public Const MAX_TRY_COUNT = 20
@@ -125,6 +127,12 @@ Public Class clsPatterns
While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_DATE)
oResult = ReplacePattern(oResult, PATTERN_INT, Now.ToShortDateString)
End While
While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_WMDocID)
oResult = ReplacePattern(oResult, PATTERN_INT, CURRENT_DOC_ID)
End While
While ContainsPatternAndValue(oResult, PATTERN_INT, INT_VALUE_IDBID)
oResult = ReplacePattern(oResult, PATTERN_INT, CURRENT_DOC_ID)
End While
Return oResult
Catch ex As Exception
@@ -230,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

@@ -109,7 +109,7 @@ Public Class frmAdmin_notResponsibleConfig
Dim oldSQL = oNotResponsible_SQL
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = oNotResponsible_SQL,
.SQLConnection = 1,
.SQLConnection = 0,
.PlaceholdersManualPrefix = "CTRL",
.PlaceholdersManualTitle = "Controls",
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)

View File

@@ -38,7 +38,7 @@ Public Class frmAdmin_rejectionConfig
Dim oldSQL = oRej_SQL
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = oldSQL,
.SQLConnection = 1,
.SQLConnection = 0,
.PlaceholdersManualPrefix = "CTRL",
.PlaceholdersManualTitle = "Controls",
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
@@ -71,7 +71,7 @@ Public Class frmAdmin_rejectionConfig
Dim oldSQL = oRej_SQL_Reasons
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = oRej_SQL_Reasons,
.SQLConnection = 1,
.SQLConnection = 0,
.PlaceholdersManualPrefix = "CTRL",
.PlaceholdersManualTitle = "Controls",
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)

View File

@@ -685,6 +685,7 @@ Partial Class frmAdministration
Me.viewFinalIndex.Name = "viewFinalIndex"
Me.viewFinalIndex.OptionsBehavior.Editable = False
Me.viewFinalIndex.OptionsBehavior.ReadOnly = True
Me.viewFinalIndex.OptionsSelection.EnableAppearanceFocusedRow = False
Me.viewFinalIndex.OptionsView.EnableAppearanceEvenRow = True
Me.viewFinalIndex.OptionsView.ShowGroupPanel = False
'
@@ -757,7 +758,7 @@ Partial Class frmAdministration
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 32
Me.RibbonControl1.MaxItemId = 33
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]

View File

@@ -565,7 +565,7 @@
<value>58</value>
</data>
<data name="gridAssignedGroups.Size" type="System.Drawing.Size, System.Drawing">
<value>1002, 202</value>
<value>1002, 203</value>
</data>
<data name="gridAssignedGroups.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -688,7 +688,7 @@
<value>58</value>
</data>
<data name="gridAvailableGroups.Size" type="System.Drawing.Size, System.Drawing">
<value>1002, 237</value>
<value>1002, 236</value>
</data>
<data name="gridAvailableGroups.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -778,7 +778,7 @@
<value>1002, 493</value>
</data>
<data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
<value>227</value>
<value>228</value>
</data>
<data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -4630,7 +4630,7 @@
<value>6, 89</value>
</data>
<data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>1, 0</value>
<value>0, 0</value>
</data>
<data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -4938,7 +4938,7 @@ Top Kreditoren: </value>
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>180</value>
<value>91</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 16</value>

View File

@@ -25,6 +25,7 @@ Public Class frmAdministration
Private Property profile_guid As Integer = 0
Private Property DT_CHART_CONFIG As DataTable
Private Property PROF_ORIGIN As DataTable
Private focusedRowHandle As Integer = 199
Private Sub frmAdministration_Load(sender As Object, e As System.EventArgs) Handles Me.Load
_Logger.Debug("Loading Administration")
@@ -112,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
@@ -429,6 +430,7 @@ Public Class frmAdministration
pgFinalIndexes.SelectedObject = Nothing
End If
tsbStaticInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Refresh_Final_indexe:")
Finally
@@ -658,21 +660,23 @@ Public Class frmAdministration
Dim view As GridView = sender
Dim focusedRow As DataRow = view.GetFocusedDataRow()
If IsNothing(focusedRow) Then
Exit Sub
ElseIf INSERT_ACTIVE = True Then
'Exit Sub
End If
Dim oShouldRefreshGrid = False
If UNSAVED_CHANGES_FI = True Then
oShouldRefreshGrid = CHECK_QUESTION_CHANGES()
End If
pgFinalIndexes.SelectedObject = Nothing
Dim guid As Integer = focusedRow.Item("GUID")
Dim index As String = NotNull(focusedRow.Item("INDEXNAME"), Nothing)
Dim sqlCommand As String = NotNull(focusedRow.Item("SQL_COMMAND"), "")
Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
' Dim connectionId As Integer = NotNull(focusedRow.Item("CONNECTION_ID"), 0)
Dim value As String = NotNull(focusedRow.Item("VALUE"), "")
Dim active As Boolean = NotNull(focusedRow.Item("ACTIVE"), True)
Dim description As String = NotNull(focusedRow.Item("DESCRIPTION"), "")
@@ -686,8 +690,7 @@ Public Class frmAdministration
Dim obj As New FinalIndexProperties With {
.GUID = guid,
.IndexName = index,
.SQLCommand = New SQLValue(sqlCommand, connectionId),
.ConnectionId = connectionId,
.SQLCommand = New SQLValue(sqlCommand),
.Description = description,
.Active = active,
.AllowAddNewValues = allowNewValues,
@@ -711,7 +714,8 @@ Public Class frmAdministration
obj.IndexName = index
obj.VectorBehaviourType = New List(Of String) From {
"Add",
"Overwrite"
"Overwrite",
"Delete"
}
If index IsNot Nothing Then
@@ -725,9 +729,9 @@ Public Class frmAdministration
pgFinalIndexes.SelectedObject = obj
pgFinalIndexes.Refresh()
If oShouldRefreshGrid Then
Refresh_Final_Indexes()
End If
'If oShouldRefreshGrid Then
' Refresh_Final_Indexes()
'End If
Catch ex As Exception
_Logger.Error(ex)
MsgBox($"Error while loading Final Index properties: {ex.Message}", MsgBoxStyle.Critical)
@@ -755,12 +759,8 @@ Public Class frmAdministration
Dim value As SQLValue = oValue
If value.Value <> String.Empty Then
'obj.ConnectionId = CURRENT_CONN_ID_FINAL_INDEX
obj.StringValue = "SQL-Command"
obj.ConnectionId = value.ConnectionId
'obj.FloatValue = 0
' obj.IntegerValue = 0
'obj.ConnectionId = value.ConnectionId
End If
pgFinalIndexes.Refresh()
@@ -775,6 +775,17 @@ Public Class frmAdministration
obj.Sequence = oValue
ElseIf oName = "ContinueOnIndifferentState" Then
obj.ContinueOnIndifferentState = oValue
ElseIf oName = "VectorBehaviour" Then
If Not IsNothing(oValue) Then
If oValue = "Delete" Then
obj.StringValue = "DeleteWMAttributeValue"
obj.SQLCommand.Value = ""
ElseIf oValue = "Add" And obj.StringValue = "" Then
obj.StringValue = "Your value to set"
End If
End If
End If
pgFinalIndexes.Refresh()
End If
@@ -799,12 +810,8 @@ Public Class frmAdministration
Dim value As SQLValue = e.ChangedItem.Value
If value.Value <> String.Empty Then
'obj.ConnectionId = CURRENT_CONN_ID_FINAL_INDEX
obj.StringValue = "SQL-Command"
obj.ConnectionId = value.ConnectionId
'obj.FloatValue = 0
' obj.IntegerValue = 0
'obj.ConnectionId = value.ConnectionId
End If
propertyGrid.Refresh()
@@ -1006,7 +1013,7 @@ Public Class frmAdministration
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = oSQL,
.SQLConnection = 1
.SQLConnection = 0
}
oForm.ShowDialog()
@@ -1048,10 +1055,14 @@ Public Class frmAdministration
Private Sub BarButtonItem18_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem18.ItemClick
Save_Final_Indexes()
Refresh_Final_Indexes()
If focusedRowHandle <> 199 Then
viewFinalIndex.FocusedRowHandle = focusedRowHandle
End If
End Sub
Private Sub Save_Final_Indexes()
Try
'Dim obj As FinalIndexProperties = PropertyGrid1.SelectedObject
pgFinalIndexes.EndUpdate()
Dim obj As FinalIndexProperties = pgFinalIndexes.SelectedObject
If Not IsNothing(obj) Then
@@ -1067,9 +1078,10 @@ Public Class frmAdministration
Dim guid = obj.GUID
Dim oProfileId As Integer = PROFILGUIDTextBox.Text
focusedRowHandle = 199
focusedRowHandle = viewFinalIndex.FocusedRowHandle
'Dim connectionId As Integer = obj.ConnectionId
Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
' Dim connectionId As Integer = NotNull(obj.SQLCommand.ConnectionId, 1)
Dim sqlCommand As String = NotNull(obj.SQLCommand.Value, String.Empty).Replace("'", "''")
Dim indexName As String = NotNull(obj.IndexName, String.Empty)
@@ -1108,20 +1120,26 @@ Public Class frmAdministration
End If
Dim sql As String = $"INSERT INTO TBPM_PROFILE_FINAL_INDEXING (PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, ADDED_WHO,IF_VEKTOR_BEHAVIOUR,DESCRIPTION,SEQUENCE,CONTINUE_INDETERMINED)
VALUES ({oProfileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})"
VALUES ({oProfileId}, 0, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})"
If DatabaseFallback.ExecuteNonQueryECM(sql) Then
tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}"
INSERT_ACTIVE = False
'Refresh_Final_Indexes()
End If
Else
Dim sql As String = $"UPDATE TBPM_PROFILE_FINAL_INDEXING
SET CONNECTION_ID = {connectionId}, SQL_COMMAND = '{sqlCommand}', INDEXNAME = '{indexName}', CHANGED_WHO = '{addedWho}', DESCRIPTION = '{oDescription}',
VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}', [SEQUENCE] = {oSequence}, CONTINUE_INDETERMINED = {oContinueOIdS}
SET CONNECTION_ID = 0, SQL_COMMAND = '{sqlCommand}', INDEXNAME = '{indexName}', CHANGED_WHO = '{addedWho}', DESCRIPTION = '{oDescription}',
VALUE = '{value}', ACTIVE = {active}, ALLOW_NEW_VALUES = {AllowAddNewValues}, PREVENT_DUPLICATES = {preventDuplicates},
IF_VEKTOR_BEHAVIOUR = '{IF_VEKTOR_BEHAVIOUR}',
[SEQUENCE] = {oSequence}, CONTINUE_INDETERMINED = {oContinueOIdS}
WHERE GUID = {guid}"
If DatabaseFallback.ExecuteNonQueryECM(sql) Then
tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART NECESSARY"
tsbStaticInfo.Caption = $"Final index saved - {Now.ToLongTimeString} - RESTART/REFRESH NECESSARY"
tsbStaticInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
Else
End If
End If
@@ -1136,7 +1154,10 @@ Public Class frmAdministration
Finally
BarButtonItem19.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
BarButtonItem16.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
INSERT_ACTIVE = False
If INSERT_ACTIVE Then
INSERT_ACTIVE = False
End If
UNSAVED_CHANGES_FI = False
End Try
End Sub
@@ -1156,7 +1177,7 @@ Public Class frmAdministration
Try
Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
CURRENT_DESIGN_TYPE = "SQL_OVERVIEW"
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 1}
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0}
oForm.ShowDialog()
If oForm.DialogResult = DialogResult.OK Then
@@ -1178,7 +1199,7 @@ Public Class frmAdministration
Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = oldSQL,
.SQLConnection = 1,
.SQLConnection = 0,
.PlaceholdersManualPrefix = "CTRL",
.PlaceholdersManualTitle = "Controls",
.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
@@ -1214,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
@@ -1253,6 +1281,7 @@ Public Class frmAdministration
If UNSAVED_CHANGES_FI Then
Save_Final_Indexes()
'Refresh_Final_Indexes()
End If
Return True
@@ -1587,4 +1616,8 @@ Public Class frmAdministration
Dim ofrm As New frmAdmin_notResponsibleConfig(PROFILGUIDTextBox.Text)
ofrm.ShowDialog()
End Sub
Private Sub BarButtonItem1_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
viewFinalIndex.FocusedRowHandle() = 2
End Sub
End Class

View File

@@ -758,7 +758,7 @@
<value>Caption Auswahldialog:</value>
</data>
<data name="LayoutControlItem21.Text" xml:space="preserve">
<value>Datentyp:</value>
<value>Formatierung:</value>
</data>
<data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>573, 668</value>

View File

@@ -123,7 +123,7 @@ Public Class frmColumn_Detail
CURRENT_INDEX_ID = GUIDTextBox.Text
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = SQL_COMMANDTextBox.Text,
.SQLConnection = 1
.SQLConnection = 0
}
oForm2.ShowDialog()
@@ -172,7 +172,7 @@ Public Class frmColumn_Detail
CURRENT_INDEX_ID = GUIDTextBox.Text
Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
.SQLCommand = SQL_COMMANDTextBox.Text,
.SQLConnection = 1
.SQLConnection = 0
}
oForm2.ShowDialog()

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

@@ -442,7 +442,7 @@
<value>8, 156</value>
</data>
<data name="txtActualConnection.Size" type="System.Drawing.Size, System.Drawing">
<value>624, 25</value>
<value>744, 25</value>
</data>
<data name="txtActualConnection.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
@@ -487,7 +487,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>712, 318</value>
<value>832, 318</value>
</data>
<data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -511,7 +511,7 @@
<value>236, 162</value>
</data>
<data name="NumericUpDown1.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 25</value>
<value>42, 25</value>
</data>
<data name="NumericUpDown1.TabIndex" type="System.Int32, mscorlib">
<value>49</value>
@@ -693,7 +693,7 @@
<data name="btnOpenLogFolder.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG
vQAADr0BR/uQrQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG
h/1NomAOS0+RPuLfRcjMlFJ/BUNJMJQEQ0kwlARDSTCUBEMy9vR9v9PUJ243B0My5ujyweHE7eZgSPhB
pVye5ypJEo/93O3mYEj44cNcNHyz2arb9f7mJwu4b0j4cJv9dAE7bMjXC+gv1rbAkl5gaQss6QXmfPBY
0RZ4/vZHKsiyzBsU0h7aqAuUVFBVlTcopCjKqAssqKDrOm9QyHq1jrcAHV1wpZI0Tb1hIefTxTxjLWCu
@@ -758,7 +758,7 @@
<data name="btnOpenAppDataFolder.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG
vQAADr0BR/uQrQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG
h/1NomAOS0+RPuLfRcjMlFJ/BUNJMJQEQ0kwlARDSTCUBEMy9vR9v9PUJ243B0My5ujyweHE7eZgSPhB
pVye5ypJEo/93O3mYEj44cNcNHyz2arb9f7mJwu4b0j4cJv9dAE7bMjXC+gv1rbAkl5gaQss6QXmfPBY
0RZ4/vZHKsiyzBsU0h7aqAuUVFBVlTcopCjKqAssqKDrOm9QyHq1jrcAHV1wpZI0Tb1hIefTxTxjLWCu
@@ -851,7 +851,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>712, 318</value>
<value>832, 318</value>
</data>
<data name="TabPage3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -905,7 +905,7 @@
<value>3, 3</value>
</data>
<data name="GridControlLogs.Size" type="System.Drawing.Size, System.Drawing">
<value>706, 312</value>
<value>826, 312</value>
</data>
<data name="GridControlLogs.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -929,7 +929,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage4.Size" type="System.Drawing.Size, System.Drawing">
<value>712, 318</value>
<value>832, 318</value>
</data>
<data name="TabPage4.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -956,7 +956,7 @@
<value>0, 0</value>
</data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>720, 348</value>
<value>840, 348</value>
</data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@@ -998,7 +998,7 @@
<value>7, 17</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>720, 348</value>
<value>840, 348</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9.75pt</value>
@@ -1040,7 +1040,7 @@
<value>DD_DMSLiteDataSet</value>
</data>
<data name="&gt;&gt;DD_DMSLiteDataSet.Type" xml:space="preserve">
<value>taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TBPM_KONFIGURATIONBindingSource.Name" xml:space="preserve">
<value>TBPM_KONFIGURATIONBindingSource</value>
@@ -1052,13 +1052,13 @@
<value>TBPM_KONFIGURATIONTableAdapter</value>
</data>
<data name="&gt;&gt;TBPM_KONFIGURATIONTableAdapter.Type" xml:space="preserve">
<value>taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
<value>TableAdapterManager</value>
</data>
<data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
<value>taskFLOW.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;SaveFileDialog1.Name" xml:space="preserve">
<value>SaveFileDialog1</value>

View File

@@ -168,9 +168,9 @@ Public Class frmKonfig
End Function
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
' Specify that the link was visited.
Me.LinkLabel1.LinkVisited = True
Try
Me.LinkLabel1.LinkVisited = True
Using connection As New SqlClient.SqlConnection(CONNECTION_STRING_ECM)
connection.Open()

View File

@@ -685,6 +685,7 @@ Partial Class frmMain
'
resources.ApplyResources(Me.bbtnitmLanguage_Change, "bbtnitmLanguage_Change")
Me.bbtnitmLanguage_Change.Id = 51
Me.bbtnitmLanguage_Change.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmLanguage_Change.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitmLanguage_Change.Name = "bbtnitmLanguage_Change"
'
'BarButtonItem10

View File

@@ -1278,6 +1278,43 @@
<data name="bbtnitmLanguage_Change.Caption" xml:space="preserve">
<value>Sprache ändern</value>
</data>
<data name="bbtnitmLanguage_Change.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPIGAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGFuZ3VhZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAw
IDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJ
LlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHlsZT4NCiAgPHBh
dGggZD0iTTMuMywyOGMxLjMtMS4xLDIuOS0xLjcsNC43LTEuOXYzLjlDNi4yLDI5LjcsNC42LDI5LjEs
My4zLDI4eiBNMTQuOSwxOGwtMiwyaDUuMWMtMC4xLTAuNy0wLjMtMS40LTAuNS0yICBIMTQuOXogTTEw
LDIydjIuMWMyLjMsMC4yLDQuNCwxLjEsNi4xLDIuNWMxLTEuMywxLjctMi45LDEuOS00LjZoLTcuMUgx
MHogTTEuOSwyNi42YzEuNy0xLjQsMy44LTIuMyw2LjEtMi41VjIySDAuMSAgQzAuMiwyMy43LDAuOSwy
NS4zLDEuOSwyNi42eiBNMTAsMjkuOWMxLjgtMC4yLDMuNC0wLjksNC43LTEuOWMtMS4zLTEuMS0yLjkt
MS43LTQuNy0xLjlWMjkuOXogTTUsMThjLTEuNSwwLTIuNy0xLjEtMi45LTIuNSAgYzAsMC0wLjEtMC4x
LTAuMS0wLjFjLTEsMS4zLTEuNywyLjktMS45LDQuNkg4di0ySDdINXoiIGNsYXNzPSJCbHVlIiAvPg0K
ICA8cGF0aCBkPSJNMjksMEg1QzQuNSwwLDQsMC41LDQsMXYxNGMwLDAuNSwwLjUsMSwxLDFoNXY0bDQt
NGgxNWMwLjUsMCwxLTAuNSwxLTFWMUMzMCwwLjUsMjkuNSwwLDI5LDB6IiBjbGFzcz0iWWVsbG93IiAv
Pg0KICA8cGF0aCBkPSJNMTMuOSwxMmgtMmwtMC42LTEuOEg4LjVMOCwxMkg2bDIuOS04SDExTDEzLjks
MTJ6IE0xMC45LDguOGwtMC45LTIuN0MxMCw1LjksMTAsNS43LDEwLDUuNGgwICBjMCwwLjItMC4xLDAu
NS0wLjEsMC43TDguOSw4LjhIMTAuOXogTTE0LjksMTJWNGgyLjljMC45LDAsMS42LDAuMiwyLjEsMC41
YzAuNSwwLjMsMC43LDAuOCwwLjcsMS40YzAsMC40LTAuMSwwLjgtMC40LDEuMSAgYy0wLjMsMC4zLTAu
NywwLjUtMS4xLDAuN3YwYzAuNiwwLjEsMSwwLjMsMS40LDAuNmMwLjMsMC4zLDAuNSwwLjgsMC41LDEu
M2MwLDAuNy0wLjMsMS4zLTAuOCwxLjdDMTkuNiwxMS44LDE4LjksMTIsMTgsMTJIMTQuOXogICBNMTYu
Nyw1LjN2MS45aDAuOGMwLjQsMCwwLjctMC4xLDAuOS0wLjNzMC4zLTAuNCwwLjMtMC43YzAtMC42LTAu
NC0wLjktMS4zLTAuOUgxNi43eiBNMTYuNyw4LjZ2Mi4xaDFjMC40LDAsMC43LTAuMSwxLTAuMyAgYzAu
Mi0wLjIsMC40LTAuNSwwLjQtMC44YzAtMC4zLTAuMS0wLjYtMC4zLTAuOGMtMC4yLTAuMi0wLjYtMC4z
LTEtMC4zSDE2Ljd6IE0yNy45LDExLjdjLTAuNiwwLjMtMS4zLDAuNC0yLjMsMC40ICBjLTEuMiwwLTIu
Mi0wLjQtMi45LTEuMWMtMC43LTAuNy0xLjEtMS43LTEuMS0yLjljMC0xLjMsMC40LTIuMywxLjItMy4x
YzAuOC0wLjgsMS44LTEuMiwzLjEtMS4yYzAuOCwwLDEuNCwwLjEsMiwwLjN2MS43ICBjLTAuNS0wLjMt
MS4xLTAuNS0xLjgtMC41Yy0wLjgsMC0xLjQsMC4yLTEuOCwwLjdjLTAuNSwwLjUtMC43LDEuMS0wLjcs
MS45YzAsMC44LDAuMiwxLjQsMC43LDEuOHMxLDAuNywxLjgsMC43ICBjMC43LDAsMS4zLTAuMiwxLjkt
MC41VjExLjd6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
</data>
<data name="BarButtonItem10.Caption" xml:space="preserve">
<value>BarButtonItem10</value>
</data>
@@ -2246,7 +2283,7 @@
<value>Manual</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Digital Data - TaskFlow</value>
<value>Digital Data - taskFLOW</value>
</data>
<data name="&gt;&gt;ImageListProfile.Name" xml:space="preserve">
<value>ImageListProfile</value>

View File

@@ -135,7 +135,7 @@ Public Class frmMain
End If
Try
ClassAllgemeineFunktionen.LoginOut("LOGOUT")
LOGGER.Info("TaskFlow closed - " & Now, False)
LOGGER.Info("taskFLOW closed - " & Now, False)
Catch ex As Exception
LOGGER.Error(ex)
End Try
@@ -1404,8 +1404,8 @@ Public Class frmMain
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentCulture = cultureInfo
Thread.CurrentThread.CurrentUICulture = cultureInfo
CultureInfo.DefaultThreadCurrentCulture = cultureInfo
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
cultureInfo.DefaultThreadCurrentCulture = cultureInfo
cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
End If
Catch ex As Exception
LOGGER.Error(ex)
@@ -2242,50 +2242,84 @@ Public Class frmMain
Item_Scope("DOUBLECLICK")
End Sub
'Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
' Try
' ' Added
' If FormOpenClose = True And GridIsLoaded = False Then
' Exit Sub
' End If
' Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
' Dim view As GridView = sender
' If info.Column.FieldName = "GROUP_TEXT" Then
' info.GroupText = info.GroupValueText
' Dim oColorString As String = "LightGray"
' Dim oFontColorString As String = "Black"
' Dim oFoundConfig As Boolean = False
' Dim oGROUP_TEXT_COL As String
' If USER_LANGUAGE = "de-DE" Then
' oGROUP_TEXT_COL = "GROUP_TEXT"
' Else
' oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
' End If
' For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
' If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
' oFoundConfig = True
' oColorString = oProfileRow.Item("GROUP_COLOR")
' oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
' ' Added
' Exit For
' End If
' Next
' If oFoundConfig = False Then
' LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
' ' Added
' Exit Sub
' End If
' Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
' Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
' info.Appearance.BackColor = oColor
' info.Appearance.ForeColor = oFontColor
' End If
' Catch ex As Exception
' LOGGER.Error(ex)
' End Try
'End Sub
Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
Try
' Added
If FormOpenClose = True And GridIsLoaded = False Then
Exit Sub
End If
Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
Dim view As GridView = sender
Dim oInfo As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
If oInfo Is Nothing OrElse oInfo.Column Is Nothing Then
Exit Sub
End If
If info.Column.FieldName = "GROUP_TEXT" Then
info.GroupText = info.GroupValueText
Dim oView As GridView = sender
If oInfo.Column.FieldName = "GROUP_TEXT" Then
oInfo.GroupText = oInfo.GroupValueText
Dim oColorString As String = "LightGray"
Dim oFontColorString As String = "Black"
Dim oFoundConfig As Boolean = False
Dim oGROUP_TEXT_COL As String
If USER_LANGUAGE = "de-DE" Then
oGROUP_TEXT_COL = "GROUP_TEXT"
Else
oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
End If
Dim oChildRowHandle As Integer = oView.GetChildRowHandle(oInfo.RowHandle, 0)
For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
oFoundConfig = True
oColorString = oProfileRow.Item("GROUP_COLOR")
oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
' Added
Exit For
End If
Next
If oFoundConfig = False Then
LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
' Added
Exit Sub
End If
oColorString = oView.GetRowCellValue(oChildRowHandle, "GROUP_COLOR")
Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
info.Appearance.BackColor = oColor
info.Appearance.ForeColor = oFontColor
oInfo.Appearance.BackColor = oColor
oInfo.Appearance.ForeColor = oFontColor
End If
Catch ex As Exception
LOGGER.Error(ex)
@@ -2444,12 +2478,9 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
SQL_VALIDATOR_SEARCHES = SQL_VALIDATOR_SEARCHES.Replace("@USR_LANG_CODE", User.Language)
oSQL = SQL_VALIDATOR_SEARCHES
End If
'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseECM.GetDatatable(oSQL)
'.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
' .FilterExpression = "TYPE = 'DOC'",
' .SortByColumn = "PROFILE_ID,TAB_INDEX"
'})
If pMode = "Load" Then
DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
End If
@@ -3071,7 +3102,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
Dim oLink2 = "<a href=" + "file:///" + oFilePath + ">Link zur Datei</a>"
If Not IsNothing(oFilePath) Then
Process.Start($"mailto:{oReceipiant}?subject=Link aus TaskFlow Manager&body={oLink}")
Process.Start($"mailto:{oReceipiant}?subject=Link aus taskFLOW Manager&body={oLink}")
End If
End If
@@ -3257,6 +3288,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
LOGGER.Debug($"oTargetPath: {oTargetPath}")
LOGGER.Debug($"oSourcePath: {oSourcePath}")
If oTargetPath = String.Empty Or oSourcePath = String.Empty Then
LOGGER.Warn($"oTargetPath is nothing - PRofile can not be startet . Check TARGET_PATH_BLIND_FILE Column in Profile")
Exit Sub
End If
oTargetPath = $"{oTargetPath}\{Now.Year}\{Now.Month}\{Now.Day}"
@@ -3264,7 +3296,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
If oResult = True Then
WM_AHWF_docPath = oTargetPath
Dim oDocID = WINDREAM_MOD.NewDocumentID

View File

@@ -64,13 +64,7 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT2.Rows.Count} rows for GridView2")
GridView2.Columns.Clear()
GridControl2.DataSource = oDT2
Try
GridView2.Columns("Wann").DisplayFormat.FormatType = FormatType.DateTime
GridView2.Columns("Wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
Catch ex As Exception
GridView2.Columns("When").DisplayFormat.FormatType = FormatType.DateTime
GridView2.Columns("When").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End Try
Format_Datetime_Columns(GridView2, "Grid 2")
End If
If DT_MONITOR_KONFIG.Rows.Count > 2 Then
@@ -86,6 +80,7 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT3.Rows.Count} rows for GridView3")
GridView3.Columns.Clear()
GridControl3.DataSource = oDT3
Format_Datetime_Columns(GridView3, "Grid 3")
End If
If DT_MONITOR_KONFIG.Rows.Count = 4 Then
LOGGER.Debug($"DT_MONITOR_KONFIG.Rows.Count = 4")
@@ -100,13 +95,14 @@ Public Class frmMonitor
LOGGER.Debug($"Found {oDT4.Rows.Count} rows for GridView4")
GridView4.Columns.Clear()
GridControl4.DataSource = oDT4
Try
GridView4.Columns("Geändert wann").DisplayFormat.FormatType = FormatType.DateTime
GridView4.Columns("Geändert wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
Catch ex As Exception
GridView4.Columns("Changed when").DisplayFormat.FormatType = FormatType.DateTime
GridView4.Columns("Changed when").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End Try
Format_Datetime_Columns(GridView4, "Grid 4")
'Try
' GridView4.Columns("Geändert wann").DisplayFormat.FormatType = FormatType.DateTime
' GridView4.Columns("Geändert wann").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
'Catch ex As Exception
' GridView4.Columns("Changed when").DisplayFormat.FormatType = FormatType.DateTime
' GridView4.Columns("Changed when").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
'End Try
End If
End If
End If
@@ -125,6 +121,49 @@ Public Class frmMonitor
End Try
End Sub
Sub Format_Datetime_Columns(pGridView As GridView, pWhichGridView As String)
Dim oColExists As Boolean = False
Try
If MON_ADDED_COLUMN <> "None" Then
MON_ADDED_COLUMN = MON_ADDED_COLUMN.Replace("[", "")
MON_ADDED_COLUMN = MON_ADDED_COLUMN.Replace("]", "")
For Each ocol As Columns.GridColumn In pGridView.Columns
If ocol.ToString = MON_ADDED_COLUMN Then
oColExists = True
Exit For
End If
Next
If oColExists Then
pGridView.Columns(MON_ADDED_COLUMN).DisplayFormat.FormatType = FormatType.DateTime
pGridView.Columns(MON_ADDED_COLUMN).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End If
End If
Catch ex As Exception
LOGGER.Warn($"Error formatting column [{MON_ADDED_COLUMN}] {ex.Message} - Check wether it exists in columns of GridView [{pWhichGridView}]!")
End Try
Try
If MON_EDITED_COLUMN <> "None" Then
oColExists = False
For Each ocol As Columns.GridColumn In pGridView.Columns
If ocol.ToString = MON_EDITED_COLUMN Then
oColExists = True
Exit For
End If
Next
If oColExists Then
pGridView.Columns(MON_EDITED_COLUMN).DisplayFormat.FormatType = FormatType.DateTime
pGridView.Columns(MON_EDITED_COLUMN).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
End If
End If
Catch ex As Exception
LOGGER.Warn($"Error formatting column [{MON_EDITED_COLUMN}] {ex.Message} - Check wether it exists in columns of GridView [{pWhichGridView}]!")
End Try
End Sub
Sub Load_Doc(oDocPath As String)
Try
If SplitContainerControlMain.Collapsed = False And oDocPath <> String.Empty Then
@@ -215,6 +254,7 @@ Public Class frmMonitor
GRID1_TITLE = DT_MONITOR_KONFIG.Rows(0).Item("GRID_TITLE")
GridView1.ViewCaption = GRID1_TITLE
Format_Datetime_Columns(GridView1, "Grid 1")
Try
'GridView1.Columns.Item("FULL_FILE_PATH").Visible = False
Catch ex As Exception

View File

@@ -89,6 +89,8 @@ Partial Class frmRejectionCommit
'
'txtComment
'
Me.txtComment.AcceptsReturn = True
Me.txtComment.AcceptsTab = True
resources.ApplyResources(Me.txtComment, "txtComment")
Me.txtComment.Name = "txtComment"
'

View File

@@ -339,7 +339,7 @@
<value>586, 24</value>
</data>
<data name="cmbReason.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>0</value>
</data>
<data name="&gt;&gt;cmbReason.Name" xml:space="preserve">
<value>cmbReason</value>
@@ -390,7 +390,7 @@
<value>586, 158</value>
</data>
<data name="txtComment.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
<value>1</value>
</data>
<data name="&gt;&gt;txtComment.Name" xml:space="preserve">
<value>txtComment</value>

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")

View File

@@ -1,6 +1,6 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class frmYesNo
Inherits System.Windows.Forms.Form
Inherits DevExpress.XtraEditors.XtraForm
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
@@ -79,15 +79,16 @@ Partial Class frmYesNo
'
'txtReason
'
Me.txtReason.AcceptsReturn = True
Me.txtReason.AcceptsTab = True
resources.ApplyResources(Me.txtReason, "txtReason")
Me.txtReason.Name = "txtReason"
'
'frmYesNo
'
Me.AcceptButton = Me.OK_Button
Me.Appearance.Options.UseFont = True
resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
Me.Controls.Add(Me.txtReason)
Me.Controls.Add(Me.LabelControl1)
Me.Controls.Add(Me.txtQuestion)

View File

@@ -199,7 +199,7 @@
<value>209, 48</value>
</data>
<data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>1</value>
</data>
<data name="&gt;&gt;TableLayoutPanel1.Name" xml:space="preserve">
<value>TableLayoutPanel1</value>
@@ -333,7 +333,7 @@
<value>428, 139</value>
</data>
<data name="txtReason.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<value>0</value>
</data>
<data name="&gt;&gt;txtReason.Name" xml:space="preserve">
<value>txtReason</value>
@@ -372,6 +372,6 @@
<value>frmYesNo</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>
<value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>

View File

@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<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.Framework" version="3.2.0" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
@@ -8,6 +19,8 @@
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
<package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
@@ -16,9 +29,11 @@
<package id="protobuf-net" version="3.2.46" targetFramework="net462" />
<package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
<package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
<package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
<package id="System.Buffers" version="4.6.0" targetFramework="net462" />
<package id="System.CodeDom" 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.Formats.Asn1" version="9.0.0" targetFramework="net462" />
<package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
<package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />