diff --git a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb index 7ba610e..bed7176 100644 --- a/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb +++ b/app/DD_PM_WINDREAM/ClassFinalizeDoc.vb @@ -12,6 +12,7 @@ For Each dr As DataRow In CURRENT_DT_FINAL_INDEXING.Rows Dim value 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 ### LOGGER.Debug("indexing with dynamic sql...") 'Dim SQL_COMMAND = dr.Item("SQL_COMMAND") @@ -41,9 +42,9 @@ sql_Statement = clsPatterns.ReplaceInternalValues(sql_Statement) sql_Statement = clsPatterns.ReplaceWindreamIndicies(sql_Statement, WMObject, True) LOGGER.Debug("sql after ReplaceAllValues: " & sql_Statement) - Dim dynamic_value = ClassDatabase.Execute_Scalar(sql_Statement, CONNECTION_STRING, "Write_Final_Metadata/dynamic_value") - If Not IsNothing(dynamic_value) Then - value = dynamic_value + Dim oDynamic_value = ClassDatabase.Execute_Scalar(sql_Statement, CONNECTION_STRING, "Write_Final_Metadata/dynamic_value") + If Not IsNothing(oDynamic_value) Then + value = oDynamic_value Else Continue For End If diff --git a/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb b/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb index 923d037..3bd30f4 100644 --- a/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/FinalIndexDataSet.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class FinalIndexDataSet Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -77,7 +77,7 @@ Partial Public Class FinalIndexDataSet End Sub _ Public ReadOnly Property TBPM_PROFILE_FINAL_INDEXING() As TBPM_PROFILE_FINAL_INDEXINGDataTable @@ -87,7 +87,7 @@ Partial Public Class FinalIndexDataSet End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class FinalIndexDataSet End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class FinalIndexDataSet End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As FinalIndexDataSet = CType(MyBase.Clone,FinalIndexDataSet) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class FinalIndexDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -171,7 +171,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -180,13 +180,13 @@ Partial Public Class FinalIndexDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tableTBPM_PROFILE_FINAL_INDEXING = CType(MyBase.Tables("TBPM_PROFILE_FINAL_INDEXING"),TBPM_PROFILE_FINAL_INDEXINGDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "FinalIndexDataSet" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializeTBPM_PROFILE_FINAL_INDEXING() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -223,7 +223,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As FinalIndexDataSet = New FinalIndexDataSet() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class FinalIndexDataSet Return type End Function - _ + _ Public Delegate Sub TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent) ''' @@ -313,8 +313,12 @@ Partial Public Class FinalIndexDataSet Private columnIF_VEKTOR_BEHAVIOUR As Global.System.Data.DataColumn + Private columnSEQUENCE As Global.System.Data.DataColumn + + Private columnCONTINUE_INDETERMINED As Global.System.Data.DataColumn + _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "TBPM_PROFILE_FINAL_INDEXING" @@ -324,7 +328,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -342,14 +346,14 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get Return Me.columnGUID @@ -357,7 +361,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PROFIL_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnPROFIL_ID @@ -365,7 +369,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CONNECTION_IDColumn() As Global.System.Data.DataColumn Get Return Me.columnCONNECTION_ID @@ -373,7 +377,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property SQL_COMMANDColumn() As Global.System.Data.DataColumn Get Return Me.columnSQL_COMMAND @@ -381,7 +385,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property INDEXNAMEColumn() As Global.System.Data.DataColumn Get Return Me.columnINDEXNAME @@ -389,7 +393,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property VALUEColumn() As Global.System.Data.DataColumn Get Return Me.columnVALUE @@ -397,7 +401,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHO @@ -405,7 +409,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnADDED_WHEN @@ -413,7 +417,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHO @@ -421,7 +425,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get Return Me.columnCHANGED_WHEN @@ -429,7 +433,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property DESCRIPTIONColumn() As Global.System.Data.DataColumn Get Return Me.columnDESCRIPTION @@ -437,7 +441,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn Get Return Me.columnACTIVE @@ -445,7 +449,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property PREVENT_DUPLICATESColumn() As Global.System.Data.DataColumn Get Return Me.columnPREVENT_DUPLICATES @@ -453,7 +457,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property ALLOW_NEW_VALUESColumn() As Global.System.Data.DataColumn Get Return Me.columnALLOW_NEW_VALUES @@ -461,7 +465,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property IF_VEKTOR_BEHAVIOURColumn() As Global.System.Data.DataColumn Get Return Me.columnIF_VEKTOR_BEHAVIOUR @@ -469,7 +473,23 @@ Partial Public Class FinalIndexDataSet End Property _ + Public ReadOnly Property SEQUENCEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSEQUENCE + End Get + End Property + + _ + Public ReadOnly Property CONTINUE_INDETERMINEDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCONTINUE_INDETERMINED + End Get + End Property + + _ Public ReadOnly Property Count() As Integer Get @@ -478,49 +498,65 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As TBPM_PROFILE_FINAL_INDEXINGRow Get Return CType(Me.Rows(index),TBPM_PROFILE_FINAL_INDEXINGRow) End Get End Property - _ + _ Public Event TBPM_PROFILE_FINAL_INDEXINGRowChanging As TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler - _ + _ Public Event TBPM_PROFILE_FINAL_INDEXINGRowChanged As TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler - _ + _ Public Event TBPM_PROFILE_FINAL_INDEXINGRowDeleting As TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler - _ + _ Public Event TBPM_PROFILE_FINAL_INDEXINGRowDeleted As TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal row As TBPM_PROFILE_FINAL_INDEXINGRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow(ByVal PROFIL_ID As Integer, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal DESCRIPTION As String, ByVal ACTIVE As Boolean, ByVal PREVENT_DUPLICATES As Boolean, ByVal ALLOW_NEW_VALUES As Boolean, ByVal IF_VEKTOR_BEHAVIOUR As String) As TBPM_PROFILE_FINAL_INDEXINGRow + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ + Public Overloads Function AddTBPM_PROFILE_FINAL_INDEXINGRow( _ + ByVal PROFIL_ID As Integer, _ + ByVal CONNECTION_ID As Short, _ + ByVal SQL_COMMAND As String, _ + ByVal INDEXNAME As String, _ + ByVal VALUE As String, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Date, _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Date, _ + ByVal DESCRIPTION As String, _ + ByVal ACTIVE As Boolean, _ + ByVal PREVENT_DUPLICATES As Boolean, _ + ByVal ALLOW_NEW_VALUES As Boolean, _ + ByVal IF_VEKTOR_BEHAVIOUR As String, _ + ByVal SEQUENCE As Byte, _ + ByVal CONTINUE_INDETERMINED As Boolean) As TBPM_PROFILE_FINAL_INDEXINGRow Dim rowTBPM_PROFILE_FINAL_INDEXINGRow As TBPM_PROFILE_FINAL_INDEXINGRow = CType(Me.NewRow,TBPM_PROFILE_FINAL_INDEXINGRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, DESCRIPTION, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, IF_VEKTOR_BEHAVIOUR} + Dim columnValuesArray() As Object = New Object() {Nothing, PROFIL_ID, CONNECTION_ID, SQL_COMMAND, INDEXNAME, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, DESCRIPTION, ACTIVE, PREVENT_DUPLICATES, ALLOW_NEW_VALUES, IF_VEKTOR_BEHAVIOUR, SEQUENCE, CONTINUE_INDETERMINED} rowTBPM_PROFILE_FINAL_INDEXINGRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPM_PROFILE_FINAL_INDEXINGRow) Return rowTBPM_PROFILE_FINAL_INDEXINGRow End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindByGUID(ByVal GUID As Integer) As TBPM_PROFILE_FINAL_INDEXINGRow Return CType(Me.Rows.Find(New Object() {GUID}),TBPM_PROFILE_FINAL_INDEXINGRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As TBPM_PROFILE_FINAL_INDEXINGDataTable = CType(MyBase.Clone,TBPM_PROFILE_FINAL_INDEXINGDataTable) cln.InitVars @@ -528,13 +564,13 @@ Partial Public Class FinalIndexDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New TBPM_PROFILE_FINAL_INDEXINGDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnPROFIL_ID = MyBase.Columns("PROFIL_ID") @@ -551,10 +587,12 @@ Partial Public Class FinalIndexDataSet Me.columnPREVENT_DUPLICATES = MyBase.Columns("PREVENT_DUPLICATES") Me.columnALLOW_NEW_VALUES = MyBase.Columns("ALLOW_NEW_VALUES") Me.columnIF_VEKTOR_BEHAVIOUR = MyBase.Columns("IF_VEKTOR_BEHAVIOUR") + Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") + Me.columnCONTINUE_INDETERMINED = MyBase.Columns("CONTINUE_INDETERMINED") End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnGUID) @@ -586,6 +624,10 @@ Partial Public Class FinalIndexDataSet MyBase.Columns.Add(Me.columnALLOW_NEW_VALUES) Me.columnIF_VEKTOR_BEHAVIOUR = New Global.System.Data.DataColumn("IF_VEKTOR_BEHAVIOUR", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnIF_VEKTOR_BEHAVIOUR) + Me.columnSEQUENCE = New Global.System.Data.DataColumn("SEQUENCE", GetType(Byte), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnSEQUENCE) + Me.columnCONTINUE_INDETERMINED = New Global.System.Data.DataColumn("CONTINUE_INDETERMINED", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCONTINUE_INDETERMINED) Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) Me.columnGUID.AutoIncrement = true Me.columnGUID.AutoIncrementSeed = -1 @@ -612,28 +654,31 @@ Partial Public Class FinalIndexDataSet Me.columnALLOW_NEW_VALUES.AllowDBNull = false Me.columnIF_VEKTOR_BEHAVIOUR.AllowDBNull = false Me.columnIF_VEKTOR_BEHAVIOUR.MaxLength = 25 + Me.columnSEQUENCE.AllowDBNull = false + Me.columnSEQUENCE.DefaultValue = CType(0,Byte) + Me.columnCONTINUE_INDETERMINED.AllowDBNull = false End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewTBPM_PROFILE_FINAL_INDEXINGRow() As TBPM_PROFILE_FINAL_INDEXINGRow Return CType(Me.NewRow,TBPM_PROFILE_FINAL_INDEXINGRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New TBPM_PROFILE_FINAL_INDEXINGRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(TBPM_PROFILE_FINAL_INDEXINGRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.TBPM_PROFILE_FINAL_INDEXINGRowChangedEvent) Is Nothing) Then @@ -642,7 +687,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.TBPM_PROFILE_FINAL_INDEXINGRowChangingEvent) Is Nothing) Then @@ -651,7 +696,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.TBPM_PROFILE_FINAL_INDEXINGRowDeletedEvent) Is Nothing) Then @@ -660,7 +705,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.TBPM_PROFILE_FINAL_INDEXINGRowDeletingEvent) Is Nothing) Then @@ -669,13 +714,13 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemoveTBPM_PROFILE_FINAL_INDEXINGRow(ByVal row As TBPM_PROFILE_FINAL_INDEXINGRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -750,14 +795,14 @@ Partial Public Class FinalIndexDataSet Private tableTBPM_PROFILE_FINAL_INDEXING As TBPM_PROFILE_FINAL_INDEXINGDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tableTBPM_PROFILE_FINAL_INDEXING = CType(Me.Table,TBPM_PROFILE_FINAL_INDEXINGDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property GUID() As Integer Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.GUIDColumn),Integer) @@ -768,7 +813,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PROFIL_ID() As Integer Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.PROFIL_IDColumn),Integer) @@ -779,7 +824,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CONNECTION_ID() As Short Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CONNECTION_IDColumn),Short) @@ -790,7 +835,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SQL_COMMAND() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.SQL_COMMANDColumn),String) @@ -801,7 +846,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property INDEXNAME() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.INDEXNAMEColumn),String) @@ -812,7 +857,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property VALUE() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.VALUEColumn),String) @@ -823,7 +868,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ADDED_WHOColumn),String) @@ -834,7 +879,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ADDED_WHENColumn),Date) @@ -845,7 +890,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHO() As String Get Try @@ -861,7 +906,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CHANGED_WHEN() As Date Get Try @@ -877,7 +922,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property DESCRIPTION() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.DESCRIPTIONColumn),String) @@ -888,7 +933,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ACTIVE() As Boolean Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ACTIVEColumn),Boolean) @@ -899,7 +944,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PREVENT_DUPLICATES() As Boolean Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATESColumn),Boolean) @@ -910,7 +955,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ALLOW_NEW_VALUES() As Boolean Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.ALLOW_NEW_VALUESColumn),Boolean) @@ -921,7 +966,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IF_VEKTOR_BEHAVIOUR() As String Get Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOURColumn),String) @@ -932,25 +977,47 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ + Public Property SEQUENCE() As Byte + Get + Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.SEQUENCEColumn),Byte) + End Get + Set + Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.SEQUENCEColumn) = value + End Set + End Property + + _ + Public Property CONTINUE_INDETERMINED() As Boolean + Get + Return CType(Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CONTINUE_INDETERMINEDColumn),Boolean) + End Get + Set + Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CONTINUE_INDETERMINEDColumn) = value + End Set + End Property + + _ Public Function IsCHANGED_WHONull() As Boolean Return Me.IsNull(Me.tableTBPM_PROFILE_FINAL_INDEXING.CHANGED_WHOColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHONull() Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsCHANGED_WHENNull() As Boolean Return Me.IsNull(Me.tableTBPM_PROFILE_FINAL_INDEXING.CHANGED_WHENColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetCHANGED_WHENNull() Me(Me.tableTBPM_PROFILE_FINAL_INDEXING.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub @@ -959,7 +1026,7 @@ Partial Public Class FinalIndexDataSet ''' '''Row event argument class ''' - _ + _ Public Class TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent Inherits Global.System.EventArgs @@ -968,7 +1035,7 @@ Partial Public Class FinalIndexDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As TBPM_PROFILE_FINAL_INDEXINGRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -976,7 +1043,7 @@ Partial Public Class FinalIndexDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As TBPM_PROFILE_FINAL_INDEXINGRow Get Return Me.eventRow @@ -984,7 +1051,7 @@ Partial Public Class FinalIndexDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -1018,14 +1085,14 @@ Namespace FinalIndexDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -1036,7 +1103,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -1066,7 +1133,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -1094,7 +1161,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -1105,7 +1172,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -1116,7 +1183,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -1137,20 +1204,22 @@ Namespace FinalIndexDataSetTableAdapters tableMapping.ColumnMappings.Add("PREVENT_DUPLICATES", "PREVENT_DUPLICATES") tableMapping.ColumnMappings.Add("ALLOW_NEW_VALUES", "ALLOW_NEW_VALUES") tableMapping.ColumnMappings.Add("IF_VEKTOR_BEHAVIOUR", "IF_VEKTOR_BEHAVIOUR") + tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE") + tableMapping.ColumnMappings.Add("CONTINUE_INDETERMINED", "CONTINUE_INDETERMINED") Me._adapter.TableMappings.Add(tableMapping) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() Me._connection.ConnectionString = Global.DD_ProcessManager.My.MySettings.Default.ConnectionString End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFI"& _ @@ -1161,44 +1230,23 @@ Namespace FinalIndexDataSetTableAdapters "XING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_I"& _ "NDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING."& _ - "ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBPM_PROFILE_FINAL_INDEXING INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPM_PROFILE"& _ - " ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBP"& _ - "M_PROFILE.NAME = @NAME)" + "ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBPM_PROFILE_FINAL_INDEXING.SEQUENCE, TBPM_PROFILE_FINAL_INDEXING."& _ + "CONTINUE_INDETERMINED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = "& _ + "TBPM_PROFILE.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBPM_PROFILE.NAME = @NAME)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY TBPM_PROFI"& _ + "LE_FINAL_INDEXING.SEQUENCE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "INSERT INTO TBPM_PROFILE_FINAL_INDEXING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFIL_ID, IND"& _ - "EXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT @NEW_PROFIL"& _ - "_ID AS Expr1, INDEXNAME, VALUE, @User AS Expr2, CONNECTION_ID, SQL_COMMAND"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM"& _ - " TBPM_PROFILE_FINAL_INDEXING AS TBPM_PROFILE_FINAL_INDEXING_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (PROFIL_ID = @Copy_Profil_ID)" + Me._commandCollection(1).CommandText = "DELETE FROM TBPM_PROFILE_FINAL_INDEXING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid)" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NEW_PROFIL_ID", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@User", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Copy_Profil_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(2).Connection = Me.Connection - Me._commandCollection(2).CommandText = "DELETE FROM TBPM_PROFILE_FINAL_INDEXING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid)" - Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(3).Connection = Me.Connection - Me._commandCollection(3).CommandText = "INSERT INTO TBPM_PROFILE_FINAL_INDEXING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFIL_ID, IND"& _ - "EXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFIL_ID"& _ - ",@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND)" - Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXINGDataTable, ByVal NAME As String) As Integer @@ -1216,7 +1264,7 @@ Namespace FinalIndexDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData(ByVal NAME As String) As FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXINGDataTable @@ -1232,44 +1280,11 @@ Namespace FinalIndexDataSetTableAdapters End Function _ - Public Overloads Overridable Function CopyFinalIndex(ByVal NEW_PROFIL_ID As String, ByVal User As String, ByVal Copy_Profil_ID As Integer) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) - If (NEW_PROFIL_ID Is Nothing) Then - Throw New Global.System.ArgumentNullException("NEW_PROFIL_ID") - Else - command.Parameters(0).Value = CType(NEW_PROFIL_ID,String) - End If - If (User Is Nothing) Then - Throw New Global.System.ArgumentNullException("User") - Else - command.Parameters(1).Value = CType(User,String) - End If - command.Parameters(2).Value = CType(Copy_Profil_ID,Integer) - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Integer - Try - returnValue = command.ExecuteNonQuery - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - Return returnValue - End Function - - _ Public Overloads Overridable Function DeleteFinalIndex(ByVal guid As Integer) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(2) + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) command.Parameters(0).Value = CType(guid,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ @@ -1286,50 +1301,6 @@ Namespace FinalIndexDataSetTableAdapters End Try Return returnValue End Function - - _ - Public Overloads Overridable Function InsertFinalIndex(ByVal PROFIL_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3) - command.Parameters(0).Value = CType(PROFIL_ID,Integer) - If (INDEXNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("INDEXNAME") - Else - command.Parameters(1).Value = CType(INDEXNAME,String) - End If - If (VALUE Is Nothing) Then - Throw New Global.System.ArgumentNullException("VALUE") - Else - command.Parameters(2).Value = CType(VALUE,String) - End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - command.Parameters(3).Value = CType(ADDED_WHO,String) - End If - command.Parameters(4).Value = CType(CONNECTION_ID,Short) - If (SQL_COMMAND Is Nothing) Then - Throw New Global.System.ArgumentNullException("SQL_COMMAND") - Else - command.Parameters(5).Value = CType(SQL_COMMAND,String) - End If - Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State - If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ - <> Global.System.Data.ConnectionState.Open) Then - command.Connection.Open - End If - Dim returnValue As Integer - Try - returnValue = command.ExecuteNonQuery - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - Return returnValue - End Function End Class ''' @@ -1350,7 +1321,7 @@ Namespace FinalIndexDataSetTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1361,7 +1332,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1372,7 +1343,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1387,7 +1358,7 @@ Namespace FinalIndexDataSetTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1400,7 +1371,7 @@ Namespace FinalIndexDataSetTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As FinalIndexDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 Return result @@ -1410,7 +1381,7 @@ Namespace FinalIndexDataSetTableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As FinalIndexDataSet, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 Return result @@ -1420,7 +1391,7 @@ Namespace FinalIndexDataSetTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As FinalIndexDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 Return result @@ -1430,7 +1401,7 @@ Namespace FinalIndexDataSetTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -1456,7 +1427,7 @@ Namespace FinalIndexDataSetTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As FinalIndexDataSet) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1573,13 +1544,13 @@ Namespace FinalIndexDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -1597,7 +1568,7 @@ Namespace FinalIndexDataSetTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1608,7 +1579,7 @@ Namespace FinalIndexDataSetTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -1618,7 +1589,7 @@ Namespace FinalIndexDataSetTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -1630,7 +1601,7 @@ Namespace FinalIndexDataSetTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -1669,7 +1640,7 @@ Namespace FinalIndexDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd b/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd index a5309ac..f270b9a 100644 --- a/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd +++ b/app/DD_PM_WINDREAM/FinalIndexDataSet.xsd @@ -15,10 +15,12 @@ SELECT TBPM_PROFILE_FINAL_INDEXING.GUID, TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID, TBPM_PROFILE_FINAL_INDEXING.CONNECTION_ID, TBPM_PROFILE_FINAL_INDEXING.SQL_COMMAND, TBPM_PROFILE_FINAL_INDEXING.INDEXNAME, TBPM_PROFILE_FINAL_INDEXING.VALUE, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHO, TBPM_PROFILE_FINAL_INDEXING.ADDED_WHEN, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHO, TBPM_PROFILE_FINAL_INDEXING.CHANGED_WHEN, TBPM_PROFILE_FINAL_INDEXING.DESCRIPTION, TBPM_PROFILE_FINAL_INDEXING.ACTIVE, - TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING.ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR + TBPM_PROFILE_FINAL_INDEXING.PREVENT_DUPLICATES, TBPM_PROFILE_FINAL_INDEXING.ALLOW_NEW_VALUES, TBPM_PROFILE_FINAL_INDEXING.IF_VEKTOR_BEHAVIOUR, + TBPM_PROFILE_FINAL_INDEXING.SEQUENCE, TBPM_PROFILE_FINAL_INDEXING.CONTINUE_INDETERMINED FROM TBPM_PROFILE_FINAL_INDEXING INNER JOIN TBPM_PROFILE ON TBPM_PROFILE_FINAL_INDEXING.PROFIL_ID = TBPM_PROFILE.GUID -WHERE (TBPM_PROFILE.NAME = @NAME) +WHERE (TBPM_PROFILE.NAME = @NAME) +ORDER BY TBPM_PROFILE_FINAL_INDEXING.SEQUENCE @@ -42,25 +44,11 @@ WHERE (TBPM_PROFILE.NAME = @NAME) + + - - - - INSERT INTO TBPM_PROFILE_FINAL_INDEXING - (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND) -SELECT @NEW_PROFIL_ID AS Expr1, INDEXNAME, VALUE, @User AS Expr2, CONNECTION_ID, SQL_COMMAND -FROM TBPM_PROFILE_FINAL_INDEXING AS TBPM_PROFILE_FINAL_INDEXING_1 -WHERE (PROFIL_ID = @Copy_Profil_ID) - - - - - - - - - + DELETE FROM TBPM_PROFILE_FINAL_INDEXING @@ -71,23 +59,6 @@ WHERE (GUID = @guid) - - - - INSERT INTO TBPM_PROFILE_FINAL_INDEXING - (PROFIL_ID, INDEXNAME, VALUE, ADDED_WHO, CONNECTION_ID, SQL_COMMAND) -VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMAND) - - - - - - - - - - - @@ -158,6 +129,8 @@ VALUES (@PROFIL_ID,@INDEXNAME,@VALUE,@ADDED_WHO,@CONNECTION_ID,@SQL_COMMA + + diff --git a/app/DD_PM_WINDREAM/FinalIndexDataSet.xss b/app/DD_PM_WINDREAM/FinalIndexDataSet.xss index feadf85..927c753 100644 --- a/app/DD_PM_WINDREAM/FinalIndexDataSet.xss +++ b/app/DD_PM_WINDREAM/FinalIndexDataSet.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb index 0ce0cd1..b0e90ec 100644 --- a/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb @@ -17,7 +17,10 @@ Module ModuleFinalIndexProperties Public Property Description As String Public Property Active As Boolean - + + Public Property Sequence As Integer = 0 + + Public Property ContinueOnIndifferentState As Boolean ''' ''' Eigenschaft, die den SQL Editor anzeigt ''' diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 95e4e3d..1aab742 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 17ed67c..ad67175 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -1596,7 +1596,10 @@ Partial Class frmAdministration Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'BarButtonItem1 ' diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 9361e67..c8de6ba 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -565,7 +565,7 @@ 58 - 1062, 159 + 1062, 198 3 @@ -688,7 +688,7 @@ 58 - 1062, 185 + 1062, 232 0 @@ -775,10 +775,10 @@ 1 - 1062, 398 + 1062, 484 - 184 + 223 1 @@ -2317,7 +2317,7 @@ 3, 3, 3, 3 - 1068, 404 + 1068, 490 1 diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 25d5bec..658e8a1 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -17,9 +17,10 @@ Public Class frmAdministration Dim DT_CHART_CONFIG As DataTable Dim DT2Compare As DataTable Dim PROF_ORIGIN As DataTable - Private CURR_TEXT_CONTROL_CONTENT As String - Private CURR_BOOL_CONTROL_CONTENT As CheckState = CheckState.Indeterminate - Private CURR_COMBOBOX_CONTROL_CONTENT As String + 'Private CURR_TEXT_CONTROL_CONTENT As String + 'Private CURR_BOOL_CONTROL_CONTENT As CheckState = CheckState.Indeterminate + 'Private CURR_COMBOBOX_CONTROL_CONTENT As String + Private PROFILEBS_POS As Integer = 0 Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load formloaded = False @@ -177,7 +178,7 @@ Public Class frmAdministration change_BindingSource = True CHANGES_FORM_DESIGN = True UNSAVED_CHANGES_PROFILE = False - CURR_TEXT_CONTROL_CONTENT = String.Empty + ' CURR_TEXT_CONTROL_CONTENT = String.Empty TBPM_PROFILETableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE) TBPM_TYPETableAdapter.Fill(DD_DMSLiteDataSet.TBPM_TYPE) TBPM_KONFIGURATIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_KONFIGURATION) @@ -943,8 +944,8 @@ Public Class frmAdministration Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False) Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False) Dim VectorBehaviour As String = NotNull(focusedRow.Item("IF_VEKTOR_BEHAVIOUR"), "Add") - - + Dim oSequence As Int16 = NotNull(focusedRow.Item("SEQUENCE"), 0) + Dim oIndetermined As Boolean = NotNull(focusedRow.Item("CONTINUE_INDETERMINED"), False) CURRENT_INDEX_ID = guid CURRENT_SQL_CON = connectionId @@ -958,7 +959,8 @@ Public Class frmAdministration obj.AllowAddNewValues = allowNewValues obj.PreventDuplicates = preventDuplicates obj.VectorBehaviour = VectorBehaviour - + obj.Sequence = oSequence + obj.ContinueOnIndifferentState = oIndetermined ' Wenn eine neue Zeile hinzugefügt wird, auf StringValue setzen If e.FocusedRowHandle <> GridControl.NewItemRowHandle Then obj = FINALINDICES.SetValue(value, obj, index, MyIndicies, MyIndicies_Types) @@ -1015,6 +1017,10 @@ Public Class frmAdministration ElseIf e.ChangedItem.Label = "IndexName" Then Dim type As Integer = FINALINDICES.GetIndexType(e.ChangedItem.Value, MyIndicies, MyIndicies_Types) obj.VectorIndex = FINALINDICES.IsVectorIndex(type) + ElseIf e.ChangedItem.Label = "Sequence" Then + obj.Sequence = e.ChangedItem.Value + ElseIf e.ChangedItem.Label = "ContinueOnIndifferentState" Then + obj.ContinueOnIndifferentState = e.ChangedItem.Value End If propertyGrid.Refresh() End If @@ -1244,7 +1250,8 @@ Public Class frmAdministration Dim AllowAddNewValues As Integer = IIf(obj.AllowAddNewValues, 1, 0) Dim IF_VEKTOR_BEHAVIOUR As String = NotNull(obj.VectorBehaviour, String.Empty) Dim oDescription As String = NotNull(obj.Description, String.Empty) - + Dim oSequence As Integer = obj.Sequence + Dim oContinueOIdS As Integer = obj.ContinueOnIndifferentState If indexName = String.Empty Then MsgBox("We need an index!", MsgBoxStyle.Exclamation) Exit Sub @@ -1262,8 +1269,15 @@ Public Class frmAdministration End If If INSERT_ACTIVE = True Then - 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) - VALUES ({profileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}')" + Dim pSequence As String + If oSequence = 0 Then + pSequence = $"(SELECT MAX(SEQUENCE) + 1 FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {profileId})" + Else + pSequence = oSequence + 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 ({profileId}, {connectionId}, '{sqlCommand}', '{indexName}', '{value}', {active}, {preventDuplicates}, {AllowAddNewValues}, '{addedWho}','{IF_VEKTOR_BEHAVIOUR}','{oDescription}',{pSequence},{oContinueOIdS})" If ClassDatabase.Execute_non_Query(sql, True) Then tsbStaticInfo.Caption = $"Final index added - {Now.ToLongTimeString}" @@ -1272,7 +1286,7 @@ Public Class frmAdministration 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}' + 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 ClassDatabase.Execute_non_Query(sql, True) Then @@ -1373,29 +1387,6 @@ Public Class frmAdministration LOGGER.Error(ex) End Try End Sub - Private Sub TBPM_PROFILEBindingSource_CurrentItemChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentItemChanged - If formloaded = False Then - Exit Sub - End If - ' Check_Changes() - change_BindingSource = True - End Sub - Private Sub TBPM_PROFILEBindingSource_PositionChanged(sender As System.Object, e As System.EventArgs) Handles TBPM_PROFILEBindingSource.PositionChanged - If formloaded = False Then - Exit Sub - End If - If UNSAVED_CHANGES_PROFILE Then - CHECK_QUESTION_CHANGES() - End If - 'Check_Changes() - change_BindingSource = False - - tsbStaticInfo.Caption = "" - Indexe_eintragen() - If tabctrl_Profilkonfig.SelectedIndex = 1 And TBPM_PROFILEBindingSource.Position <> -1 Then - Refresh_Final_indexe() - End If - End Sub Sub CHECK_QUESTION_CHANGES() If formloaded = False Then Exit Sub @@ -1416,73 +1407,65 @@ Public Class frmAdministration If UNSAVED_CHANGES_FI = True Then Save_FI() End If + ' TBPM_PROFILEBindingSource.Position = PROFILEBS_POS - 1 Else Refresh_Profildaten() End If End If End Sub - Private Sub Check_Changes() - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - Exit Sub - End If - ' TBPM_PROFILEBindingSource.EndEdit() - If Not IsNothing(DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges) Then - UNSAVED_CHANGES_PROFILE = True - End If - End Sub - Private Sub NAMETextBox_TextChanged(sender As Object, e As EventArgs) Handles WD_SEARCHTextBox.TextChanged, TITLETextBox.TextChanged, NAMETextBox.TextChanged, - FINAL_TEXTTextBox.TextChanged, DESCRIPTIONTextBox.TextChanged, WORK_HISTORY_ENTRYTextBox.TextChanged, MOVE2FOLDERTextBox.TextChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - Exit Sub - End If - 'UNSAVED_CHANGES_PROFILE = True - End Sub - Private Sub ACTIVECheckBox_Enter(sender As Object, e As EventArgs) Handles ACTIVECheckBox.Enter, SORT_BY_LATESTCheckBox.Enter, FINAL_PROFILECheckBox.Enter - Dim ochk As CheckBox = sender - If formloaded = False Then - Exit Sub - End If - If change_BindingSource = True Then - Exit Sub - End If - If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then - CURR_BOOL_CONTROL_CONTENT = ochk.Checked - End If + 'Private Sub NAMETextBox_TextChanged(sender As Object, e As EventArgs) Handles WD_SEARCHTextBox.TextChanged, TITLETextBox.TextChanged, NAMETextBox.TextChanged, + ' FINAL_TEXTTextBox.TextChanged, DESCRIPTIONTextBox.TextChanged, WORK_HISTORY_ENTRYTextBox.TextChanged, MOVE2FOLDERTextBox.TextChanged + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + ' Exit Sub + ' End If + ' 'UNSAVED_CHANGES_PROFILE = True + 'End Sub + 'Private Sub ACTIVECheckBox_Enter(sender As Object, e As EventArgs) Handles ACTIVECheckBox.Enter, SORT_BY_LATESTCheckBox.Enter, FINAL_PROFILECheckBox.Enter + ' Dim ochk As CheckBox = sender + ' If formloaded = False Then + ' Exit Sub + ' End If + ' If change_BindingSource = True Then + ' Exit Sub + ' End If + ' If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then + ' CURR_BOOL_CONTROL_CONTENT = ochk.Checked + ' End If - End Sub - Private Sub ACTIVECheckBox_CheckStateChanged(sender As Object, e As EventArgs) Handles SORT_BY_LATESTCheckBox.CheckStateChanged, FINAL_PROFILECheckBox.CheckStateChanged, ACTIVECheckBox.CheckStateChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Or CURR_BOOL_CONTROL_CONTENT = CheckState.Indeterminate Then - Exit Sub - End If - Dim ochk As CheckBox = sender - If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then - UNSAVED_CHANGES_PROFILE = True - End If - End Sub + 'End Sub + 'Private Sub ACTIVECheckBox_CheckStateChanged(sender As Object, e As EventArgs) Handles SORT_BY_LATESTCheckBox.CheckStateChanged, FINAL_PROFILECheckBox.CheckStateChanged, ACTIVECheckBox.CheckStateChanged + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Or CURR_BOOL_CONTROL_CONTENT = CheckState.Indeterminate Then + ' Exit Sub + ' End If + ' Dim ochk As CheckBox = sender + ' If CURR_BOOL_CONTROL_CONTENT <> ochk.Checked Then + ' ' UNSAVED_CHANGES_PROFILE = True + ' End If + 'End Sub - Private Sub cmbObjekttypen_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.SelectedIndexChanged, DISPLAY_MODEComboBox.SelectedIndexChanged, cmbObjekttypen.SelectedIndexChanged, cmbLOGIndex.SelectedIndexChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - Exit Sub - End If - Dim ocmb As ComboBox = sender - Dim oSelectedValue = ocmb.SelectedValue - If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then - UNSAVED_CHANGES_PROFILE = True - End If - End Sub - Private Sub PM_VEKTOR_INDEXComboBox_Click(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.Click - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then - Exit Sub - End If - Dim ocmb As ComboBox = sender - If ocmb.SelectedIndex <> -1 Then - Dim oSelectedValue = ocmb.SelectedValue - If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then - CURR_COMBOBOX_CONTROL_CONTENT = oSelectedValue - End If - End If - End Sub + 'Private Sub cmbObjekttypen_SelectedIndexChanged_1(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.SelectedIndexChanged, DISPLAY_MODEComboBox.SelectedIndexChanged, cmbObjekttypen.SelectedIndexChanged, cmbLOGIndex.SelectedIndexChanged + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + ' Exit Sub + ' End If + ' Dim ocmb As ComboBox = sender + ' Dim oSelectedValue = ocmb.SelectedValue + ' If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then + ' ' UNSAVED_CHANGES_PROFILE = True + ' End If + 'End Sub + 'Private Sub PM_VEKTOR_INDEXComboBox_Click(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.Click + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + ' Exit Sub + ' End If + ' Dim ocmb As ComboBox = sender + ' If ocmb.SelectedIndex <> -1 Then + ' Dim oSelectedValue = ocmb.SelectedValue + ' If CURR_COMBOBOX_CONTROL_CONTENT <> oSelectedValue Then + ' CURR_COMBOBOX_CONTROL_CONTENT = oSelectedValue + ' End If + ' End If + 'End Sub Private Sub GridView1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewProfile.FocusedRowChanged If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then @@ -1502,17 +1485,42 @@ Public Class frmAdministration End If ' End Sub - - Private Sub TBPM_PROFILEBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + Private Sub TBPM_PROFILEBindingSource_ListChanged(sender As Object, e As ListChangedEventArgs) Handles TBPM_PROFILEBindingSource.ListChanged + If formloaded = False Then Exit Sub + End If + Me.TBPM_PROFILEBindingSource.EndEdit() + If DD_DMSLiteDataSet.TBPM_PROFILE.GetChanges Is Nothing = False Then + UNSAVED_CHANGES_PROFILE = True + CHECK_QUESTION_CHANGES() + End If + End Sub + 'Private Sub TBPM_PROFILEBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentChanged + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + ' Exit Sub + ' End If + ' ' change_BindingSource = True + ' ' Check_Changes() + 'End Sub + Private Sub TBPM_PROFILEBindingSource_CurrentItemChanged(sender As Object, e As EventArgs) Handles TBPM_PROFILEBindingSource.CurrentItemChanged + End Sub + Private Sub TBPM_PROFILEBindingSource_PositionChanged(sender As System.Object, e As System.EventArgs) Handles TBPM_PROFILEBindingSource.PositionChanged + If formloaded = False Then + Exit Sub + End If + If UNSAVED_CHANGES_PROFILE Then + CHECK_QUESTION_CHANGES() End If - change_BindingSource = True - ' Check_Changes() - End Sub + 'change_BindingSource = False + tsbStaticInfo.Caption = "" + Indexe_eintragen() + If tabctrl_Profilkonfig.SelectedIndex = 1 And TBPM_PROFILEBindingSource.Position <> -1 Then + Refresh_Final_indexe() + End If + End Sub Private Sub GroupBox2_Enter(sender As Object, e As EventArgs) Handles GroupBox2.Enter End Sub @@ -1689,43 +1697,45 @@ Public Class frmAdministration If IsNumeric(PROFILGUIDTextBox.Text) Then CURRENT_ProfilGUID = PROFILGUIDTextBox.Text - UNSAVED_CHANGES_PROFILE = False + 'UNSAVED_CHANGES_PROFILE = False + PROFILEBS_POS = TBPM_PROFILEBindingSource.Position + ' change_BindingSource = False End If End Sub - Private Sub TextBox_GotFocus(sender As Object, e As EventArgs) Handles NAMETextBox.GotFocus, TITLETextBox.GotFocus, DESCRIPTIONTextBox.GotFocus, WD_SEARCHTextBox.GotFocus, FINAL_TEXTTextBox.GotFocus, MOVE2FOLDERTextBox.GotFocus, - WORK_HISTORY_ENTRYTextBox.GotFocus - If formloaded = False Or UNSAVED_CHANGES_PROFILE Then - Exit Sub - End If - If change_BindingSource = True Then - Exit Sub - End If - Dim oBox As TextBox = sender - If Len(oBox.Text) > 0 Then - If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then - CURR_TEXT_CONTROL_CONTENT = oBox.Text - End If - End If - End Sub + 'Private Sub TextBox_GotFocus(sender As Object, e As EventArgs) Handles NAMETextBox.GotFocus, TITLETextBox.GotFocus, DESCRIPTIONTextBox.GotFocus, WD_SEARCHTextBox.GotFocus, FINAL_TEXTTextBox.GotFocus, MOVE2FOLDERTextBox.GotFocus, + ' WORK_HISTORY_ENTRYTextBox.GotFocus + ' If formloaded = False Or UNSAVED_CHANGES_PROFILE Then + ' Exit Sub + ' End If + ' If change_BindingSource = True Then + ' Exit Sub + ' End If + ' Dim oBox As TextBox = sender + ' If Len(oBox.Text) > 0 Then + ' If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then + ' CURR_TEXT_CONTROL_CONTENT = oBox.Text + ' End If + ' End If + 'End Sub - Private Sub TextBox_Leave(sender As Object, e As EventArgs) Handles NAMETextBox.Leave, TITLETextBox.Leave, DESCRIPTIONTextBox.Leave, WD_SEARCHTextBox.Leave, FINAL_TEXTTextBox.Leave, MOVE2FOLDERTextBox.Leave, WORK_HISTORY_ENTRYTextBox.Leave - If formloaded = False Or IsNothing(CURR_TEXT_CONTROL_CONTENT) Then - Exit Sub - End If - 'If change_BindingSource = True Then - ' Exit Sub - 'End If - Dim oBox As TextBox = sender - If Len(oBox.Text) > 0 Then + 'Private Sub TextBox_Leave(sender As Object, e As EventArgs) Handles NAMETextBox.Leave, TITLETextBox.Leave, DESCRIPTIONTextBox.Leave, WD_SEARCHTextBox.Leave, FINAL_TEXTTextBox.Leave, MOVE2FOLDERTextBox.Leave, WORK_HISTORY_ENTRYTextBox.Leave + ' If formloaded = False Or IsNothing(CURR_TEXT_CONTROL_CONTENT) Then + ' Exit Sub + ' End If + ' 'If change_BindingSource = True Then + ' ' Exit Sub + ' 'End If + ' Dim oBox As TextBox = sender + ' If Len(oBox.Text) > 0 Then - If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then - UNSAVED_CHANGES_PROFILE = True - End If - End If - End Sub + ' If CURR_TEXT_CONTROL_CONTENT <> oBox.Text Then + ' ' UNSAVED_CHANGES_PROFILE = True + ' End If + ' End If + 'End Sub Private Sub TBPM_PROFILEBindingSource_DataError(sender As Object, e As BindingManagerDataErrorEventArgs) Handles TBPM_PROFILEBindingSource.DataError @@ -1734,4 +1744,6 @@ Public Class frmAdministration Private Sub TBPM_PROFILETableAdapter_Disposed(sender As Object, e As EventArgs) Handles TBPM_PROFILETableAdapter.Disposed End Sub + + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb b/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb index a585bbc..5c4f417 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.Designer.vb @@ -65,8 +65,11 @@ Partial Class frmDesignerLayout Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(1196, 158) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(1196, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'BarListItem1 ' @@ -113,10 +116,10 @@ Partial Class frmDesignerLayout ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 598) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 601) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1196, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1196, 21) ' 'RibbonPage2 ' @@ -126,13 +129,13 @@ Partial Class frmDesignerLayout 'SplitContainerControl1 ' Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 146) Me.SplitContainerControl1.Name = "SplitContainerControl1" Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControlMain) Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl1) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1196, 440) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1196, 455) Me.SplitContainerControl1.SplitterPosition = 818 Me.SplitContainerControl1.TabIndex = 8 ' @@ -149,7 +152,7 @@ Partial Class frmDesignerLayout Me.LayoutControlMain.OptionsCustomizationForm.ShowPropertyGrid = True Me.LayoutControlMain.OptionsCustomizationForm.ShowSaveButton = False Me.LayoutControlMain.Root = Me.LayoutControlGroupMain - Me.LayoutControlMain.Size = New System.Drawing.Size(818, 440) + Me.LayoutControlMain.Size = New System.Drawing.Size(818, 455) Me.LayoutControlMain.TabIndex = 3 Me.LayoutControlMain.Text = "LayoutControl1" ' @@ -158,7 +161,7 @@ Partial Class frmDesignerLayout Me.LayoutControlGroupMain.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutControlGroupMain.GroupBordersVisible = False Me.LayoutControlGroupMain.Name = "Root" - Me.LayoutControlGroupMain.Size = New System.Drawing.Size(818, 440) + Me.LayoutControlGroupMain.Size = New System.Drawing.Size(818, 455) Me.LayoutControlGroupMain.TextVisible = False ' 'XtraTabControl1 @@ -167,7 +170,7 @@ Partial Class frmDesignerLayout Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(368, 440) + Me.XtraTabControl1.Size = New System.Drawing.Size(366, 455) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' @@ -175,7 +178,7 @@ Partial Class frmDesignerLayout ' Me.XtraTabPage1.Controls.Add(Me.PropertyGridMain) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(366, 415) + Me.XtraTabPage1.Size = New System.Drawing.Size(364, 430) Me.XtraTabPage1.Text = "Eigenschaften" ' 'PropertyGridMain @@ -185,14 +188,14 @@ Partial Class frmDesignerLayout Me.PropertyGridMain.Location = New System.Drawing.Point(0, 0) Me.PropertyGridMain.MenuManager = Me.RibbonControl1 Me.PropertyGridMain.Name = "PropertyGridMain" - Me.PropertyGridMain.Size = New System.Drawing.Size(366, 415) + Me.PropertyGridMain.Size = New System.Drawing.Size(364, 430) Me.PropertyGridMain.TabIndex = 0 ' 'XtraTabPage2 ' Me.XtraTabPage2.Controls.Add(Me.ToolboxControlMain) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(366, 415) + Me.XtraTabPage2.Size = New System.Drawing.Size(364, 415) Me.XtraTabPage2.Text = "Controls" ' 'ToolboxControlMain @@ -208,7 +211,7 @@ Partial Class frmDesignerLayout Me.ToolboxControlMain.OptionsView.ShowToolboxCaption = True Me.ToolboxControlMain.SelectedGroup = Me.ToolboxGroupMain Me.ToolboxControlMain.SelectedGroupIndex = 0 - Me.ToolboxControlMain.Size = New System.Drawing.Size(366, 415) + Me.ToolboxControlMain.Size = New System.Drawing.Size(364, 415) Me.ToolboxControlMain.TabIndex = 5 Me.ToolboxControlMain.Text = "Form Controls" ' diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index f9d33a6..7e7c983 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1567,9 +1567,10 @@ Public Class frmMain If SOURCE_INIT = True Then - Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = CURRENT_ProfilGUID" CURRENT_ProfilGUID = oProfileId - CURRENT_DT_FINAL_INDEXING = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}") + Dim oSQL = $"select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY [SEQUENCE]" + + CURRENT_DT_FINAL_INDEXING = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") CURRENT_DT_PROFILE.Clear() Dim oExpression = $"GUID = {CURRENT_ProfilGUID}" CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges) diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 79004c7..851d2c6 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -37,7 +37,7 @@ Public Class frmSQL_DESIGNER If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), "frmSQL_FINAL_INDICES_Load1") ElseIf CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then - CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") + CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0} ORDER BY T.SEQUENCE", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") ElseIf CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") End If diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index ef8362f..055f203 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -96,6 +96,7 @@ Partial Class frmValidator Me.RepositoryItemComboBox3 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.btnitemConversation_reload = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemAttmt = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPageConversations = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupConv1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -103,11 +104,10 @@ Partial Class frmValidator Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageCust = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItemAttmt = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageCust = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer2_DV_Chat.SuspendLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -458,7 +458,10 @@ Partial Class frmValidator Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'bsiError ' @@ -669,6 +672,13 @@ Partial Class frmValidator Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem5.Name = "BarButtonItem5" ' + 'BarButtonItemAttmt + ' + resources.ApplyResources(Me.BarButtonItemAttmt, "BarButtonItemAttmt") + Me.BarButtonItemAttmt.Id = 27 + Me.BarButtonItemAttmt.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemAttmt.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemAttmt.Name = "BarButtonItemAttmt" + ' 'RibbonPageConversations ' Me.RibbonPageConversations.Name = "RibbonPageConversations" @@ -720,6 +730,12 @@ Partial Class frmValidator Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' + 'RibbonPageCust + ' + Me.RibbonPageCust.ItemLinks.Add(Me.BarButtonItemAttmt) + Me.RibbonPageCust.Name = "RibbonPageCust" + Me.RibbonPageCust.Visible = False + ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.CaptionButtonVisible = DevExpress.Utils.DefaultBoolean.[True] @@ -744,19 +760,6 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'BarButtonItemAttmt - ' - resources.ApplyResources(Me.BarButtonItemAttmt, "BarButtonItemAttmt") - Me.BarButtonItemAttmt.Id = 27 - Me.BarButtonItemAttmt.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItemAttmt.Name = "BarButtonItemAttmt" - ' - 'RibbonPageCust - ' - Me.RibbonPageCust.ItemLinks.Add(Me.BarButtonItemAttmt) - Me.RibbonPageCust.Name = "RibbonPageCust" - Me.RibbonPageCust.Visible = False - ' 'frmValidator ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 220c288..366de36 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -131,6 +131,31 @@ 0, 0 + + Top, Left, Right + + + Segoe UI Symbol, 12pt, style=Bold + + + 3, 4 + + + No + + + 433, 29 + + + + 1 + + + Label1 + + + MiddleLeft + TITLELabel1 @@ -143,6 +168,30 @@ 0 + + Bottom, Left, Right + + + Tahoma, 9.75pt + + + MiddleLeft + + + 7, 459 + + + 3, 4, 3, 4 + + + 445, 50 + + + 11 + + + Validierung speichern - Nächstes Dokument + btnSave @@ -155,6 +204,21 @@ 1 + + Top, Left, Right + + + 5, 33 + + + 447, 48 + + + 1 + + + Label3 + DESCRIPTIONLabel @@ -167,6 +231,24 @@ 2 + + Top, Bottom, Left, Right + + + True + + + 8, 85 + + + 3, 4, 3, 4 + + + 444, 366 + + + 18 + pnldesigner @@ -191,7 +273,6 @@ 455, 516 - 24 @@ -336,135 +417,6 @@ 0 - - Top, Left, Right - - - Segoe UI Symbol, 12pt, style=Bold - - - 3, 4 - - - No - - - 433, 29 - - - 1 - - - Label1 - - - MiddleLeft - - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Bottom, Left, Right - - - Tahoma, 9.75pt - - - MiddleLeft - - - 7, 459 - - - 3, 4, 3, 4 - - - 445, 50 - - - 11 - - - Validierung speichern - Nächstes Dokument - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - Top, Left, Right - - - 5, 33 - - - 447, 48 - - - 1 - - - Label3 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - Top, Bottom, Left, Right - - - True - - - 8, 85 - - - 3, 4, 3, 4 - - - 444, 366 - - - 18 - - - pnldesigner - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - 17, 17 @@ -1069,7 +1021,7 @@ Anhänge - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1091,6 +1043,15 @@ 0, 0 + + Aktionen + + + Beendete Konversationen + + + Funktionen + Konversationen @@ -1722,6 +1683,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItemAttmt + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageConversations @@ -1764,6 +1731,12 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageCust + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageGroup2 @@ -1776,18 +1749,6 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItemAttmt - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageCust - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmValidator @@ -2019,39 +1980,6 @@ Zoom - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu - My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - 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 - - 10% @@ -2094,6 +2022,39 @@ sichtbare einpassen + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu + My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + 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 + + BarButtonItem1 @@ -2106,15 +2067,6 @@ 1029, 17 - - Funktionen - - - Aktionen - - - Beendete Konversationen - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 14c0897..162ae7b 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -3890,9 +3890,9 @@ Public Class frmValidator If includeFI = True Then Try - Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID} AND ACTIVE = 1" + Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID} AND ACTIVE = 1 ORDER BY SEQUENCE" Dim oDTFinalIndexing As DataTable - oDTFinalIndexing = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}") + oDTFinalIndexing = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE") If oDTFinalIndexing?.Rows.Count > 0 Then 'Jetzt finale Indexe setzen @@ -3900,7 +3900,7 @@ Public Class frmValidator For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString - + Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED")) Dim oIndexType = 0 If IDB_ACTIVE = False Then oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME")) @@ -3923,9 +3923,33 @@ Public Class frmValidator If Not IsNothing(oResultfromSQL) Then LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]") + If IsDBNull(oResultfromSQL) Then + If oContinueOnIndifferentState = False Then + errormessage = "Result from SQL is DBNull - Check the SQL and the log" + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + Else + LOGGER.Warn($"FinalIndexResult from SQL is DBNull - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") + Continue For + End If + + End If + If Len(oResultfromSQL) = 0 And oContinueOnIndifferentState = False Then + errormessage = "Result from SQL is EmptyValue - Check the SQL and the log" + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + ItemWorked = False + Else + LOGGER.Warn($"FinalIndexResult from SQL is EmptyValue - AttributeName [{oFinalIndexRow.Item("INDEXNAME")}] - oContinueOnIndifferentState = true, So continuing with next Attribute") + Continue For + End If oValue = oResultfromSQL Else - LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") + LOGGER.Warn("ATTENTION: DYNAMIC VALUE IS NOTHING!") + Continue For End If End If @@ -3944,6 +3968,7 @@ Public Class frmValidator If oErrorOcurred Then Exit For End If + Dim oResult() As String ReDim Preserve oResult(0) oResult(0) = oValue