diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb index 5c3e606..cc42c3c 100644 --- a/MultiTool.Form/DS_DD_ECM.Designer.vb +++ b/MultiTool.Form/DS_DD_ECM.Designer.vb @@ -35,18 +35,18 @@ Partial Public Class DS_DD_ECM Private tableTBEDI_XML_FUNCTIONS As TBEDI_XML_FUNCTIONSDataTable - Private relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS As Global.System.Data.DataRelation + Private tableTBEDI_XML_CONFIG As TBEDI_XML_CONFIGDataTable - Private relationTBEDI_XML_ITEMS_TBEDI_XML_NODES As Global.System.Data.DataRelation + Private relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS As Global.System.Data.DataRelation Private relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES As Global.System.Data.DataRelation Private relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES As Global.System.Data.DataRelation - Private relationFK_TBEDI_XML_NODES As Global.System.Data.DataRelation - Private relationFK_TBEDI_XML_TYPES As Global.System.Data.DataRelation + Private relationFK_TBEDI_XML_NODES As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Public ReadOnly Property TBEDI_XML_CONFIG() As TBEDI_XML_CONFIGDataTable + Get + Return Me.tableTBEDI_XML_CONFIG + End Get + End Property + _ + Private Function ShouldSerializeTBEDI_XML_CONFIG() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -445,6 +472,9 @@ Partial Public Class DS_DD_ECM _ Public Delegate Sub TBEDI_XML_FUNCTIONSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_FUNCTIONSRowChangeEvent) + _ + Public Delegate Sub TBEDI_XML_CONFIGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_CONFIGRowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -457,8 +487,6 @@ Partial Public Class DS_DD_ECM Private columnXML_NAME As Global.System.Data.DataColumn - Private columnXML_NODE_ID As Global.System.Data.DataColumn - Private columnXML_TYPE_ID As Global.System.Data.DataColumn Private columnIS_READ_ONLY As Global.System.Data.DataColumn @@ -471,6 +499,20 @@ Partial Public Class DS_DD_ECM Private columnIS_REQUIRED As Global.System.Data.DataColumn + Private columnXML_TABLE_ID As Global.System.Data.DataColumn + + Private columnIS_VIRTUAL As Global.System.Data.DataColumn + + Private columnFUNCTION_PARAMETERS As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + _ Public Sub New() @@ -522,14 +564,6 @@ Partial Public Class DS_DD_ECM End Get End Property - _ - Public ReadOnly Property XML_NODE_IDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnXML_NODE_ID - End Get - End Property - _ Public ReadOnly Property XML_TYPE_IDColumn() As Global.System.Data.DataColumn @@ -578,6 +612,62 @@ Partial Public Class DS_DD_ECM End Get End Property + _ + Public ReadOnly Property XML_TABLE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnXML_TABLE_ID + End Get + End Property + + _ + Public ReadOnly Property IS_VIRTUALColumn() As Global.System.Data.DataColumn + Get + Return Me.columnIS_VIRTUAL + End Get + End Property + + _ + Public ReadOnly Property FUNCTION_PARAMETERSColumn() As Global.System.Data.DataColumn + Get + Return Me.columnFUNCTION_PARAMETERS + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHO + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property + _ @@ -615,14 +705,14 @@ Partial Public Class DS_DD_ECM _ - Public Overloads Function AddTBEDI_XML_ITEMSRow(ByVal XML_NAME As String, ByVal parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES As TBEDI_XML_ITEMSRow, ByVal parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES As TBEDI_XML_ITEMSRow, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Integer, ByVal IS_REQUIRED As Boolean) As TBEDI_XML_ITEMSRow + Public Overloads Function AddTBEDI_XML_ITEMSRow(ByVal XML_NAME As String, ByVal parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES As TBEDI_XML_ITEMSRow, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Integer, ByVal IS_REQUIRED As Boolean, ByVal parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES As TBEDI_XML_ITEMSRow, ByVal IS_VIRTUAL As Boolean, ByVal FUNCTION_PARAMETERS As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBEDI_XML_ITEMSRow Dim rowTBEDI_XML_ITEMSRow As TBEDI_XML_ITEMSRow = CType(Me.NewRow,TBEDI_XML_ITEMSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, Nothing, Nothing, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED} - If (Not (parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES) Is Nothing) Then - columnValuesArray(2) = parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES(0) - End If + Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, Nothing, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, Nothing, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} If (Not (parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES) Is Nothing) Then - columnValuesArray(3) = parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES(0) + columnValuesArray(2) = parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES(0) + End If + If (Not (parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES) Is Nothing) Then + columnValuesArray(8) = parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_NODES(0) End If rowTBEDI_XML_ITEMSRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBEDI_XML_ITEMSRow) @@ -654,13 +744,19 @@ Partial Public Class DS_DD_ECM Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") Me.columnXML_NAME = MyBase.Columns("XML_NAME") - Me.columnXML_NODE_ID = MyBase.Columns("XML_NODE_ID") Me.columnXML_TYPE_ID = MyBase.Columns("XML_TYPE_ID") Me.columnIS_READ_ONLY = MyBase.Columns("IS_READ_ONLY") Me.columnIS_VISIBLE = MyBase.Columns("IS_VISIBLE") Me.columnORDER_KEY = MyBase.Columns("ORDER_KEY") Me.columnFUNCTION_ID = MyBase.Columns("FUNCTION_ID") Me.columnIS_REQUIRED = MyBase.Columns("IS_REQUIRED") + Me.columnXML_TABLE_ID = MyBase.Columns("XML_TABLE_ID") + Me.columnIS_VIRTUAL = MyBase.Columns("IS_VIRTUAL") + Me.columnFUNCTION_PARAMETERS = MyBase.Columns("FUNCTION_PARAMETERS") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") End Sub + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBEDI_XML_CONFIGDataTable + Inherits Global.System.Data.TypedTableBase(Of TBEDI_XML_CONFIGRow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnKEY As Global.System.Data.DataColumn + + Private columnVALUE As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBEDI_XML_CONFIG" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + 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 + + _ + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGUID + End Get + End Property + + _ + Public ReadOnly Property KEYColumn() As Global.System.Data.DataColumn + Get + Return Me.columnKEY + End Get + End Property + + _ + Public ReadOnly Property VALUEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnVALUE + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHO + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBEDI_XML_CONFIGRow + Get + Return CType(Me.Rows(index),TBEDI_XML_CONFIGRow) + End Get + End Property + + _ + Public Event TBEDI_XML_CONFIGRowChanging As TBEDI_XML_CONFIGRowChangeEventHandler + + _ + Public Event TBEDI_XML_CONFIGRowChanged As TBEDI_XML_CONFIGRowChangeEventHandler + + _ + Public Event TBEDI_XML_CONFIGRowDeleting As TBEDI_XML_CONFIGRowChangeEventHandler + + _ + Public Event TBEDI_XML_CONFIGRowDeleted As TBEDI_XML_CONFIGRowChangeEventHandler + + _ + Public Overloads Sub AddTBEDI_XML_CONFIGRow(ByVal row As TBEDI_XML_CONFIGRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBEDI_XML_CONFIGRow(ByVal KEY 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) As TBEDI_XML_CONFIGRow + Dim rowTBEDI_XML_CONFIGRow As TBEDI_XML_CONFIGRow = CType(Me.NewRow,TBEDI_XML_CONFIGRow) + Dim columnValuesArray() As Object = New Object() {Nothing, KEY, VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + rowTBEDI_XML_CONFIGRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBEDI_XML_CONFIGRow) + Return rowTBEDI_XML_CONFIGRow + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBEDI_XML_CONFIGDataTable = CType(MyBase.Clone,TBEDI_XML_CONFIGDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBEDI_XML_CONFIGDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnKEY = MyBase.Columns("KEY") + Me.columnVALUE = MyBase.Columns("VALUE") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + End Sub + + _ + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnKEY = New Global.System.Data.DataColumn("KEY", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnKEY) + Me.columnVALUE = New Global.System.Data.DataColumn("VALUE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnVALUE) + Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHO) + Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnKEY.AllowDBNull = false + Me.columnKEY.MaxLength = 100 + Me.columnVALUE.AllowDBNull = false + Me.columnVALUE.MaxLength = 500 + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + End Sub + + _ + Public Function NewTBEDI_XML_CONFIGRow() As TBEDI_XML_CONFIGRow + Return CType(Me.NewRow,TBEDI_XML_CONFIGRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBEDI_XML_CONFIGRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBEDI_XML_CONFIGRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBEDI_XML_CONFIGRowChangedEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_CONFIGRowChanged(Me, New TBEDI_XML_CONFIGRowChangeEvent(CType(e.Row,TBEDI_XML_CONFIGRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBEDI_XML_CONFIGRowChangingEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_CONFIGRowChanging(Me, New TBEDI_XML_CONFIGRowChangeEvent(CType(e.Row,TBEDI_XML_CONFIGRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBEDI_XML_CONFIGRowDeletedEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_CONFIGRowDeleted(Me, New TBEDI_XML_CONFIGRowChangeEvent(CType(e.Row,TBEDI_XML_CONFIGRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBEDI_XML_CONFIGRowDeletingEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_CONFIGRowDeleting(Me, New TBEDI_XML_CONFIGRowChangeEvent(CType(e.Row,TBEDI_XML_CONFIGRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBEDI_XML_CONFIGRow(ByVal row As TBEDI_XML_CONFIGRow) + Me.Rows.Remove(row) + End Sub + + _ + 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() + Dim ds As DS_DD_ECM = New DS_DD_ECM() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBEDI_XML_CONFIGDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -2056,17 +2511,6 @@ Partial Public Class DS_DD_ECM End Set End Property - _ - Public Property XML_NODE_ID() As Integer - Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.XML_NODE_IDColumn),Integer) - End Get - Set - Me(Me.tableTBEDI_XML_ITEMS.XML_NODE_IDColumn) = value - End Set - End Property - _ Public Property XML_TYPE_ID() As Integer @@ -2139,12 +2583,94 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRowParentByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow + Public Property XML_TABLE_ID() As Integer Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow) + Return CType(Me(Me.tableTBEDI_XML_ITEMS.XML_TABLE_IDColumn),Integer) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_NODES")) + Me(Me.tableTBEDI_XML_ITEMS.XML_TABLE_IDColumn) = value + End Set + End Property + + _ + Public Property IS_VIRTUAL() As Boolean + Get + Return CType(Me(Me.tableTBEDI_XML_ITEMS.IS_VIRTUALColumn),Boolean) + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.IS_VIRTUALColumn) = value + End Set + End Property + + _ + Public Property FUNCTION_PARAMETERS() As String + Get + Try + Return CType(Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FUNCTION_PARAMETERS in Tabelle TBEDI_XML_ITEMS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBEDI_XML_ITEMS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBEDI_XML_ITEMS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBEDI_XML_ITEMS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) = value End Set End Property @@ -2159,6 +2685,17 @@ Partial Public Class DS_DD_ECM End Set End Property + _ + Public Property TBEDI_XML_ITEMSRowParentByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_NODES")) + End Set + End Property + _ Public Function IsFUNCTION_IDNull() As Boolean @@ -2171,6 +2708,54 @@ Partial Public Class DS_DD_ECM Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsFUNCTION_PARAMETERSNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) + End Function + + _ + Public Sub SetFUNCTION_PARAMETERSNull() + Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function GetTBEDI_XML_FUNCTIONSRows() As TBEDI_XML_FUNCTIONSRow() @@ -2181,16 +2766,6 @@ Partial Public Class DS_DD_ECM End If End Function - _ - Public Function GetTBEDI_XML_NODESRows() As TBEDI_XML_NODESRow() - If (Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_NODES") Is Nothing) Then - Return New TBEDI_XML_NODESRow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("TBEDI_XML_ITEMS_TBEDI_XML_NODES")),TBEDI_XML_NODESRow()) - End If - End Function - _ Public Function GetTBEDI_XML_TYPESRows() As TBEDI_XML_TYPESRow() @@ -2201,16 +2776,6 @@ Partial Public Class DS_DD_ECM End If End Function - _ - Public Function GetTBEDI_XML_ITEMSRowsByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow() - If (Me.Table.ChildRelations("FK_TBEDI_XML_NODES") Is Nothing) Then - Return New TBEDI_XML_ITEMSRow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow()) - End If - End Function - _ Public Function GetTBEDI_XML_ITEMSRowsByFK_TBEDI_XML_TYPES() As TBEDI_XML_ITEMSRow() @@ -2220,6 +2785,16 @@ Partial Public Class DS_DD_ECM Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_ITEMSRow()) End If End Function + + _ + Public Function GetTBEDI_XML_ITEMSRowsByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow() + If (Me.Table.ChildRelations("FK_TBEDI_XML_NODES") Is Nothing) Then + Return New TBEDI_XML_ITEMSRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow()) + End If + End Function End Class ''' @@ -2406,17 +2981,6 @@ Partial Public Class DS_DD_ECM End Set End Property - _ - Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_ITEMSRow - Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow) - End Get - Set - Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_NODES")) - End Set - End Property - _ Public Function GetTBEDI_XML_TEMPLATESRows() As TBEDI_XML_TEMPLATESRow() @@ -2515,6 +3079,147 @@ Partial Public Class DS_DD_ECM End Sub End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBEDI_XML_CONFIGRow + Inherits Global.System.Data.DataRow + + Private tableTBEDI_XML_CONFIG As TBEDI_XML_CONFIGDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBEDI_XML_CONFIG = CType(Me.Table,TBEDI_XML_CONFIGDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBEDI_XML_CONFIG.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.GUIDColumn) = value + End Set + End Property + + _ + Public Property KEY() As String + Get + Return CType(Me(Me.tableTBEDI_XML_CONFIG.KEYColumn),String) + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.KEYColumn) = value + End Set + End Property + + _ + Public Property VALUE() As String + Get + Return CType(Me(Me.tableTBEDI_XML_CONFIG.VALUEColumn),String) + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.VALUEColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBEDI_XML_CONFIG.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBEDI_XML_CONFIG.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBEDI_XML_CONFIG ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBEDI_XML_CONFIG ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBEDI_XML_CONFIG ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_CONFIG.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBEDI_XML_CONFIG.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_CONFIG.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBEDI_XML_CONFIG.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBEDI_XML_CONFIG.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Row event argument class ''' @@ -2694,6 +3399,42 @@ Partial Public Class DS_DD_ECM End Get End Property End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBEDI_XML_CONFIGRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBEDI_XML_CONFIGRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBEDI_XML_CONFIGRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBEDI_XML_CONFIGRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class End Class Namespace DS_DD_ECMTableAdapters @@ -2827,13 +3568,19 @@ Namespace DS_DD_ECMTableAdapters tableMapping.DataSetTable = "TBEDI_XML_ITEMS" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("XML_NAME", "XML_NAME") - tableMapping.ColumnMappings.Add("XML_NODE_ID", "XML_NODE_ID") tableMapping.ColumnMappings.Add("XML_TYPE_ID", "XML_TYPE_ID") tableMapping.ColumnMappings.Add("IS_READ_ONLY", "IS_READ_ONLY") tableMapping.ColumnMappings.Add("IS_VISIBLE", "IS_VISIBLE") tableMapping.ColumnMappings.Add("ORDER_KEY", "ORDER_KEY") tableMapping.ColumnMappings.Add("FUNCTION_ID", "FUNCTION_ID") tableMapping.ColumnMappings.Add("IS_REQUIRED", "IS_REQUIRED") + tableMapping.ColumnMappings.Add("XML_TABLE_ID", "XML_TABLE_ID") + tableMapping.ColumnMappings.Add("IS_VIRTUAL", "IS_VIRTUAL") + tableMapping.ColumnMappings.Add("FUNCTION_PARAMETERS", "FUNCTION_PARAMETERS") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -2842,39 +3589,57 @@ Namespace DS_DD_ECMTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBEDI_XML_ITEMS] ([XML_NAME], [XML_NODE_ID], [XML_TYPE_ID], [IS_READ"& _ - "_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (@XML_NA"& _ - "ME, @XML_NODE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @ORDER_KEY, @FUNCTIO"& _ - "N_ID, @IS_REQUIRED);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_O"& _ - "NLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED FROM TBEDI_XML_ITEMS WHERE "& _ - "(GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBEDI_XML_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE"& _ + "_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], "& _ + "[FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN])"& _ + " VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_"& _ + "VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_W"& _ + "HO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY, XML_NAME"& _ + ", XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, "& _ + "FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ + "EN FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NAME", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NODE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NODE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_TABLE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_TABLE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_TYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_TYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_READ_ONLY", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_VISIBLE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_VISIBLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_REQUIRED", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_REQUIRED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_VIRTUAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_VIRTUAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_PARAMETERS", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_PARAMETERS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE TBEDI_XML_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET XML_NAME = @XML_NAME, XML_NODE_I"& _ - "D = @XML_NODE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_V"& _ - "ISIBLE = @IS_VISIBLE, ORDER_KEY = @ORDER_KEY, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" FUNCTIO"& _ - "N_ID = @FUNCTION_ID, IS_REQUIRED = @IS_REQUIRED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_"& _ - "GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIB"& _ - "LE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID"& _ - ")" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBEDI_XML_ITEMS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET ORDER_KEY = @ORDER_KEY, XML_NAME"& _ + " = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_"& _ + "ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" IS_RE"& _ + "QUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUN"& _ + "CTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @A"& _ + "DDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN ="& _ + " @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ORDER_KEY, "& _ + "XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_V"& _ + "IRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CH"& _ + "ANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NAME", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_NODE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_NODE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_TABLE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_TABLE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@XML_TYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "XML_TYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_READ_ONLY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_VISIBLE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_VISIBLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ORDER_KEY", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ORDER_KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_REQUIRED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_REQUIRED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IS_VIRTUAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "IS_VIRTUAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION_PARAMETERS", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION_PARAMETERS", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -2892,8 +3657,7 @@ Namespace DS_DD_ECMTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE,"& _ - " ORDER_KEY, FUNCTION_ID, IS_REQUIRED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_ITEMS" + Me._commandCollection(0).CommandText = "SELECT TBEDI_XML_ITEMS.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_ITEMS" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -2974,23 +3738,49 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal XML_NAME As String, ByVal XML_NODE_ID As Integer, ByVal XML_TYPE_ID As Integer, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Global.System.Nullable(Of Integer), ByVal IS_REQUIRED As Boolean) As Integer + Public Overloads Overridable Function Insert(ByVal ORDER_KEY As Integer, ByVal XML_NAME As String, ByVal XML_TABLE_ID As Integer, ByVal XML_TYPE_ID As Integer, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal IS_REQUIRED As Boolean, ByVal IS_VIRTUAL As Boolean, ByVal FUNCTION_ID As Global.System.Nullable(Of Integer), ByVal FUNCTION_PARAMETERS As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Me.Adapter.InsertCommand.Parameters(0).Value = CType(ORDER_KEY,Integer) If (XML_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("XML_NAME") Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(XML_NAME,String) + Me.Adapter.InsertCommand.Parameters(1).Value = CType(XML_NAME,String) End If - Me.Adapter.InsertCommand.Parameters(1).Value = CType(XML_NODE_ID,Integer) - Me.Adapter.InsertCommand.Parameters(2).Value = CType(XML_TYPE_ID,Integer) - Me.Adapter.InsertCommand.Parameters(3).Value = CType(IS_READ_ONLY,Boolean) - Me.Adapter.InsertCommand.Parameters(4).Value = CType(IS_VISIBLE,Boolean) - Me.Adapter.InsertCommand.Parameters(5).Value = CType(ORDER_KEY,Integer) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(XML_TABLE_ID,Integer) + Me.Adapter.InsertCommand.Parameters(3).Value = CType(XML_TYPE_ID,Integer) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(IS_READ_ONLY,Boolean) + Me.Adapter.InsertCommand.Parameters(5).Value = CType(IS_VISIBLE,Boolean) + Me.Adapter.InsertCommand.Parameters(6).Value = CType(IS_REQUIRED,Boolean) + Me.Adapter.InsertCommand.Parameters(7).Value = CType(IS_VIRTUAL,Boolean) If (FUNCTION_ID.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(6).Value = CType(FUNCTION_ID.Value,Integer) + Me.Adapter.InsertCommand.Parameters(8).Value = CType(FUNCTION_ID.Value,Integer) Else - Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + End If + If (FUNCTION_PARAMETERS Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(9).Value = CType(FUNCTION_PARAMETERS,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(10).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(11).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(11).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(12).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(13).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(13).Value = Global.System.DBNull.Value End If - Me.Adapter.InsertCommand.Parameters(7).Value = CType(IS_REQUIRED,Boolean) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -3010,25 +3800,67 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal XML_NAME As String, ByVal XML_NODE_ID As Integer, ByVal XML_TYPE_ID As Integer, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Global.System.Nullable(Of Integer), ByVal IS_REQUIRED As Boolean, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update( _ + ByVal ORDER_KEY As Integer, _ + ByVal XML_NAME As String, _ + ByVal XML_TABLE_ID As Integer, _ + ByVal XML_TYPE_ID As Integer, _ + ByVal IS_READ_ONLY As Boolean, _ + ByVal IS_VISIBLE As Boolean, _ + ByVal IS_REQUIRED As Boolean, _ + ByVal IS_VIRTUAL As Boolean, _ + ByVal FUNCTION_ID As Global.System.Nullable(Of Integer), _ + ByVal FUNCTION_PARAMETERS As String, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_GUID As Integer, _ + ByVal GUID As Integer) As Integer + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(ORDER_KEY,Integer) If (XML_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("XML_NAME") Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(XML_NAME,String) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(XML_NAME,String) End If - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(XML_NODE_ID,Integer) - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(XML_TYPE_ID,Integer) - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(IS_READ_ONLY,Boolean) - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(IS_VISIBLE,Boolean) - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ORDER_KEY,Integer) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(XML_TABLE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(XML_TYPE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(IS_READ_ONLY,Boolean) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(IS_VISIBLE,Boolean) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(IS_REQUIRED,Boolean) + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(IS_VIRTUAL,Boolean) If (FUNCTION_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(FUNCTION_ID.Value,Integer) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(FUNCTION_ID.Value,Integer) Else - Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value End If - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(IS_REQUIRED,Boolean) - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID,Integer) + If (FUNCTION_PARAMETERS Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(FUNCTION_PARAMETERS,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -4345,6 +5177,366 @@ Namespace DS_DD_ECMTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBEDI_XML_CONFIGTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + 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() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBEDI_XML_CONFIG" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("KEY", "KEY") + tableMapping.ColumnMappings.Add("VALUE", "VALUE") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBEDI_XML_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBEDI_XML_CONFIG] ([KEY], [VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANG"& _ + "ED_WHO], [CHANGED_WHEN]) VALUES (@KEY, @VALUE, @ADDED_WHO, @ADDED_WHEN, @CHANGED"& _ + "_WHO, @CHANGED_WHEN)" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@KEY", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE TBEDI_XML_CONFIG"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET [KEY] = @KEY, VALUE = @VALUE, A"& _ + "DDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHA"& _ + "NGED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@KEY", Global.System.Data.SqlDbType.NVarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "KEY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.NVarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.NVarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.MultiTool.Form.My.MySettings.Default.DD_ECMConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ + "N"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBEDI_XML_CONFIG" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DS_DD_ECM.TBEDI_XML_CONFIGDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As DS_DD_ECM.TBEDI_XML_CONFIGDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DS_DD_ECM.TBEDI_XML_CONFIGDataTable = New DS_DD_ECM.TBEDI_XML_CONFIGDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DS_DD_ECM.TBEDI_XML_CONFIGDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DS_DD_ECM) As Integer + Return Me.Adapter.Update(dataSet, "TBEDI_XML_CONFIG") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + If (KEY Is Nothing) Then + Throw New Global.System.ArgumentNullException("KEY") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(KEY,String) + End If + If (VALUE Is Nothing) Then + Throw New Global.System.ArgumentNullException("VALUE") + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(VALUE,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(2).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(5).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal KEY As String, ByVal VALUE As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer) As Integer + If (KEY Is Nothing) Then + Throw New Global.System.ArgumentNullException("KEY") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(KEY,String) + End If + If (VALUE Is Nothing) Then + Throw New Global.System.ArgumentNullException("VALUE") + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(VALUE,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -4368,6 +5560,8 @@ Namespace DS_DD_ECMTableAdapters Private _tBEDI_XML_FUNCTIONSTableAdapter As TBEDI_XML_FUNCTIONSTableAdapter + Private _tBEDI_XML_CONFIGTableAdapter As TBEDI_XML_CONFIGTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -4453,6 +5647,20 @@ Namespace DS_DD_ECMTableAdapters End Set End Property + _ + Public Property TBEDI_XML_CONFIGTableAdapter() As TBEDI_XML_CONFIGTableAdapter + Get + Return Me._tBEDI_XML_CONFIGTableAdapter + End Get + Set + Me._tBEDI_XML_CONFIGTableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -4492,6 +5700,10 @@ Namespace DS_DD_ECMTableAdapters AndAlso (Not (Me._tBEDI_XML_FUNCTIONSTableAdapter.Connection) Is Nothing)) Then Return Me._tBEDI_XML_FUNCTIONSTableAdapter.Connection End If + If ((Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBEDI_XML_CONFIGTableAdapter.Connection) Is Nothing)) Then + Return Me._tBEDI_XML_CONFIGTableAdapter.Connection + End If Return Nothing End Get Set @@ -4520,6 +5732,9 @@ Namespace DS_DD_ECMTableAdapters If (Not (Me._tBEDI_XML_FUNCTIONSTableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -4536,9 +5751,9 @@ Namespace DS_DD_ECMTableAdapters updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - Me.SortSelfReferenceRows(updatedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. Me.SortSelfReferenceRows(updatedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), false) + 'Note: More than one self-referenced relation found. The generated code may not work correctly. + Me.SortSelfReferenceRows(updatedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) result = (result + Me._tBEDI_XML_ITEMSTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If @@ -4579,6 +5794,15 @@ Namespace DS_DD_ECMTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBEDI_XML_CONFIGTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -4593,9 +5817,9 @@ Namespace DS_DD_ECMTableAdapters Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - Me.SortSelfReferenceRows(addedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. Me.SortSelfReferenceRows(addedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), false) + 'Note: More than one self-referenced relation found. The generated code may not work correctly. + Me.SortSelfReferenceRows(addedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), false) result = (result + Me._tBEDI_XML_ITEMSTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If @@ -4632,6 +5856,14 @@ Namespace DS_DD_ECMTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBEDI_XML_CONFIGTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -4642,6 +5874,14 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DS_DD_ECM, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBEDI_XML_CONFIGTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBEDI_XML_FUNCTIONSTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_FUNCTIONS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -4678,9 +5918,9 @@ Namespace DS_DD_ECMTableAdapters Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - Me.SortSelfReferenceRows(deletedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), true) - 'Note: More than one self-referenced relation found. The generated code may not work correctly. Me.SortSelfReferenceRows(deletedRows, dataSet.Relations("FK_TBEDI_XML_TYPES"), true) + 'Note: More than one self-referenced relation found. The generated code may not work correctly. + Me.SortSelfReferenceRows(deletedRows, dataSet.Relations("FK_TBEDI_XML_NODES"), true) result = (result + Me._tBEDI_XML_ITEMSTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If @@ -4751,6 +5991,11 @@ Namespace DS_DD_ECMTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBEDI_XML_CONFIGTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -4830,6 +6075,15 @@ Namespace DS_DD_ECMTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_FUNCTIONSTableAdapter.Adapter) End If End If + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBEDI_XML_CONFIGTableAdapter, Me._tBEDI_XML_CONFIGTableAdapter.Connection) + Me._tBEDI_XML_CONFIGTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBEDI_XML_CONFIGTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBEDI_XML_CONFIGTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBEDI_XML_CONFIGTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_CONFIGTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -4910,6 +6164,10 @@ Namespace DS_DD_ECMTableAdapters Me._tBEDI_XML_FUNCTIONSTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_FUNCTIONSTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBEDI_XML_FUNCTIONSTableAdapter.Transaction = Nothing End If + If (Not (Me._tBEDI_XML_CONFIGTableAdapter) Is Nothing) Then + Me._tBEDI_XML_CONFIGTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_CONFIGTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBEDI_XML_CONFIGTableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd index 87d1731..79f774d 100644 --- a/MultiTool.Form/DS_DD_ECM.xsd +++ b/MultiTool.Form/DS_DD_ECM.xsd @@ -21,23 +21,29 @@ WHERE (GUID = @Original_GUID) - INSERT INTO [TBEDI_XML_ITEMS] ([XML_NAME], [XML_NODE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (@XML_NAME, @XML_NODE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @ORDER_KEY, @FUNCTION_ID, @IS_REQUIRED); -SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBEDI_XML_ITEMS] ([ORDER_KEY], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [IS_REQUIRED], [IS_VIRTUAL], [FUNCTION_ID], [FUNCTION_PARAMETERS], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@ORDER_KEY, @XML_NAME, @XML_TABLE_ID, @XML_TYPE_ID, @IS_READ_ONLY, @IS_VISIBLE, @IS_REQUIRED, @IS_VIRTUAL, @FUNCTION_ID, @FUNCTION_PARAMETERS, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); +SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = SCOPE_IDENTITY()) + - + - - + + + + + + + - SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED + SELECT TBEDI_XML_ITEMS.* FROM TBEDI_XML_ITEMS @@ -45,19 +51,26 @@ FROM TBEDI_XML_ITEMS UPDATE TBEDI_XML_ITEMS -SET XML_NAME = @XML_NAME, XML_NODE_ID = @XML_NODE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, ORDER_KEY = @ORDER_KEY, - FUNCTION_ID = @FUNCTION_ID, IS_REQUIRED = @IS_REQUIRED +SET ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, + IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, + CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN WHERE (GUID = @Original_GUID); -SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID) +SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEDI_XML_ITEMS WHERE (GUID = @GUID) + - + - - + + + + + + + @@ -68,13 +81,19 @@ SELECT GUID, XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER - + + + + + + + @@ -281,6 +300,67 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID + + + + + + DELETE FROM TBEDI_XML_CONFIG +WHERE (GUID = @Original_GUID) + + + + + + + + INSERT INTO [TBEDI_XML_CONFIG] ([KEY], [VALUE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@KEY, @VALUE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN) + + + + + + + + + + + + + SELECT GUID, [KEY], VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBEDI_XML_CONFIG + + + + + + UPDATE TBEDI_XML_CONFIG +SET [KEY] = @KEY, VALUE = @VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN +WHERE (GUID = @Original_GUID) + + + + + + + + + + + + + + + + + + + + + + + + @@ -289,7 +369,7 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - + @@ -300,17 +380,41 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -324,7 +428,7 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - + @@ -345,7 +449,7 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - + @@ -361,7 +465,7 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - + @@ -389,6 +493,43 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -414,12 +555,11 @@ SELECT GUID, NAME, DESCRIPTION, PARAMETERS FROM TBEDI_XML_FUNCTIONS WHERE (GUID - - - - - - + + + + + \ No newline at end of file diff --git a/MultiTool.Form/DS_DD_ECM.xss b/MultiTool.Form/DS_DD_ECM.xss index e7b7171..1e1348a 100644 --- a/MultiTool.Form/DS_DD_ECM.xss +++ b/MultiTool.Form/DS_DD_ECM.xss @@ -4,20 +4,21 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + + 240 - 256 + 313 240 @@ -29,19 +30,7 @@ - - - - 257 - 85 - - - 513 - 85 - - - - + 257 @@ -53,7 +42,7 @@ - + 770 @@ -65,50 +54,50 @@ - + 5 - 25 + 33 - -25 - 25 + -33 + 33 - -25 - -22 + -33 + -30 - 22 - -22 + 30 + -30 - 22 + 30 8 - + 5 - 33 + 41 - -33 - 33 + -41 + 41 - -33 - -30 + -41 + -38 - 30 - -30 + 38 + -38 - 30 + 38 8 diff --git a/MultiTool.Form/Reports/OrderReport.Designer.vb b/MultiTool.Form/Reports/OrderReport.Designer.vb index 4700d4e..d2b671a 100644 --- a/MultiTool.Form/Reports/OrderReport.Designer.vb +++ b/MultiTool.Form/Reports/OrderReport.Designer.vb @@ -70,7 +70,6 @@ Partial Public Class OrderReport Me.tableCell35 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell36 = New DevExpress.XtraReports.UI.XRTableCell() Me.XrTableCell7 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell37 = New DevExpress.XtraReports.UI.XRTableCell() Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand() Me.XrLabel3 = New DevExpress.XtraReports.UI.XRLabel() Me.table4 = New DevExpress.XtraReports.UI.XRTable() @@ -84,10 +83,13 @@ Partial Public Class OrderReport Me.tableCell45 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell() Me.XrTableCell8 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell47 = New DevExpress.XtraReports.UI.XRTableCell() Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand() Me.label2 = New DevExpress.XtraReports.UI.XRLabel() Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) + Me.XrTableCell15 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell16 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell17 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell() CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -254,7 +256,7 @@ Partial Public Class OrderReport 'XrLabel4 ' Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Filename]")}) - Me.XrLabel4.Font = New System.Drawing.Font("Arial", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel4.Font = New System.Drawing.Font("Arial", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(652.6498!, 10.00001!) Me.XrLabel4.Multiline = True Me.XrLabel4.Name = "XrLabel4" @@ -447,6 +449,7 @@ Partial Public Class OrderReport Me.GroupHeader2.HeightF = 28.0! Me.GroupHeader2.Level = 1 Me.GroupHeader2.Name = "GroupHeader2" + Me.GroupHeader2.RepeatEveryPage = True ' 'table3 ' @@ -457,7 +460,7 @@ Partial Public Class OrderReport ' 'tableRow4 ' - Me.tableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell29, Me.tableCell30, Me.tableCell31, Me.XrTableCell13, Me.tableCell33, Me.tableCell34, Me.tableCell35, Me.tableCell36, Me.XrTableCell7, Me.tableCell37}) + Me.tableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell29, Me.tableCell30, Me.tableCell31, Me.XrTableCell13, Me.tableCell33, Me.XrTableCell15, Me.tableCell34, Me.tableCell35, Me.XrTableCell17, Me.tableCell36, Me.XrTableCell7}) Me.tableRow4.Name = "tableRow4" Me.tableRow4.Weight = 1.0R ' @@ -467,7 +470,9 @@ Partial Public Class OrderReport Me.tableCell29.Name = "tableCell29" Me.tableCell29.StyleName = "DetailCaption2" Me.tableCell29.StylePriority.UseBorders = False + Me.tableCell29.StylePriority.UseTextAlignment = False Me.tableCell29.Text = "Nr." + Me.tableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft Me.tableCell29.Weight = 0.048043450056698064R ' 'tableCell30 @@ -492,15 +497,15 @@ Partial Public Class OrderReport Me.XrTableCell13.Name = "XrTableCell13" Me.XrTableCell13.StyleName = "DetailCaption2" Me.XrTableCell13.Text = "Bezeichnung" - Me.XrTableCell13.Weight = 0.33636051965423341R + Me.XrTableCell13.Weight = 0.43277591630319839R ' 'tableCell33 ' Me.tableCell33.Multiline = True Me.tableCell33.Name = "tableCell33" Me.tableCell33.StyleName = "DetailCaption2" - Me.tableCell33.Text = "Menge " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "bestellt" - Me.tableCell33.Weight = 0.079624397816746934R + Me.tableCell33.Text = "Lager" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "stand" + Me.tableCell33.Weight = 0.085275647971440827R ' 'tableCell34 ' @@ -508,36 +513,29 @@ Partial Public Class OrderReport Me.tableCell34.Name = "tableCell34" Me.tableCell34.StyleName = "DetailCaption2" Me.tableCell34.Text = "Menge" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "geliefert" - Me.tableCell34.Weight = 0.081859175152859093R + Me.tableCell34.Weight = 0.092676520384650948R ' 'tableCell35 ' Me.tableCell35.Name = "tableCell35" Me.tableCell35.StyleName = "DetailCaption2" Me.tableCell35.Text = "Colli" - Me.tableCell35.Weight = 0.0763367774354287R + Me.tableCell35.Weight = 0.089275021139650343R ' 'tableCell36 ' Me.tableCell36.Name = "tableCell36" Me.tableCell36.StyleName = "DetailCaption2" Me.tableCell36.Text = "EDI Preis" - Me.tableCell36.Weight = 0.12804829712156557R + Me.tableCell36.Weight = 0.1068769905572312R ' 'XrTableCell7 ' Me.XrTableCell7.Multiline = True Me.XrTableCell7.Name = "XrTableCell7" Me.XrTableCell7.StyleName = "DetailCaption2" - Me.XrTableCell7.Text = "DFÜ Preis" - Me.XrTableCell7.Weight = 0.12804829712156557R - ' - 'tableCell37 - ' - Me.tableCell37.Name = "tableCell37" - Me.tableCell37.StyleName = "DetailCaption2" - Me.tableCell37.Text = "Steuer" - Me.tableCell37.Weight = 0.068250408158832127R + Me.XrTableCell7.Text = "Winline Preis" + Me.XrTableCell7.Weight = 0.089264113872917938R ' 'Detail1 ' @@ -566,7 +564,7 @@ Partial Public Class OrderReport ' 'tableRow5 ' - Me.tableRow5.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell39, Me.tableCell40, Me.tableCell41, Me.XrTableCell14, Me.tableCell43, Me.tableCell44, Me.tableCell45, Me.tableCell46, Me.XrTableCell8, Me.tableCell47}) + Me.tableRow5.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell39, Me.tableCell40, Me.tableCell41, Me.XrTableCell14, Me.tableCell43, Me.XrTableCell16, Me.tableCell44, Me.tableCell45, Me.XrTableCell18, Me.tableCell46, Me.XrTableCell8}) Me.tableRow5.Name = "tableRow5" Me.tableRow5.Weight = 11.5R ' @@ -577,6 +575,8 @@ Partial Public Class OrderReport Me.tableCell39.Name = "tableCell39" Me.tableCell39.StyleName = "DetailData2" Me.tableCell39.StylePriority.UseBorders = False + Me.tableCell39.StylePriority.UseTextAlignment = False + Me.tableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight Me.tableCell39.Weight = 0.048043450128467058R ' 'tableCell40 @@ -600,28 +600,34 @@ Partial Public Class OrderReport Me.XrTableCell14.Name = "XrTableCell14" Me.XrTableCell14.StyleName = "DetailData2" Me.XrTableCell14.Text = "XrTableCell14" - Me.XrTableCell14.Weight = 0.33636054406554738R + Me.XrTableCell14.Weight = 0.43277581496133744R ' 'tableCell43 ' - Me.tableCell43.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text4]")}) + Me.tableCell43.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text10]")}) Me.tableCell43.Name = "tableCell43" Me.tableCell43.StyleName = "DetailData2" - Me.tableCell43.Weight = 0.079624397542049044R + Me.tableCell43.StylePriority.UseTextAlignment = False + Me.tableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.tableCell43.Weight = 0.085275553474624122R ' 'tableCell44 ' Me.tableCell44.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text5]")}) Me.tableCell44.Name = "tableCell44" Me.tableCell44.StyleName = "DetailData2" - Me.tableCell44.Weight = 0.081859113670350772R + Me.tableCell44.StylePriority.UseTextAlignment = False + Me.tableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.tableCell44.Weight = 0.092676747474094323R ' 'tableCell45 ' Me.tableCell45.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text6]")}) Me.tableCell45.Name = "tableCell45" Me.tableCell45.StyleName = "DetailData2" - Me.tableCell45.Weight = 0.076336839401331791R + Me.tableCell45.StylePriority.UseTextAlignment = False + Me.tableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.tableCell45.Weight = 0.08927502299934123R ' 'tableCell46 ' @@ -629,24 +635,20 @@ Partial Public Class OrderReport Me.tableCell46.Multiline = True Me.tableCell46.Name = "tableCell46" Me.tableCell46.StyleName = "DetailData2" - Me.tableCell46.Weight = 0.12804829751327446R + Me.tableCell46.StylePriority.UseTextAlignment = False + Me.tableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.tableCell46.Weight = 0.10687685857819911R ' 'XrTableCell8 ' - Me.XrTableCell8.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text8]")}) + Me.XrTableCell8.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text8]"), New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "ForeColor", "Iif([Text7]==[Text8], 'Black','LightCoral' )")}) Me.XrTableCell8.Multiline = True Me.XrTableCell8.Name = "XrTableCell8" Me.XrTableCell8.StyleName = "DetailData2" + Me.XrTableCell8.StylePriority.UseTextAlignment = False Me.XrTableCell8.Text = "XrTableCell8" - Me.XrTableCell8.Weight = 0.12804829751327446R - ' - 'tableCell47 - ' - Me.tableCell47.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text9]")}) - Me.tableCell47.Name = "tableCell47" - Me.tableCell47.StyleName = "DetailData2" - Me.tableCell47.TextFormatString = "{0:0%}" - Me.tableCell47.Weight = 0.068250408205432642R + Me.XrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.XrTableCell8.Weight = 0.089263976911086243R ' 'GroupFooter1 ' @@ -669,6 +671,44 @@ Partial Public Class OrderReport Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource) Me.ObjectDataSource1.Name = "ObjectDataSource1" ' + 'XrTableCell15 + ' + Me.XrTableCell15.Multiline = True + Me.XrTableCell15.Name = "XrTableCell15" + Me.XrTableCell15.StyleName = "DetailCaption2" + Me.XrTableCell15.Text = "Menge " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "bestellt" + Me.XrTableCell15.Weight = 0.082007817175517708R + ' + 'XrTableCell16 + ' + Me.XrTableCell16.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text4]")}) + Me.XrTableCell16.Multiline = True + Me.XrTableCell16.Name = "XrTableCell16" + Me.XrTableCell16.StyleName = "DetailData2" + Me.XrTableCell16.StylePriority.UseTextAlignment = False + Me.XrTableCell16.Text = "XrTableCell16" + Me.XrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.XrTableCell16.Weight = 0.082007801747328815R + ' + 'XrTableCell17 + ' + Me.XrTableCell17.Multiline = True + Me.XrTableCell17.Name = "XrTableCell17" + Me.XrTableCell17.StyleName = "DetailCaption2" + Me.XrTableCell17.Text = "Einh/Pal" + Me.XrTableCell17.Weight = 0.089275021139650343R + ' + 'XrTableCell18 + ' + Me.XrTableCell18.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text9]")}) + Me.XrTableCell18.Multiline = True + Me.XrTableCell18.Name = "XrTableCell18" + Me.XrTableCell18.StyleName = "DetailData2" + Me.XrTableCell18.StylePriority.UseTextAlignment = False + Me.XrTableCell18.Text = "XrTableCell18" + Me.XrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight + Me.XrTableCell18.Weight = 0.08927502299934123R + ' 'OrderReport ' Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport}) @@ -718,7 +758,6 @@ Partial Public Class OrderReport Friend WithEvents tableCell34 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell35 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell36 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell37 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand Friend WithEvents table4 As DevExpress.XtraReports.UI.XRTable Friend WithEvents tableRow5 As DevExpress.XtraReports.UI.XRTableRow @@ -729,7 +768,6 @@ Partial Public Class OrderReport Friend WithEvents tableCell44 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell45 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell46 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell47 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents GroupFooter1 As DevExpress.XtraReports.UI.GroupFooterBand Friend WithEvents label2 As DevExpress.XtraReports.UI.XRLabel Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel @@ -758,4 +796,8 @@ Partial Public Class OrderReport Friend WithEvents XrTableCell11 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents XrTableCell12 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrTableCell15 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell16 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell17 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrTableCell18 As DevExpress.XtraReports.UI.XRTableCell End Class diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index 560188c..c8ff012 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -25,48 +25,23 @@ Partial Class frmConfig Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig)) - Me.ToolbarFormManager1 = New DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(Me.components) - Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() - Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.tabPageBasic = New DevExpress.XtraTab.XtraTabPage() - Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.txtBaseURL = New DevExpress.XtraEditors.TextEdit() - Me.txtUsername = New DevExpress.XtraEditors.TextEdit() - Me.txtPassword = New DevExpress.XtraEditors.TextEdit() - Me.txtImportBasePath = New DevExpress.XtraEditors.TextEdit() - Me.txtImportRelativePath = New DevExpress.XtraEditors.TextEdit() - Me.txtInputDir = New DevExpress.XtraEditors.TextEdit() - Me.txtOutputDir = New DevExpress.XtraEditors.TextEdit() - Me.txtSchemaDir = New DevExpress.XtraEditors.TextEdit() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.TabbedControlGroup1 = New DevExpress.XtraLayout.TabbedControlGroup() - Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.tabPageSchema = New DevExpress.XtraTab.XtraTabPage() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TBEDIXMLITEMSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DS_DD_ECM = New MultiTool.Form.DS_DD_ECM() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_NAME = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_NODE_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colXML_TYPE_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colORDER_KEY = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_VISIBLE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colIS_REQUIRED = New DevExpress.XtraGrid.Columns.GridColumn() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.TBEDI_XML_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colGUID1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colKEY = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colVALUE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -74,305 +49,52 @@ Partial Class frmConfig Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.TBEDI_XML_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBEDI_XML_ITEMSTableAdapter() - CType(Me.ToolbarFormManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TBEDI_XML_CONFIGTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBEDI_XML_CONFIGTableAdapter() + Me.TableAdapterManager = New MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager() + Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_NAME = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_TYPE_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_VISIBLE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colORDER_KEY = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_REQUIRED = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colXML_TABLE_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colIS_VIRTUAL = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colFUNCTION_PARAMETERS = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCHANGED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() - Me.tabPageBasic.SuspendLayout() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl1.SuspendLayout() - CType(Me.txtBaseURL.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtUsername.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtImportBasePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtInputDir.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtOutputDir.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtSchemaDir.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TabbedControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() Me.tabPageSchema.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage1.SuspendLayout() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBEDI_XML_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'ToolbarFormManager1 - ' - Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlTop) - Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlBottom) - Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlLeft) - Me.ToolbarFormManager1.DockControls.Add(Me.barDockControlRight) - Me.ToolbarFormManager1.Form = Me - ' - 'barDockControlTop - ' - Me.barDockControlTop.CausesValidation = False - Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top - Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) - Me.barDockControlTop.Manager = Me.ToolbarFormManager1 - Me.barDockControlTop.Size = New System.Drawing.Size(832, 0) - ' - 'barDockControlBottom - ' - Me.barDockControlBottom.CausesValidation = False - Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.barDockControlBottom.Location = New System.Drawing.Point(0, 509) - Me.barDockControlBottom.Manager = Me.ToolbarFormManager1 - Me.barDockControlBottom.Size = New System.Drawing.Size(832, 0) - ' - 'barDockControlLeft - ' - Me.barDockControlLeft.CausesValidation = False - Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) - Me.barDockControlLeft.Manager = Me.ToolbarFormManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 509) - ' - 'barDockControlRight - ' - Me.barDockControlRight.CausesValidation = False - Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right - Me.barDockControlRight.Location = New System.Drawing.Point(832, 0) - Me.barDockControlRight.Manager = Me.ToolbarFormManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 509) - ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControl1.Location = New System.Drawing.Point(0, 63) Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.tabPageBasic - Me.XtraTabControl1.Size = New System.Drawing.Size(832, 422) + Me.XtraTabControl1.SelectedTabPage = Me.tabPageSchema + Me.XtraTabControl1.Size = New System.Drawing.Size(1093, 571) Me.XtraTabControl1.TabIndex = 1 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageBasic, Me.tabPageSchema}) - ' - 'tabPageBasic - ' - Me.tabPageBasic.Controls.Add(Me.LayoutControl1) - Me.tabPageBasic.Name = "tabPageBasic" - Me.tabPageBasic.Size = New System.Drawing.Size(830, 397) - Me.tabPageBasic.Text = "Basis" - ' - 'LayoutControl1 - ' - Me.LayoutControl1.Controls.Add(Me.txtBaseURL) - Me.LayoutControl1.Controls.Add(Me.txtUsername) - Me.LayoutControl1.Controls.Add(Me.txtPassword) - Me.LayoutControl1.Controls.Add(Me.txtImportBasePath) - Me.LayoutControl1.Controls.Add(Me.txtImportRelativePath) - Me.LayoutControl1.Controls.Add(Me.txtInputDir) - Me.LayoutControl1.Controls.Add(Me.txtOutputDir) - Me.LayoutControl1.Controls.Add(Me.txtSchemaDir) - Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(830, 397) - Me.LayoutControl1.TabIndex = 0 - Me.LayoutControl1.Text = "LayoutControl1" - ' - 'txtBaseURL - ' - Me.txtBaseURL.Location = New System.Drawing.Point(133, 50) - Me.txtBaseURL.MenuManager = Me.ToolbarFormManager1 - Me.txtBaseURL.Name = "txtBaseURL" - Me.txtBaseURL.Size = New System.Drawing.Size(670, 20) - Me.txtBaseURL.StyleController = Me.LayoutControl1 - Me.txtBaseURL.TabIndex = 4 - ' - 'txtUsername - ' - Me.txtUsername.Location = New System.Drawing.Point(133, 80) - Me.txtUsername.MenuManager = Me.ToolbarFormManager1 - Me.txtUsername.Name = "txtUsername" - Me.txtUsername.Size = New System.Drawing.Size(277, 20) - Me.txtUsername.StyleController = Me.LayoutControl1 - Me.txtUsername.TabIndex = 5 - ' - 'txtPassword - ' - Me.txtPassword.Location = New System.Drawing.Point(526, 80) - Me.txtPassword.MenuManager = Me.ToolbarFormManager1 - Me.txtPassword.Name = "txtPassword" - Me.txtPassword.Size = New System.Drawing.Size(277, 20) - Me.txtPassword.StyleController = Me.LayoutControl1 - Me.txtPassword.TabIndex = 6 - ' - 'txtImportBasePath - ' - Me.txtImportBasePath.Location = New System.Drawing.Point(133, 110) - Me.txtImportBasePath.MenuManager = Me.ToolbarFormManager1 - Me.txtImportBasePath.Name = "txtImportBasePath" - Me.txtImportBasePath.Size = New System.Drawing.Size(670, 20) - Me.txtImportBasePath.StyleController = Me.LayoutControl1 - Me.txtImportBasePath.TabIndex = 7 - ' - 'txtImportRelativePath - ' - Me.txtImportRelativePath.Location = New System.Drawing.Point(133, 140) - Me.txtImportRelativePath.MenuManager = Me.ToolbarFormManager1 - Me.txtImportRelativePath.Name = "txtImportRelativePath" - Me.txtImportRelativePath.Size = New System.Drawing.Size(670, 20) - Me.txtImportRelativePath.StyleController = Me.LayoutControl1 - Me.txtImportRelativePath.TabIndex = 8 - ' - 'txtInputDir - ' - Me.txtInputDir.Location = New System.Drawing.Point(133, 50) - Me.txtInputDir.MenuManager = Me.ToolbarFormManager1 - Me.txtInputDir.Name = "txtInputDir" - Me.txtInputDir.Size = New System.Drawing.Size(670, 20) - Me.txtInputDir.StyleController = Me.LayoutControl1 - Me.txtInputDir.TabIndex = 9 - ' - 'txtOutputDir - ' - Me.txtOutputDir.Location = New System.Drawing.Point(133, 80) - Me.txtOutputDir.MenuManager = Me.ToolbarFormManager1 - Me.txtOutputDir.Name = "txtOutputDir" - Me.txtOutputDir.Size = New System.Drawing.Size(670, 20) - Me.txtOutputDir.StyleController = Me.LayoutControl1 - Me.txtOutputDir.TabIndex = 10 - ' - 'txtSchemaDir - ' - Me.txtSchemaDir.Location = New System.Drawing.Point(133, 110) - Me.txtSchemaDir.MenuManager = Me.ToolbarFormManager1 - Me.txtSchemaDir.Name = "txtSchemaDir" - Me.txtSchemaDir.Size = New System.Drawing.Size(670, 20) - Me.txtSchemaDir.StyleController = Me.LayoutControl1 - Me.txtSchemaDir.TabIndex = 11 - ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.TabbedControlGroup1}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(830, 397) - Me.Root.TextVisible = False - ' - 'TabbedControlGroup1 - ' - Me.TabbedControlGroup1.Location = New System.Drawing.Point(0, 0) - Me.TabbedControlGroup1.Name = "TabbedControlGroup1" - Me.TabbedControlGroup1.SelectedTabPage = Me.LayoutControlGroup2 - Me.TabbedControlGroup1.Size = New System.Drawing.Size(810, 377) - Me.TabbedControlGroup1.TabPages.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup2, Me.LayoutControlGroup1}) - ' - 'LayoutControlGroup2 - ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem7, Me.LayoutControlItem8}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(786, 330) - Me.LayoutControlGroup2.Text = "Verzeichnisse" - ' - 'LayoutControlItem4 - ' - Me.LayoutControlItem4.Control = Me.txtInputDir - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem4.Size = New System.Drawing.Size(786, 30) - Me.LayoutControlItem4.Text = "Eingangsverzeichnis" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem7 - ' - Me.LayoutControlItem7.Control = Me.txtOutputDir - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem7.Size = New System.Drawing.Size(786, 30) - Me.LayoutControlItem7.Text = "Ausgangsverzeichnis" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.txtSchemaDir - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 60) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(786, 270) - Me.LayoutControlItem8.Text = "Vorlagenverzeichnis" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlGroup1 - ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutControlItem1, Me.LayoutControlItem3}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(786, 330) - Me.LayoutControlGroup1.Text = "WebService" - ' - 'LayoutControlItem6 - ' - Me.LayoutControlItem6.Control = Me.txtImportRelativePath - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 90) - Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(786, 240) - Me.LayoutControlItem6.Text = "Import Relativer Pfad" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem5 - ' - Me.LayoutControlItem5.Control = Me.txtImportBasePath - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 60) - Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem5.Size = New System.Drawing.Size(786, 30) - Me.LayoutControlItem5.Text = "Import Basis Pfad" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.txtUsername - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(393, 30) - Me.LayoutControlItem2.Text = "Username" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem1 - ' - Me.LayoutControlItem1.Control = Me.txtBaseURL - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem1.Size = New System.Drawing.Size(786, 30) - Me.LayoutControlItem1.Text = "BaseURL" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(103, 13) - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.Control = Me.txtPassword - Me.LayoutControlItem3.Location = New System.Drawing.Point(393, 30) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(393, 30) - Me.LayoutControlItem3.Text = "Password" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(103, 13) + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.tabPageSchema, Me.XtraTabPage1}) ' 'tabPageSchema ' Me.tabPageSchema.Controls.Add(Me.GridControl1) Me.tabPageSchema.Name = "tabPageSchema" - Me.tabPageSchema.Size = New System.Drawing.Size(830, 397) + Me.tabPageSchema.Size = New System.Drawing.Size(1091, 546) Me.tabPageSchema.Text = "Schema" ' 'GridControl1 @@ -381,9 +103,8 @@ Partial Class frmConfig Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControl1.Location = New System.Drawing.Point(0, 0) Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.MenuManager = Me.ToolbarFormManager1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(830, 397) + Me.GridControl1.Size = New System.Drawing.Size(1091, 546) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -399,78 +120,88 @@ Partial Class frmConfig ' 'GridView1 ' - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_NODE_ID, Me.colXML_TYPE_ID, Me.colORDER_KEY, Me.colFUNCTION_ID, Me.colIS_VISIBLE, Me.colIS_READ_ONLY, Me.colIS_REQUIRED}) + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colFUNCTION_ID, Me.colIS_REQUIRED, Me.colXML_TABLE_ID, Me.colIS_VIRTUAL, Me.colFUNCTION_PARAMETERS, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1}) Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.GroupCount = 1 Me.GridView1.Name = "GridView1" - Me.GridView1.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colXML_NODE_ID, DevExpress.Data.ColumnSortOrder.Ascending)}) ' - 'colGUID + 'XtraTabPage1 ' - Me.colGUID.FieldName = "GUID" - Me.colGUID.Name = "colGUID" - Me.colGUID.Visible = True - Me.colGUID.VisibleIndex = 0 + Me.XtraTabPage1.Controls.Add(Me.GridControl2) + Me.XtraTabPage1.Name = "XtraTabPage1" + Me.XtraTabPage1.Size = New System.Drawing.Size(1091, 546) + Me.XtraTabPage1.Text = "XtraTabPage1" ' - 'colXML_NAME + 'GridControl2 ' - Me.colXML_NAME.FieldName = "XML_NAME" - Me.colXML_NAME.Name = "colXML_NAME" - Me.colXML_NAME.Visible = True - Me.colXML_NAME.VisibleIndex = 1 + Me.GridControl2.DataSource = Me.TBEDI_XML_CONFIGBindingSource + Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl2.Location = New System.Drawing.Point(0, 0) + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.MenuManager = Me.RibbonControl1 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(1091, 546) + Me.GridControl2.TabIndex = 0 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' - 'colXML_NODE_ID + 'TBEDI_XML_CONFIGBindingSource ' - Me.colXML_NODE_ID.Caption = "Tabelle" - Me.colXML_NODE_ID.FieldName = "XML_NODE_ID" - Me.colXML_NODE_ID.Name = "colXML_NODE_ID" - Me.colXML_NODE_ID.Visible = True - Me.colXML_NODE_ID.VisibleIndex = 2 + Me.TBEDI_XML_CONFIGBindingSource.DataMember = "TBEDI_XML_CONFIG" + Me.TBEDI_XML_CONFIGBindingSource.DataSource = Me.DS_DD_ECM ' - 'colXML_TYPE_ID + 'GridView2 ' - Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" - Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" - Me.colXML_TYPE_ID.Visible = True - Me.colXML_TYPE_ID.VisibleIndex = 2 + Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID1, Me.colKEY, Me.colVALUE, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN}) + Me.GridView2.GridControl = Me.GridControl2 + Me.GridView2.Name = "GridView2" ' - 'colORDER_KEY + 'colGUID1 ' - Me.colORDER_KEY.FieldName = "ORDER_KEY" - Me.colORDER_KEY.Name = "colORDER_KEY" - Me.colORDER_KEY.Visible = True - Me.colORDER_KEY.VisibleIndex = 3 + Me.colGUID1.FieldName = "GUID" + Me.colGUID1.Name = "colGUID1" + Me.colGUID1.Visible = True + Me.colGUID1.VisibleIndex = 0 ' - 'colFUNCTION_ID + 'colKEY ' - Me.colFUNCTION_ID.FieldName = "FUNCTION_ID" - Me.colFUNCTION_ID.Name = "colFUNCTION_ID" - Me.colFUNCTION_ID.Visible = True - Me.colFUNCTION_ID.VisibleIndex = 4 + Me.colKEY.FieldName = "KEY" + Me.colKEY.Name = "colKEY" + Me.colKEY.Visible = True + Me.colKEY.VisibleIndex = 1 ' - 'colIS_VISIBLE + 'colVALUE ' - Me.colIS_VISIBLE.Caption = "Visible?" - Me.colIS_VISIBLE.FieldName = "IS_VISIBLE" - Me.colIS_VISIBLE.Name = "colIS_VISIBLE" - Me.colIS_VISIBLE.Visible = True - Me.colIS_VISIBLE.VisibleIndex = 6 + Me.colVALUE.FieldName = "VALUE" + Me.colVALUE.Name = "colVALUE" + Me.colVALUE.Visible = True + Me.colVALUE.VisibleIndex = 2 ' - 'colIS_READ_ONLY + 'colADDED_WHO ' - Me.colIS_READ_ONLY.Caption = "ReadOnly?" - Me.colIS_READ_ONLY.FieldName = "IS_READ_ONLY" - Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY" - Me.colIS_READ_ONLY.Visible = True - Me.colIS_READ_ONLY.VisibleIndex = 5 + Me.colADDED_WHO.FieldName = "ADDED_WHO" + Me.colADDED_WHO.Name = "colADDED_WHO" + Me.colADDED_WHO.Visible = True + Me.colADDED_WHO.VisibleIndex = 3 ' - 'colIS_REQUIRED + 'colADDED_WHEN ' - Me.colIS_REQUIRED.Caption = "Required?" - Me.colIS_REQUIRED.FieldName = "IS_REQUIRED" - Me.colIS_REQUIRED.Name = "colIS_REQUIRED" - Me.colIS_REQUIRED.Visible = True - Me.colIS_REQUIRED.VisibleIndex = 7 + Me.colADDED_WHEN.FieldName = "ADDED_WHEN" + Me.colADDED_WHEN.Name = "colADDED_WHEN" + Me.colADDED_WHEN.Visible = True + Me.colADDED_WHEN.VisibleIndex = 4 + ' + 'colCHANGED_WHO + ' + Me.colCHANGED_WHO.FieldName = "CHANGED_WHO" + Me.colCHANGED_WHO.Name = "colCHANGED_WHO" + Me.colCHANGED_WHO.Visible = True + Me.colCHANGED_WHO.VisibleIndex = 5 + ' + 'colCHANGED_WHEN + ' + Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN" + Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN" + Me.colCHANGED_WHEN.Visible = True + Me.colCHANGED_WHEN.VisibleIndex = 6 ' 'RibbonControl1 ' @@ -483,7 +214,7 @@ Partial Class frmConfig Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.Size = New System.Drawing.Size(832, 63) + Me.RibbonControl1.Size = New System.Drawing.Size(1093, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -507,10 +238,10 @@ Partial Class frmConfig ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 485) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 634) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(832, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1093, 24) ' 'RibbonPage2 ' @@ -521,73 +252,156 @@ Partial Class frmConfig ' Me.TBEDI_XML_ITEMSTableAdapter.ClearBeforeFill = True ' + 'TBEDI_XML_CONFIGTableAdapter + ' + Me.TBEDI_XML_CONFIGTableAdapter.ClearBeforeFill = True + ' + 'TableAdapterManager + ' + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBEDI_XML_CONFIGTableAdapter = Me.TBEDI_XML_CONFIGTableAdapter + Me.TableAdapterManager.TBEDI_XML_FUNCTIONSTableAdapter = Nothing + Me.TableAdapterManager.TBEDI_XML_ITEMSTableAdapter = Me.TBEDI_XML_ITEMSTableAdapter + Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing + Me.TableAdapterManager.TBEDI_XML_TEMPLATESTableAdapter = Nothing + Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing + Me.TableAdapterManager.UpdateOrder = MultiTool.Form.DS_DD_ECMTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' + 'colGUID + ' + Me.colGUID.FieldName = "GUID" + Me.colGUID.Name = "colGUID" + Me.colGUID.Visible = True + Me.colGUID.VisibleIndex = 0 + ' + 'colXML_NAME + ' + Me.colXML_NAME.FieldName = "XML_NAME" + Me.colXML_NAME.Name = "colXML_NAME" + Me.colXML_NAME.Visible = True + Me.colXML_NAME.VisibleIndex = 1 + ' + 'colXML_TYPE_ID + ' + Me.colXML_TYPE_ID.FieldName = "XML_TYPE_ID" + Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID" + Me.colXML_TYPE_ID.Visible = True + Me.colXML_TYPE_ID.VisibleIndex = 2 + ' + 'colIS_READ_ONLY + ' + Me.colIS_READ_ONLY.FieldName = "IS_READ_ONLY" + Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY" + Me.colIS_READ_ONLY.Visible = True + Me.colIS_READ_ONLY.VisibleIndex = 3 + ' + 'colIS_VISIBLE + ' + Me.colIS_VISIBLE.FieldName = "IS_VISIBLE" + Me.colIS_VISIBLE.Name = "colIS_VISIBLE" + Me.colIS_VISIBLE.Visible = True + Me.colIS_VISIBLE.VisibleIndex = 4 + ' + 'colORDER_KEY + ' + Me.colORDER_KEY.FieldName = "ORDER_KEY" + Me.colORDER_KEY.Name = "colORDER_KEY" + Me.colORDER_KEY.Visible = True + Me.colORDER_KEY.VisibleIndex = 5 + ' + 'colFUNCTION_ID + ' + Me.colFUNCTION_ID.FieldName = "FUNCTION_ID" + Me.colFUNCTION_ID.Name = "colFUNCTION_ID" + Me.colFUNCTION_ID.Visible = True + Me.colFUNCTION_ID.VisibleIndex = 6 + ' + 'colIS_REQUIRED + ' + Me.colIS_REQUIRED.FieldName = "IS_REQUIRED" + Me.colIS_REQUIRED.Name = "colIS_REQUIRED" + Me.colIS_REQUIRED.Visible = True + Me.colIS_REQUIRED.VisibleIndex = 7 + ' + 'colXML_TABLE_ID + ' + Me.colXML_TABLE_ID.FieldName = "XML_TABLE_ID" + Me.colXML_TABLE_ID.Name = "colXML_TABLE_ID" + Me.colXML_TABLE_ID.Visible = True + Me.colXML_TABLE_ID.VisibleIndex = 8 + ' + 'colIS_VIRTUAL + ' + Me.colIS_VIRTUAL.FieldName = "IS_VIRTUAL" + Me.colIS_VIRTUAL.Name = "colIS_VIRTUAL" + Me.colIS_VIRTUAL.Visible = True + Me.colIS_VIRTUAL.VisibleIndex = 9 + ' + 'colFUNCTION_PARAMETERS + ' + Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS" + Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS" + Me.colFUNCTION_PARAMETERS.Visible = True + Me.colFUNCTION_PARAMETERS.VisibleIndex = 10 + ' + 'colADDED_WHO1 + ' + Me.colADDED_WHO1.FieldName = "ADDED_WHO" + Me.colADDED_WHO1.Name = "colADDED_WHO1" + Me.colADDED_WHO1.Visible = True + Me.colADDED_WHO1.VisibleIndex = 11 + ' + 'colADDED_WHEN1 + ' + Me.colADDED_WHEN1.FieldName = "ADDED_WHEN" + Me.colADDED_WHEN1.Name = "colADDED_WHEN1" + Me.colADDED_WHEN1.Visible = True + Me.colADDED_WHEN1.VisibleIndex = 12 + ' + 'colCHANGED_WHO1 + ' + Me.colCHANGED_WHO1.FieldName = "CHANGED_WHO" + Me.colCHANGED_WHO1.Name = "colCHANGED_WHO1" + Me.colCHANGED_WHO1.Visible = True + Me.colCHANGED_WHO1.VisibleIndex = 13 + ' + 'colCHANGED_WHEN1 + ' + Me.colCHANGED_WHEN1.FieldName = "CHANGED_WHEN" + Me.colCHANGED_WHEN1.Name = "colCHANGED_WHEN1" + Me.colCHANGED_WHEN1.Visible = True + Me.colCHANGED_WHEN1.VisibleIndex = 14 + ' 'frmConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(832, 509) + Me.ClientSize = New System.Drawing.Size(1093, 658) Me.Controls.Add(Me.XtraTabControl1) - Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonStatusBar1) - Me.Controls.Add(Me.barDockControlLeft) - Me.Controls.Add(Me.barDockControlRight) - Me.Controls.Add(Me.barDockControlBottom) - Me.Controls.Add(Me.barDockControlTop) + Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_unknown1 Me.Name = "frmConfig" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Konfiguration" - CType(Me.ToolbarFormManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) - Me.tabPageBasic.ResumeLayout(False) - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) - CType(Me.txtBaseURL.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtUsername.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtImportBasePath.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtImportRelativePath.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtInputDir.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtOutputDir.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtSchemaDir.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TabbedControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() Me.tabPageSchema.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPage1.ResumeLayout(False) + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBEDI_XML_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ToolbarFormManager1 As DevExpress.XtraBars.ToolbarForm.ToolbarFormManager - Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl - Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl - Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl - Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl Friend WithEvents XtraTabControl1 As XtraTabControl - Friend WithEvents tabPageBasic As XtraTabPage - Friend WithEvents LayoutControl1 As LayoutControl - Friend WithEvents Root As LayoutControlGroup - Friend WithEvents txtBaseURL As TextEdit - Friend WithEvents txtUsername As TextEdit - Friend WithEvents txtPassword As TextEdit - Friend WithEvents txtImportBasePath As TextEdit - Friend WithEvents txtImportRelativePath As TextEdit Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -600,27 +414,32 @@ Partial Class frmConfig Friend WithEvents DS_DD_ECM As DS_DD_ECM Friend WithEvents TBEDIXMLITEMSBindingSource As BindingSource Friend WithEvents TBEDI_XML_ITEMSTableAdapter As DS_DD_ECMTableAdapters.TBEDI_XML_ITEMSTableAdapter - Friend WithEvents TabbedControlGroup1 As TabbedControlGroup - Friend WithEvents LayoutControlGroup1 As LayoutControlGroup - Friend WithEvents LayoutControlItem6 As LayoutControlItem - Friend WithEvents LayoutControlItem5 As LayoutControlItem - Friend WithEvents LayoutControlItem2 As LayoutControlItem - Friend WithEvents LayoutControlItem1 As LayoutControlItem - Friend WithEvents LayoutControlItem3 As LayoutControlItem - Friend WithEvents txtInputDir As TextEdit - Friend WithEvents txtOutputDir As TextEdit - Friend WithEvents txtSchemaDir As TextEdit - Friend WithEvents LayoutControlGroup2 As LayoutControlGroup - Friend WithEvents LayoutControlItem4 As LayoutControlItem - Friend WithEvents LayoutControlItem7 As LayoutControlItem - Friend WithEvents LayoutControlItem8 As LayoutControlItem + Friend WithEvents TBEDI_XML_CONFIGBindingSource As BindingSource + Friend WithEvents TBEDI_XML_CONFIGTableAdapter As DS_DD_ECMTableAdapters.TBEDI_XML_CONFIGTableAdapter + Friend WithEvents TableAdapterManager As DS_DD_ECMTableAdapters.TableAdapterManager + Friend WithEvents XtraTabPage1 As XtraTabPage + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents colGUID1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colKEY As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colVALUE As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHO As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCHANGED_WHO As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCHANGED_WHEN As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colXML_NAME As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colXML_NODE_ID As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colXML_TYPE_ID As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colIS_READ_ONLY As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colIS_VISIBLE As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colORDER_KEY As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colFUNCTION_ID As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colIS_VISIBLE As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colIS_READ_ONLY As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colIS_REQUIRED As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colXML_TABLE_ID As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colIS_VIRTUAL As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colFUNCTION_PARAMETERS As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHO1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHEN1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCHANGED_WHO1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCHANGED_WHEN1 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/MultiTool.Form/frmConfig.resx b/MultiTool.Form/frmConfig.resx index 6bf281a..1ef0ee4 100644 --- a/MultiTool.Form/frmConfig.resx +++ b/MultiTool.Form/frmConfig.resx @@ -117,15 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - 313, 17 194, 17 + + 758, 17 + @@ -143,10 +143,13 @@ IC8+DQo8L3N2Zz4L - - 194, 17 - 533, 17 + + 999, 17 + + + 1234, 17 + \ No newline at end of file diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 2590d25..31ffcbf 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -4,7 +4,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Public Class frmConfig - Public Property ConfigManager As ConfigManager(Of MultiTool.Shared.Config) + Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config) Private ReadOnly FormHelper As FormHelper Private ReadOnly Property Config As MultiTool.Shared.Config @@ -13,15 +13,17 @@ Public Class frmConfig End Get End Property - Public Sub New(pLogConfig As LogConfig) + Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Shared.Config)) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. FormHelper = New FormHelper(pLogConfig) + ConfigManager = pConfigManager End Sub Private Sub frmConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oConnectionString = MSSQLServer.DecryptConnectionString(Config.ConnectionString) Dim oBuilder As New SqlConnectionStringBuilder(oConnectionString) With { .InitialCatalog = "DD_ECM" @@ -30,21 +32,15 @@ Public Class frmConfig TBEDI_XML_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString() TBEDI_XML_ITEMSTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_ITEMS) - txtInputDir.EditValue = My.GeneralConfiguration.InputDirectory - txtOutputDir.EditValue = My.GeneralConfiguration.OutputDirectory - txtSchemaDir.EditValue = My.GeneralConfiguration.TemplateDirectory - - txtBaseURL.EditValue = My.GeneralConfiguration.Webservice.BaseUrl - txtUsername.EditValue = My.GeneralConfiguration.Webservice.Username - txtPassword.EditValue = My.GeneralConfiguration.Webservice.Password - txtImportBasePath.EditValue = My.GeneralConfiguration.Webservice.ImportBasePath - txtImportRelativePath.EditValue = My.GeneralConfiguration.Webservice.ImportRelativePath + TBEDI_XML_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString() + TBEDI_XML_CONFIGTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_CONFIG) End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - - Try + TBEDI_XML_CONFIGBindingSource.EndEdit() + TBEDI_XML_CONFIGTableAdapter.Update(DS_DD_ECM.TBEDI_XML_CONFIG) + TBEDIXMLITEMSBindingSource.EndEdit() TBEDI_XML_ITEMSTableAdapter.Update(DS_DD_ECM.TBEDI_XML_ITEMS) Catch ex As Exception diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 9401651..18785cd 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -29,7 +29,9 @@ Partial Class frmImportMain Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() + Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() @@ -56,6 +58,7 @@ Partial Class frmImportMain Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.btnTestTransferFile = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -85,9 +88,8 @@ Partial Class frmImportMain Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) - Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -148,6 +150,12 @@ Partial Class frmImportMain Me.GridViewFiles.OptionsView.ShowGroupPanel = False Me.GridViewFiles.OptionsView.ShowIndicator = False ' + 'gridBand1 + ' + resources.ApplyResources(Me.gridBand1, "gridBand1") + Me.gridBand1.Columns.Add(Me.colSelected) + Me.gridBand1.VisibleIndex = 0 + ' 'colSelected ' Me.colSelected.AutoFillDown = True @@ -160,6 +168,14 @@ Partial Class frmImportMain Me.colSelected.OptionsColumn.FixedWidth = True Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] ' + 'GridBand2 + ' + resources.ApplyResources(Me.GridBand2, "GridBand2") + Me.GridBand2.Columns.Add(Me.colFilename) + Me.GridBand2.Columns.Add(Me.colCreatedAt) + Me.GridBand2.Columns.Add(Me.colMandator) + Me.GridBand2.VisibleIndex = 1 + ' 'colFilename ' resources.ApplyResources(Me.colFilename, "colFilename") @@ -201,9 +217,9 @@ Partial Class frmImportMain 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtVersion, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 31 + Me.RibbonControl.MaxItemId = 32 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) @@ -367,6 +383,12 @@ Partial Class frmImportMain Me.btnTestTransferFile.ImageOptions.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.CommonPalette Me.btnTestTransferFile.Name = "btnTestTransferFile" ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 30 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup7}) @@ -404,7 +426,7 @@ Partial Class frmImportMain ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup2}) Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' @@ -565,25 +587,17 @@ Partial Class frmImportMain ' Me.SplashScreenManager.ClosingDelay = 500 ' - 'gridBand1 + 'RibbonPageGroup2 ' - resources.ApplyResources(Me.gridBand1, "gridBand1") - Me.gridBand1.Columns.Add(Me.colSelected) - Me.gridBand1.VisibleIndex = 0 + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") ' - 'GridBand2 + 'BarButtonItem2 ' - resources.ApplyResources(Me.GridBand2, "GridBand2") - Me.GridBand2.Columns.Add(Me.colFilename) - Me.GridBand2.Columns.Add(Me.colCreatedAt) - Me.GridBand2.Columns.Add(Me.colMandator) - Me.GridBand2.VisibleIndex = 1 - ' - 'BarButtonItem1 - ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 30 - Me.BarButtonItem1.Name = "BarButtonItem1" + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 31 + Me.BarButtonItem2.Name = "BarButtonItem2" ' 'frmImportMain ' @@ -692,4 +706,6 @@ Partial Class frmImportMain Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 447da9f..a8d7ab9 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -271,9 +271,6 @@ 1215, 746 - - BarButtonItem1 - 0, 722 @@ -323,12 +320,24 @@ DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + gridBand1 + + + DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colSelected DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + GridBand2 + + + DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + colFilename @@ -479,6 +488,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -587,22 +602,16 @@ DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - gridBand1 + + RibbonPageGroup2 - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - GridBand2 + + BarButtonItem2 - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem1 - - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -614,6 +623,12 @@ Übermittlung Testen + + BarButtonItem1 + + + BarButtonItem2 + 0, 0 @@ -635,6 +650,9 @@ Verzeichnisse + + RibbonPageGroup2 + Erweitert diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index a28a792..ff0b63a 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -18,6 +18,7 @@ Imports MultiTool.Shared.Constants Imports MultiTool.Shared.Exceptions Imports DevExpress.XtraReports.UI Imports MultiTool.Shared.Documents.DocumentRow +Imports System.Text.RegularExpressions Public Class frmImportMain Public LogConfig As LogConfig @@ -116,7 +117,7 @@ Public Class frmImportMain lookupMandator.ForceInitialize() lookupMandator.Properties.View.BestFitColumns() - DocumentLoader = New DocumentLoader(LogConfig, Winline) + DocumentLoader = New DocumentLoader(LogConfig, Winline, My.MappingConfiguration, My.TemplateConfiguration) GridLoader = New GridLoader(LogConfig) SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Vorlagen) @@ -297,12 +298,25 @@ Public Class frmImportMain Private Sub GridViewFiles_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewFiles.FocusedRowChanged Try + SplitContainerMain.Panel2.Enabled = True Dim oDocument As Document = GridViewFiles.GetRow(e.FocusedRowHandle) If oDocument Is Nothing Then Exit Sub End If + If oDocument.Mandator Is Nothing Then + lookupMandator.EditValue = Nothing + SplitContainerMain.Panel2.Enabled = False + + For Each oGrid In Grids + oGrid.DataSource = Nothing + Next + + MsgBox("Für die aktuelle Datei konnte kein Mandant zugeordnet werden! Bitte wählen Sie einen aus und laden Sie dann die Datei erneut.", MsgBoxStyle.Exclamation, Text) + Exit Sub + End If + lookupMandator.EditValue = oDocument.Mandator LoadDocument(oDocument) Catch ex As Exception @@ -534,9 +548,17 @@ Public Class frmImportMain {"Colli", "Text6"}, {"Einzelpreis[Original]", "Text7"}, {"Einzelpreis[Final]", "Text8"}, - {"Umsatzsteuerprozent_Zeile", "Text9"} + {"EinheitProPalette", "Text9"}, + {"Lagerstand", "Text10"} }) + + Dim oSQLConfig = My.TemplateConfiguration.Items. + Where(Function(item) item.Function.Name = "SQL"). + ToList() + + FillFieldValuesFromSQL(pDocument, oSQLConfig) + Dim oHeadRow = pDocument.Rows. Where(Function(r) r.Name.EndsWith("T025")). Select(Function(r) r.Fields). @@ -580,6 +602,58 @@ Public Class frmImportMain Return oPrintTool End Function + Private Sub FillFieldValuesFromSQL(pDocument As Document, oSQLConfig As List(Of TemplateConfigItem)) + For Each oSQLConfigItem In oSQLConfig + ' FIeldList is a list of fields that will be changed + ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row + Dim oRowList = pDocument.Rows. + Where(Function(row) row.Fields.Any(Function(field) field.Key = oSQLConfigItem.Name)). + ToList() + + For Each oRow As DocumentRow In oRowList + Dim oField = oRow.Fields. + Where(Function(field) field.Key = oSQLConfigItem.Name). + SingleOrDefault() + + Dim oRegex = New Regex("{#(\w+)#([\w\s_-]+)}+") + Dim oSQL = oSQLConfigItem.Function.Params + Dim oMatches As MatchCollection = oRegex.Matches(oSQL) + + For Each oMatch As Match In oMatches + Dim oPlaceholderString As String = oMatch.Groups.Item(0)?.Value + Dim oPlaceholderType As String = oMatch.Groups.Item(1)?.Value + Dim oPlaceholderValue As String = oMatch.Groups.Item(2)?.Value + + Select Case oPlaceholderType.ToUpper + Case "FIELD" + Dim oFieldName = oPlaceholderValue + Dim oTargetField = oRow.Fields. + Where(Function(field) field.Key = oFieldName). + SingleOrDefault() + + oSQL = oSQL.Replace(oPlaceholderString, oTargetField.Value.Final) + + Case "CONST" + Select Case oMatch.Groups.Item(2).Value.ToUpper + Case "MESOYEAR" + oSQL = oSQL.Replace(oPlaceholderString, My.GeneralConfiguration.GetWinLineYear()) + + Case "MESOCOMP" + oSQL = oSQL.Replace(oPlaceholderString, pDocument.Mandator.Id) + + End Select + End Select + Next + + Dim oValue = Database.GetScalarValue(oSQL) + + If oValue IsNot Nothing Then + oField.Value.Final = oValue + End If + Next + Next + End Sub + Private Sub GridViewFiles_CustomDrawCell(sender As Object, e As Views.Base.RowCellCustomDrawEventArgs) Handles GridViewFiles.CustomDrawCell Dim oDocument As Document = GridViewFiles.GetRow(e.RowHandle) If oDocument.HasErrors Then @@ -607,8 +681,15 @@ Public Class frmImportMain End If If oRow.HasErrors Then - e.Appearance.Options.UseBackColor = True - e.Appearance.BackColor = Color.LightCoral + + Dim oColumName = e.Column.FieldName + Dim oErrorField = oRow.Fields.Where(Function(field) field.Value.HasError).FirstOrDefault() + + If Not IsNothing(oErrorField) AndAlso oColumName = oErrorField.Key Then + e.Appearance.Options.UseBackColor = True + e.Appearance.BackColor = Color.LightCoral + End If + End If End Sub @@ -638,6 +719,4 @@ Public Class frmImportMain SplashScreenManager.CloseWaitForm() End Try End Sub - - End Class \ No newline at end of file diff --git a/MultiTool.Form/frmMain.vb b/MultiTool.Form/frmMain.vb index 114d360..3bc48f6 100644 --- a/MultiTool.Form/frmMain.vb +++ b/MultiTool.Form/frmMain.vb @@ -121,10 +121,7 @@ Public Class frmMain End Sub Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick - Dim oForm As New frmConfig(LogConfig) With { - .ConfigManager = ConfigManager - } - + Dim oForm As New frmConfig(LogConfig, ConfigManager) oForm.ShowDialog() End Sub diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb index ec2affb..86c9e58 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Shared/Documents/DocumentLoader.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging Imports MultiTool.Shared.Exceptions Imports MultiTool.Shared.Templates @@ -10,6 +11,8 @@ Namespace Documents Inherits BaseClass Private ReadOnly Winline As WinlineData + Private ReadOnly MappingConfig As MappingConfig + Private ReadOnly TemplateConfig As TemplateConfig Public Property Files As New List(Of Document) Public Event FileLoadComplete As EventHandler(Of FileLoadInfo) @@ -19,9 +22,11 @@ Namespace Documents Public FilesTotal As Integer End Structure - Public Sub New(pLogConfig As LogConfig, pWinline As WinlineData) + Public Sub New(pLogConfig As LogConfig, pWinline As WinlineData, pMappingConfig As MappingConfig, pTemplateConfig As TemplateConfig) MyBase.New(pLogConfig, pLogConfig.GetLogger()) Winline = pWinline + MappingConfig = pMappingConfig + TemplateConfig = pTemplateConfig End Sub @@ -77,7 +82,7 @@ Namespace Documents Return oFileList. Select(AddressOf WrapFileInfo). Select(Function(d) IncludeSchema(d, pTemplate)). - Select(Function(d) LoadDocumentData(d, pTemplate)). + Select(Function(d) LoadDocumentData(d, pTemplate, TemplateConfig)). Select(Function(d) MatchDataFromWinLine(d, Winline.Mandators, pMandator, pTemplate)). SingleOrDefault() Catch ex As Exception @@ -106,33 +111,33 @@ Namespace Documents ''' ''' ''' - Private Function LoadDocumentData(pDocument As Document, pTemplate As Template) As Document + Private Function LoadDocumentData(pDocument As Document, pTemplate As Template, pTemplateConfig As TemplateConfig) As Document Dim oText As String = IO.File.ReadAllText(pDocument.FullName) Dim oDoc = XDocument.Parse(oText) Dim oRootElement As XElement = XmlData.GetElement(oDoc, "MESOWebService") If oRootElement Is Nothing Then - Throw New Exceptions.MalformedXmlException("Datei enthält kein MESOWebService-Element") + Throw New MalformedXmlException("Datei enthält kein MESOWebService-Element") End If Dim oTemplateName = XmlData.GetElementAttribute(oRootElement, "Template") If oTemplateName Is Nothing Then - Throw New Exceptions.MalformedXmlException("Datei enthält kein Template-Attribut") + Throw New MalformedXmlException("Datei enthält kein Template-Attribut") End If Dim oTemplateType = XmlData.GetElementAttribute(oRootElement, "TemplateType") If oTemplateType Is Nothing Then - Throw New Exceptions.MalformedXmlException("Datei enthält kein TemplateType-Attribut") + Throw New MalformedXmlException("Datei enthält kein TemplateType-Attribut") End If Dim oOption = XmlData.GetElementAttribute(oRootElement, "option") If oOption Is Nothing Then - Throw New Exceptions.MalformedXmlException("Datei enthält kein option-Attribut") + Throw New MalformedXmlException("Datei enthält kein option-Attribut") End If Dim oPrintVoucher = XmlData.GetElementAttribute(oRootElement, "printVoucher") If oPrintVoucher Is Nothing Then - Throw New Exceptions.MalformedXmlException("Datei enthält kein printVoucher-Attribut") + Throw New MalformedXmlException("Datei enthält kein printVoucher-Attribut") End If ' The first level of Elements are the document Rows @@ -155,7 +160,6 @@ Namespace Documents Where(Function(t) t.Name = oTopLevelElement.Name). FirstOrDefault() - For Each oColumn In oTable.Columns Dim oSubElement = oSubElements. Where(Function(e) e.Name = oColumn.Name). @@ -175,7 +179,7 @@ Namespace Documents .Original = oValue, .Final = oValue, .DataType = oColumn.DataType, - .Required = oRequired, + .IsRequired = oRequired, .SortKey = oColumnSortKey }) Else @@ -193,46 +197,15 @@ Namespace Documents oColumnSortKey += 1 Next - 'For Each oSubElement As XElement In oSubElements - ' Dim oTemplateField = oTable.Columns. - ' Where(Function(c) c.Name = oSubElement.Name). - ' SingleOrDefault() - - ' Dim oRequired = oTemplateField.IsRequired - ' Dim oValue = oSubElement.Value.Trim() - - ' ' TODO: Needed when we have time for date times - ' 'If oTemplateField.DataType = Constants.ColumnType.Date Then - ' ' Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture) - ' ' oValue = oDate.ToString("d") - ' 'End If - - ' oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With { - ' .Original = oValue, - ' .Final = oValue, - ' .DataType = oTemplateField.DataType, - ' .Required = oRequired - ' }) - - 'Next - - '' All fields in the schema are generated, - '' only creating the ones with values leads to wrong visual cues when asking for - '' docs/rows/fields with errors - 'For Each oColumn In oTable.Columns - ' If oFields.ContainsKey(oColumn.Name) Then - ' Continue For - ' End If - - ' Dim oColumnError = DocumentRow.FieldError.None - ' If oColumn.Config?.IsRequired Then - ' oColumnError = DocumentRow.FieldError.MissingValue - ' End If - - ' oFields.Add(oColumn.Name, New DocumentRow.FieldValue With { - ' .[Error] = oColumnError - ' }) - 'Next + ' Create Virtual fields + Dim oVirtualColumns = pTemplateConfig.Items.Where(Function(item) item.IsVirtual And item.Table = oTable.Name).ToList() + For Each oColumn In oVirtualColumns + oFields.Add(oColumn.Name, New DocumentRow.FieldValue With { + .DataType = oColumn.Type, + .IsRequired = oColumn.IsRequired, + .SortKey = oColumn.OrderKey + }) + Next ' Create a DocumentRow object for each Top Level Element Dim oRow = New DocumentRow With { @@ -272,22 +245,21 @@ Namespace Documents If oMandator Is Nothing Then Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name) Else - pDocument = MatchDocumentData(pDocument, oMandator, pTemplate) + pDocument = MatchDocumentDataFromHardcodedMappings(pDocument, oMandator, pTemplate) + pDocument = MatchDocumentDataFromDynamicMappings(pDocument, oMandator, MappingConfig) End If pDocument.Mandator = oMandator Return pDocument End Function - Private Function MatchDocumentData(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document - Dim oYear = Winline.GetWinLineYear() - + Private Function MatchDocumentDataFromHardcodedMappings(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document If pMandator Is Nothing Then Return pDocument End If For Each oRow As DocumentRow In pDocument.Rows - Dim oTable = pTemplate.Tables.Where(Function(t) t.Name = oRow.Name).SingleOrDefault() + Dim oTable = pTemplate.Tables.Where(Function(table) table.Name = oRow.Name).SingleOrDefault() For Each oField In oRow.Fields If oTable Is Nothing Then @@ -308,12 +280,68 @@ Namespace Documents If oFunctionName = "EAN" Then SetArticleByEAN(oRow, pMandator, oField.Key) End If + + Next Next Return pDocument End Function + Private Function MatchDocumentDataFromDynamicMappings(pDocument As Document, pMandator As Mandator, pMappingConfig As MappingConfig) As Document + If pMandator Is Nothing Then + Return pDocument + End If + + ' We only want the mapping config for things in the xml file. + ' that excludes things like setting the mandator. + Dim oFilteredMappingConfig = MappingConfig.Items. + Where(Function(item) item.DestinationItem <> String.Empty). + ToList() + + For Each oMapping As MappingConfigItem In oFilteredMappingConfig + + ' Get Source Value + Dim oField As KeyValuePair(Of String, DocumentRow.FieldValue) = pDocument.Rows. + SelectMany(Function(row) row.Fields). + Where(Function(field) field.Key = oMapping.SourceItem). + FirstOrDefault() + + ' Test on Regex + Dim oRegex As New Regex(oMapping.SourceRegex) + + If oRegex.IsMatch(oField.Value.Final) Then + + pDocument.Rows. + SelectMany(Function(row) row.Fields). + Where(Function(field) field.Key = oMapping.DestinationItem). + SetValue(Sub(field) + field.Value.Final = oMapping.DestinationValue + End Sub) + + + + Else + ' don't do anything + + End If + + 'Dim oRow = pDocument.Rows.Where(Function(row) + ' Dim oTempRow = row.Fields.Where(Function(field) field.Key = oMapping.SourceItem).FirstOrDefault() + ' If IsNothing(oTempRow) Then + ' Return False + ' Else Return True + ' End If + ' End Function).FirstOrDefault() + 'Dim oField = oRow.Fields.Where(Function(field) field.Key = oMapping.SourceItem).FirstOrDefault() + + Console.WriteLine() + + Next + + Return pDocument + End Function + Private Sub SetArticleByEAN(pRow As DocumentRow, pMandator As Mandator, pArticleField As String) Dim oNumberItem As DocumentRow.FieldValue = pRow.Fields.GetOrDefault(pArticleField) Dim oArticleNumber = Winline.TryGetArticleNumber(oNumberItem.Original, pMandator) diff --git a/MultiTool.Shared/Documents/DocumentRow.vb b/MultiTool.Shared/Documents/DocumentRow.vb index 9a5b555..fb761ba 100644 --- a/MultiTool.Shared/Documents/DocumentRow.vb +++ b/MultiTool.Shared/Documents/DocumentRow.vb @@ -56,12 +56,13 @@ Public Property Original As String = "" Public Property External As String = "" Public Property Final As String = "" - Public Property Required As Boolean = False + Public Property IsRequired As Boolean = False + Public Property IsVirtual As Boolean = False Public Property SortKey As Integer = 0 Public ReadOnly Property HasError As Boolean Get - Return Required = True And ( + Return IsRequired = True And ( [Error] <> FieldError.None Or Final = String.Empty ) End Get diff --git a/MultiTool.Shared/Templates/GeneralConfig.vb b/MultiTool.Shared/Templates/GeneralConfig.vb index 6147c78..4cf0d01 100644 --- a/MultiTool.Shared/Templates/GeneralConfig.vb +++ b/MultiTool.Shared/Templates/GeneralConfig.vb @@ -23,5 +23,15 @@ Return Now.Year End Function + + + Public Function GetWinLineYear() + Return GetWinLineYear(GetYear) + End Function + + + Public Function GetWinLineYear(pYear As Integer) + Return (pYear - 1900) * 12 + End Function End Class End Namespace diff --git a/MultiTool.Shared/Templates/MappingConfig.vb b/MultiTool.Shared/Templates/MappingConfig.vb index 961ad32..244cb2b 100644 --- a/MultiTool.Shared/Templates/MappingConfig.vb +++ b/MultiTool.Shared/Templates/MappingConfig.vb @@ -1,5 +1,11 @@ Namespace Templates Public Class MappingConfig + Public Class Entity + Public Const MANDATOR = "MANDATOR" + Public Const DOCUMENTTYPE = "DOCUMENTTYPE" + Public Const ARTICLE = "ARTICLE" + End Class + Public Property Items As New List(Of MappingConfigItem) End Class diff --git a/MultiTool.Shared/Templates/TemplateConfigItem.vb b/MultiTool.Shared/Templates/TemplateConfigItem.vb index a7083ec..92716e1 100644 --- a/MultiTool.Shared/Templates/TemplateConfigItem.vb +++ b/MultiTool.Shared/Templates/TemplateConfigItem.vb @@ -12,6 +12,7 @@ Namespace Templates Public Property IsReadOnly As Boolean Public Property IsVisible As Boolean Public Property IsRequired As Boolean + Public Property IsVirtual As Boolean Public Property [Function] As ColumnFunction diff --git a/MultiTool.Shared/Templates/TemplateLoader.vb b/MultiTool.Shared/Templates/TemplateLoader.vb index 0d1b561..1e4004a 100644 --- a/MultiTool.Shared/Templates/TemplateLoader.vb +++ b/MultiTool.Shared/Templates/TemplateLoader.vb @@ -170,6 +170,7 @@ Namespace Templates .IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False), .IsVisible = oRow.ItemEx("IS_VISIBLE", True), .IsRequired = oRow.ItemEx("IS_REQUIRED", False), + .IsVirtual = oRow.ItemEx("IS_VIRTUAL", False), .IsHead = oRow.ItemEx("IS_HEAD", True), .[Function] = New TemplateConfigItem.ColumnFunction With { .Id = oRow.ItemEx("FUNCTION_ID", 0), diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb index 7a5e760..d721ece 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Shared/Winline/WebServiceData.vb @@ -162,11 +162,6 @@ Namespace Winline End Function Private Function GetBytesFromDocument(pDocument As Document) As Byte() - ' TODO: should "Lief_Name" be included here? - Dim oFilteredFields As New List(Of String) From { - "Fakt_Name" - } - Using oStream As New IO.MemoryStream() Dim w = XmlWriter.Create(oStream) @@ -187,7 +182,7 @@ Namespace Winline Continue For End If - If oFilteredFields.Contains(oField.Key) Then + If oField.Value.IsVirtual Then Continue For End If diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index 7b94c28..6823dd7 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -29,19 +29,9 @@ Namespace Winline MappingConfig = pMappingConfig End Sub - - Public Function GetWinLineYear(pYear As Integer) - Return (pYear - 1900) * 12 - End Function - - - Public Function GetWinLineYear() - Return GetWinLineYear(Config.GetYear) - End Function - Public Async Function LoadArticles(pMandator As Mandator) As Task Logger.Info("Loading Articles for Mandator [{0}]", pMandator) - Dim oYear = GetWinLineYear() + Dim oYear = Config.GetWinLineYear() Try Dim oSQL = $" @@ -80,7 +70,7 @@ Namespace Winline Public Async Function LoadAccounts(pMandator As Mandator) As Task Logger.Info("Loading Accounts for Mandator [{0}]", pMandator) - Dim oYear = GetWinLineYear() + Dim oYear = Config.GetWinLineYear() Try Dim oSQL = $" @@ -167,7 +157,7 @@ Namespace Winline End Sub Public Async Function LoadDocumentKinds(pMandator As Mandator) As Task - Dim oYear As Integer = GetWinLineYear() + Dim oYear As Integer = Config.GetWinLineYear() Try ' TODO: This is Schaum specific, maybe move to config later @@ -208,7 +198,7 @@ Namespace Winline Return Nothing End If - Dim oYear As Integer = GetWinLineYear() + Dim oYear As Integer = Config.GetWinLineYear() Dim oSQL = $" SELECT [c002], -- Kundennummer @@ -260,7 +250,7 @@ Namespace Winline Public Function TryGetArticleNumber(pEAN As String, pMandator As Mandator) As String Try - Dim oYear As Integer = GetWinLineYear() + Dim oYear As Integer = Config.GetWinLineYear() Dim oSQL As String = $" SELECT [c011], -- Artikelnummer @@ -300,7 +290,7 @@ Namespace Winline Public Function GetContacts(pAccountNumber As String, pMandator As Mandator) As List(Of Contact) Try Dim oContacts As New List(Of Contact) - Dim oYear As Integer = GetWinLineYear() + Dim oYear As Integer = Config.GetWinLineYear() Dim oSQL As String = $" SELECT [c000], -- Key @@ -335,7 +325,7 @@ Namespace Winline Public Function GetReplacementArticleNumber(pArticleNumber As String, pMandator As Mandator) Try - Dim oYear As Integer = GetWinLineYear() + Dim oYear As Integer = Config.GetWinLineYear() Dim oSQL As String = $" SELECT [c011], -- Artikelnummer @@ -391,7 +381,7 @@ Namespace Winline Distinct(). ToList() - Dim oYear = GetWinLineYear() + Dim oYear = Config.GetWinLineYear() Dim oMandatorId As String = String.Empty ' TODO: Instead load whitelisted mandators from database