From c315640d7d49d8fa17cf678d5c048051bd5e6ff7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 20 Jan 2022 16:34:52 +0100 Subject: [PATCH] Finish FinalSQL, GLN/EAN for export, double click to open template, exporting multiple documents --- MultiTool.Form/DS_DD_ECM.Designer.vb | 315 +++++++++--------- MultiTool.Form/DS_DD_ECM.xsd | 26 +- MultiTool.Form/DS_DD_ECM.xss | 2 +- MultiTool.Form/frmConfig.Designer.vb | 8 +- MultiTool.Form/frmConfig.vb | 6 +- MultiTool.Form/frmExportMain.Designer.vb | 21 +- MultiTool.Form/frmExportMain.resx | 22 +- MultiTool.Form/frmExportMain.vb | 45 ++- MultiTool.Form/frmImportMain.Designer.vb | 10 +- MultiTool.Form/frmImportMain.resx | 12 - MultiTool.Form/frmImportMain.vb | 2 +- MultiTool.Form/frmMain.vb | 98 +++--- MultiTool.Shared/Config.vb | 1 + MultiTool.Shared/Documents/DocumentLoader.vb | 8 +- MultiTool.Shared/Exceptions.vb | 92 ++--- MultiTool.Shared/Patterns.vb | 59 +++- MultiTool.Shared/Report/ReportGenerator.vb | 2 +- MultiTool.Shared/Templates/GeneralConfig.vb | 2 - MultiTool.Shared/Templates/Template.vb | 4 + MultiTool.Shared/Templates/TemplateConfig.vb | 4 +- MultiTool.Shared/Templates/TemplateLoader.vb | 2 +- MultiTool.Shared/Winline/Entities/Article.vb | 6 +- MultiTool.Shared/Winline/Entities/Document.vb | 2 + MultiTool.Shared/Winline/WebServiceData.vb | 65 +++- MultiTool.Shared/Winline/WinlineData.vb | 75 ++++- 25 files changed, 529 insertions(+), 360 deletions(-) diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb index cc42c3c..87fbfd2 100644 --- a/MultiTool.Form/DS_DD_ECM.Designer.vb +++ b/MultiTool.Form/DS_DD_ECM.Designer.vb @@ -25,7 +25,7 @@ Option Explicit On Partial Public Class DS_DD_ECM Inherits Global.System.Data.DataSet - Private tableTBEDI_XML_ITEMS As TBEDI_XML_ITEMSDataTable + Private tableTBEDI_XML_TEMPLATE_ITEMS As TBEDI_XML_TEMPLATE_ITEMSDataTable Private tableTBEDI_XML_TYPES As TBEDI_XML_TYPESDataTable @@ -76,8 +76,8 @@ Partial Public Class DS_DD_ECM If (Me.DetermineSchemaSerializationMode(info, context) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Dim ds As Global.System.Data.DataSet = New Global.System.Data.DataSet() ds.ReadXmlSchema(New Global.System.Xml.XmlTextReader(New Global.System.IO.StringReader(strSchema))) - If (Not (ds.Tables("TBEDI_XML_ITEMS")) Is Nothing) Then - MyBase.Tables.Add(New TBEDI_XML_ITEMSDataTable(ds.Tables("TBEDI_XML_ITEMS"))) + If (Not (ds.Tables("TBEDI_XML_TEMPLATE_ITEMS")) Is Nothing) Then + MyBase.Tables.Add(New TBEDI_XML_TEMPLATE_ITEMSDataTable(ds.Tables("TBEDI_XML_TEMPLATE_ITEMS"))) End If If (Not (ds.Tables("TBEDI_XML_TYPES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_TYPESDataTable(ds.Tables("TBEDI_XML_TYPES"))) @@ -115,9 +115,9 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Browsable(false), _ Global.System.ComponentModel.DesignerSerializationVisibility(Global.System.ComponentModel.DesignerSerializationVisibility.Content)> _ - Public ReadOnly Property TBEDI_XML_ITEMS() As TBEDI_XML_ITEMSDataTable + Public ReadOnly Property TBEDI_XML_TEMPLATE_ITEMS() As TBEDI_XML_TEMPLATE_ITEMSDataTable Get - Return Me.tableTBEDI_XML_ITEMS + Return Me.tableTBEDI_XML_TEMPLATE_ITEMS End Get End Property @@ -238,8 +238,8 @@ Partial Public Class DS_DD_ECM Me.Reset Dim ds As Global.System.Data.DataSet = New Global.System.Data.DataSet() ds.ReadXml(reader) - If (Not (ds.Tables("TBEDI_XML_ITEMS")) Is Nothing) Then - MyBase.Tables.Add(New TBEDI_XML_ITEMSDataTable(ds.Tables("TBEDI_XML_ITEMS"))) + If (Not (ds.Tables("TBEDI_XML_TEMPLATE_ITEMS")) Is Nothing) Then + MyBase.Tables.Add(New TBEDI_XML_TEMPLATE_ITEMSDataTable(ds.Tables("TBEDI_XML_TEMPLATE_ITEMS"))) End If If (Not (ds.Tables("TBEDI_XML_TYPES")) Is Nothing) Then MyBase.Tables.Add(New TBEDI_XML_TYPESDataTable(ds.Tables("TBEDI_XML_TYPES"))) @@ -288,10 +288,10 @@ Partial Public Class DS_DD_ECM _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) - Me.tableTBEDI_XML_ITEMS = CType(MyBase.Tables("TBEDI_XML_ITEMS"),TBEDI_XML_ITEMSDataTable) + Me.tableTBEDI_XML_TEMPLATE_ITEMS = CType(MyBase.Tables("TBEDI_XML_TEMPLATE_ITEMS"),TBEDI_XML_TEMPLATE_ITEMSDataTable) If (initTable = true) Then - If (Not (Me.tableTBEDI_XML_ITEMS) Is Nothing) Then - Me.tableTBEDI_XML_ITEMS.InitVars + If (Not (Me.tableTBEDI_XML_TEMPLATE_ITEMS) Is Nothing) Then + Me.tableTBEDI_XML_TEMPLATE_ITEMS.InitVars End If End If Me.tableTBEDI_XML_TYPES = CType(MyBase.Tables("TBEDI_XML_TYPES"),TBEDI_XML_TYPESDataTable) @@ -339,8 +339,8 @@ Partial Public Class DS_DD_ECM Me.Namespace = "http://tempuri.org/DS_DD_ECM.xsd" Me.EnforceConstraints = true Me.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema - Me.tableTBEDI_XML_ITEMS = New TBEDI_XML_ITEMSDataTable() - MyBase.Tables.Add(Me.tableTBEDI_XML_ITEMS) + Me.tableTBEDI_XML_TEMPLATE_ITEMS = New TBEDI_XML_TEMPLATE_ITEMSDataTable() + MyBase.Tables.Add(Me.tableTBEDI_XML_TEMPLATE_ITEMS) Me.tableTBEDI_XML_TYPES = New TBEDI_XML_TYPESDataTable() MyBase.Tables.Add(Me.tableTBEDI_XML_TYPES) Me.tableTBEDI_XML_TEMPLATES = New TBEDI_XML_TEMPLATESDataTable() @@ -351,21 +351,21 @@ Partial Public Class DS_DD_ECM MyBase.Tables.Add(Me.tableTBEDI_XML_FUNCTIONS) Me.tableTBEDI_XML_CONFIG = New TBEDI_XML_CONFIGDataTable() MyBase.Tables.Add(Me.tableTBEDI_XML_CONFIG) - Me.relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS = New Global.System.Data.DataRelation("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_FUNCTIONS.GUIDColumn}, false) + Me.relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS = New Global.System.Data.DataRelation("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_IDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_FUNCTIONS.GUIDColumn}, false) Me.Relations.Add(Me.relationTBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS) - Me.relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES = New Global.System.Data.DataRelation("TBEDI_XML_ITEMS_TBEDI_XML_TYPES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.XML_TYPE_IDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TYPES.GUIDColumn}, false) + Me.relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES = New Global.System.Data.DataRelation("TBEDI_XML_ITEMS_TBEDI_XML_TYPES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TYPE_IDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TYPES.GUIDColumn}, false) Me.Relations.Add(Me.relationTBEDI_XML_ITEMS_TBEDI_XML_TYPES) Me.relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES = New Global.System.Data.DataRelation("TBEDI_XML_NODES_TBEDI_XML_TEMPLATES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_NODES.TEMPLATE_IDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATES.GUIDColumn}, false) Me.Relations.Add(Me.relationTBEDI_XML_NODES_TBEDI_XML_TEMPLATES) - Me.relationFK_TBEDI_XML_TYPES = New Global.System.Data.DataRelation("FK_TBEDI_XML_TYPES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.XML_TYPE_IDColumn}, false) + Me.relationFK_TBEDI_XML_TYPES = New Global.System.Data.DataRelation("FK_TBEDI_XML_TYPES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TYPE_IDColumn}, false) Me.Relations.Add(Me.relationFK_TBEDI_XML_TYPES) - Me.relationFK_TBEDI_XML_NODES = New Global.System.Data.DataRelation("FK_TBEDI_XML_NODES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_ITEMS.XML_TABLE_IDColumn}, false) + Me.relationFK_TBEDI_XML_NODES = New Global.System.Data.DataRelation("FK_TBEDI_XML_NODES", New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TABLE_IDColumn}, false) Me.Relations.Add(Me.relationFK_TBEDI_XML_NODES) End Sub _ - Private Function ShouldSerializeTBEDI_XML_ITEMS() As Boolean + Private Function ShouldSerializeTBEDI_XML_TEMPLATE_ITEMS() As Boolean Return false End Function @@ -458,7 +458,7 @@ Partial Public Class DS_DD_ECM End Function _ - Public Delegate Sub TBEDI_XML_ITEMSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_ITEMSRowChangeEvent) + Public Delegate Sub TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent) _ Public Delegate Sub TBEDI_XML_TYPESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBEDI_XML_TYPESRowChangeEvent) @@ -480,8 +480,8 @@ Partial Public Class DS_DD_ECM ''' _ - Partial Public Class TBEDI_XML_ITEMSDataTable - Inherits Global.System.Data.TypedTableBase(Of TBEDI_XML_ITEMSRow) + Partial Public Class TBEDI_XML_TEMPLATE_ITEMSDataTable + Inherits Global.System.Data.TypedTableBase(Of TBEDI_XML_TEMPLATE_ITEMSRow) Private columnGUID As Global.System.Data.DataColumn @@ -517,7 +517,7 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New - Me.TableName = "TBEDI_XML_ITEMS" + Me.TableName = "TBEDI_XML_TEMPLATE_ITEMS" Me.BeginInit Me.InitClass Me.EndInit @@ -679,56 +679,56 @@ Partial Public Class DS_DD_ECM _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBEDI_XML_ITEMSRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.Rows(index),TBEDI_XML_ITEMSRow) + Return CType(Me.Rows(index),TBEDI_XML_TEMPLATE_ITEMSRow) End Get End Property _ - Public Event TBEDI_XML_ITEMSRowChanging As TBEDI_XML_ITEMSRowChangeEventHandler + Public Event TBEDI_XML_TEMPLATE_ITEMSRowChanging As TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler _ - Public Event TBEDI_XML_ITEMSRowChanged As TBEDI_XML_ITEMSRowChangeEventHandler + Public Event TBEDI_XML_TEMPLATE_ITEMSRowChanged As TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler _ - Public Event TBEDI_XML_ITEMSRowDeleting As TBEDI_XML_ITEMSRowChangeEventHandler + Public Event TBEDI_XML_TEMPLATE_ITEMSRowDeleting As TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler _ - Public Event TBEDI_XML_ITEMSRowDeleted As TBEDI_XML_ITEMSRowChangeEventHandler + Public Event TBEDI_XML_TEMPLATE_ITEMSRowDeleted As TBEDI_XML_TEMPLATE_ITEMSRowChangeEventHandler _ - Public Overloads Sub AddTBEDI_XML_ITEMSRow(ByVal row As TBEDI_XML_ITEMSRow) + Public Overloads Sub AddTBEDI_XML_TEMPLATE_ITEMSRow(ByVal row As TBEDI_XML_TEMPLATE_ITEMSRow) Me.Rows.Add(row) End Sub _ - 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) + Public Overloads Function AddTBEDI_XML_TEMPLATE_ITEMSRow(ByVal XML_NAME As String, ByVal parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_TYPES As TBEDI_XML_TEMPLATE_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_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES As TBEDI_XML_TEMPLATE_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_TEMPLATE_ITEMSRow + Dim rowTBEDI_XML_TEMPLATE_ITEMSRow As TBEDI_XML_TEMPLATE_ITEMSRow = CType(Me.NewRow,TBEDI_XML_TEMPLATE_ITEMSRow) 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(2) = parentTBEDI_XML_ITEMSRowByFK_TBEDI_XML_TYPES(0) + If (Not (parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_TYPES) Is Nothing) Then + columnValuesArray(2) = parentTBEDI_XML_TEMPLATE_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) + If (Not (parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES) Is Nothing) Then + columnValuesArray(8) = parentTBEDI_XML_TEMPLATE_ITEMSRowByFK_TBEDI_XML_NODES(0) End If - rowTBEDI_XML_ITEMSRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBEDI_XML_ITEMSRow) - Return rowTBEDI_XML_ITEMSRow + rowTBEDI_XML_TEMPLATE_ITEMSRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBEDI_XML_TEMPLATE_ITEMSRow) + Return rowTBEDI_XML_TEMPLATE_ITEMSRow End Function _ - Public Function FindByGUID(ByVal GUID As Integer) As TBEDI_XML_ITEMSRow - Return CType(Me.Rows.Find(New Object() {GUID}),TBEDI_XML_ITEMSRow) + Public Function FindByGUID(ByVal GUID As Integer) As TBEDI_XML_TEMPLATE_ITEMSRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBEDI_XML_TEMPLATE_ITEMSRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBEDI_XML_ITEMSDataTable = CType(MyBase.Clone,TBEDI_XML_ITEMSDataTable) + Dim cln As TBEDI_XML_TEMPLATE_ITEMSDataTable = CType(MyBase.Clone,TBEDI_XML_TEMPLATE_ITEMSDataTable) cln.InitVars Return cln End Function @@ -736,7 +736,7 @@ Partial Public Class DS_DD_ECM _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBEDI_XML_ITEMSDataTable() + Return New TBEDI_XML_TEMPLATE_ITEMSDataTable() End Function _ - Public Function NewTBEDI_XML_ITEMSRow() As TBEDI_XML_ITEMSRow - Return CType(Me.NewRow,TBEDI_XML_ITEMSRow) + Public Function NewTBEDI_XML_TEMPLATE_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow + Return CType(Me.NewRow,TBEDI_XML_TEMPLATE_ITEMSRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBEDI_XML_ITEMSRow(builder) + Return New TBEDI_XML_TEMPLATE_ITEMSRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBEDI_XML_ITEMSRow) + Return GetType(TBEDI_XML_TEMPLATE_ITEMSRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBEDI_XML_ITEMSRowChangedEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_ITEMSRowChanged(Me, New TBEDI_XML_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_ITEMSRow), e.Action)) + If (Not (Me.TBEDI_XML_TEMPLATE_ITEMSRowChangedEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_TEMPLATE_ITEMSRowChanged(Me, New TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATE_ITEMSRow), e.Action)) End If End Sub @@ -845,8 +845,8 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBEDI_XML_ITEMSRowChangingEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_ITEMSRowChanging(Me, New TBEDI_XML_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_ITEMSRow), e.Action)) + If (Not (Me.TBEDI_XML_TEMPLATE_ITEMSRowChangingEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_TEMPLATE_ITEMSRowChanging(Me, New TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATE_ITEMSRow), e.Action)) End If End Sub @@ -854,8 +854,8 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBEDI_XML_ITEMSRowDeletedEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_ITEMSRowDeleted(Me, New TBEDI_XML_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_ITEMSRow), e.Action)) + If (Not (Me.TBEDI_XML_TEMPLATE_ITEMSRowDeletedEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_TEMPLATE_ITEMSRowDeleted(Me, New TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATE_ITEMSRow), e.Action)) End If End Sub @@ -863,14 +863,14 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBEDI_XML_ITEMSRowDeletingEvent) Is Nothing) Then - RaiseEvent TBEDI_XML_ITEMSRowDeleting(Me, New TBEDI_XML_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_ITEMSRow), e.Action)) + If (Not (Me.TBEDI_XML_TEMPLATE_ITEMSRowDeletingEvent) Is Nothing) Then + RaiseEvent TBEDI_XML_TEMPLATE_ITEMSRowDeleting(Me, New TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent(CType(e.Row,TBEDI_XML_TEMPLATE_ITEMSRow), e.Action)) End If End Sub _ - Public Sub RemoveTBEDI_XML_ITEMSRow(ByVal row As TBEDI_XML_ITEMSRow) + Public Sub RemoveTBEDI_XML_TEMPLATE_ITEMSRow(ByVal row As TBEDI_XML_TEMPLATE_ITEMSRow) Me.Rows.Remove(row) End Sub @@ -897,7 +897,7 @@ Partial Public Class DS_DD_ECM 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_ITEMSDataTable" + attribute2.FixedValue = "TBEDI_XML_TEMPLATE_ITEMSDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -2477,26 +2477,26 @@ Partial Public Class DS_DD_ECM ''' '''Represents strongly named DataRow class. ''' - Partial Public Class TBEDI_XML_ITEMSRow + Partial Public Class TBEDI_XML_TEMPLATE_ITEMSRow Inherits Global.System.Data.DataRow - Private tableTBEDI_XML_ITEMS As TBEDI_XML_ITEMSDataTable + Private tableTBEDI_XML_TEMPLATE_ITEMS As TBEDI_XML_TEMPLATE_ITEMSDataTable _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) - Me.tableTBEDI_XML_ITEMS = CType(Me.Table,TBEDI_XML_ITEMSDataTable) + Me.tableTBEDI_XML_TEMPLATE_ITEMS = CType(Me.Table,TBEDI_XML_TEMPLATE_ITEMSDataTable) End Sub _ Public Property GUID() As Integer Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.GUIDColumn),Integer) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.GUIDColumn),Integer) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.GUIDColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.GUIDColumn) = value End Set End Property @@ -2504,10 +2504,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property XML_NAME() As String Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.XML_NAMEColumn),String) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_NAMEColumn),String) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.XML_NAMEColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_NAMEColumn) = value End Set End Property @@ -2515,10 +2515,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property XML_TYPE_ID() As Integer Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.XML_TYPE_IDColumn),Integer) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TYPE_IDColumn),Integer) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.XML_TYPE_IDColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TYPE_IDColumn) = value End Set End Property @@ -2526,10 +2526,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IS_READ_ONLY() As Boolean Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.IS_READ_ONLYColumn),Boolean) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_READ_ONLYColumn),Boolean) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.IS_READ_ONLYColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_READ_ONLYColumn) = value End Set End Property @@ -2537,10 +2537,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IS_VISIBLE() As Boolean Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.IS_VISIBLEColumn),Boolean) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_VISIBLEColumn),Boolean) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.IS_VISIBLEColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_VISIBLEColumn) = value End Set End Property @@ -2548,10 +2548,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ORDER_KEY() As Integer Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.ORDER_KEYColumn),Integer) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ORDER_KEYColumn),Integer) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.ORDER_KEYColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ORDER_KEYColumn) = value End Set End Property @@ -2560,13 +2560,13 @@ Partial Public Class DS_DD_ECM Public Property FUNCTION_ID() As Integer Get Try - Return CType(Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn),Integer) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_IDColumn),Integer) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FUNCTION_ID in Tabelle TBEDI_XML_ITEMS ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FUNCTION_ID in Tabelle TBEDI_XML_TEMPLATE_ITEMS ist DBNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_IDColumn) = value End Set End Property @@ -2574,10 +2574,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IS_REQUIRED() As Boolean Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.IS_REQUIREDColumn),Boolean) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_REQUIREDColumn),Boolean) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.IS_REQUIREDColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_REQUIREDColumn) = value End Set End Property @@ -2585,10 +2585,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property XML_TABLE_ID() As Integer Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.XML_TABLE_IDColumn),Integer) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TABLE_IDColumn),Integer) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.XML_TABLE_IDColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.XML_TABLE_IDColumn) = value End Set End Property @@ -2596,10 +2596,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property IS_VIRTUAL() As Boolean Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.IS_VIRTUALColumn),Boolean) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_VIRTUALColumn),Boolean) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.IS_VIRTUALColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.IS_VIRTUALColumn) = value End Set End Property @@ -2608,13 +2608,14 @@ Partial Public Class DS_DD_ECM Public Property FUNCTION_PARAMETERS() As String Get Try - Return CType(Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn),String) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_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) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FUNCTION_PARAMETERS in Tabelle TBEDI_XML_TEMPLATE_ITEMS ist D"& _ + "BNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_PARAMETERSColumn) = value End Set End Property @@ -2622,10 +2623,10 @@ Partial Public Class DS_DD_ECM Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHOColumn),String) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ADDED_WHOColumn),String) End Get Set - Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHOColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ADDED_WHOColumn) = value End Set End Property @@ -2634,13 +2635,13 @@ Partial Public Class DS_DD_ECM Public Property ADDED_WHEN() As Date Get Try - Return CType(Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn),Date) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_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) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBEDI_XML_TEMPLATE_ITEMS ist DBNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ADDED_WHENColumn) = value End Set End Property @@ -2649,13 +2650,13 @@ Partial Public Class DS_DD_ECM Public Property CHANGED_WHO() As String Get Try - Return CType(Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn),String) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_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) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBEDI_XML_TEMPLATE_ITEMS ist DBNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHOColumn) = value End Set End Property @@ -2664,21 +2665,21 @@ Partial Public Class DS_DD_ECM Public Property CHANGED_WHEN() As Date Get Try - Return CType(Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn),Date) + Return CType(Me(Me.tableTBEDI_XML_TEMPLATE_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) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBEDI_XML_TEMPLATE_ITEMS ist DBNull.", e) End Try End Get Set - Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) = value + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHENColumn) = value End Set End Property _ - Public Property TBEDI_XML_ITEMSRowParentByFK_TBEDI_XML_TYPES() As TBEDI_XML_ITEMSRow + Public Property TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_TYPES() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_TYPES")) @@ -2687,9 +2688,9 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRowParentByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow + Public Property TBEDI_XML_TEMPLATE_ITEMSRowParentByFK_TBEDI_XML_NODES() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBEDI_XML_NODES")) @@ -2699,61 +2700,61 @@ Partial Public Class DS_DD_ECM _ Public Function IsFUNCTION_IDNull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn) + Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_IDColumn) End Function _ Public Sub SetFUNCTION_IDNull() - Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_IDColumn) = Global.System.Convert.DBNull + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_IDColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsFUNCTION_PARAMETERSNull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) + Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_PARAMETERSColumn) End Function _ Public Sub SetFUNCTION_PARAMETERSNull() - Me(Me.tableTBEDI_XML_ITEMS.FUNCTION_PARAMETERSColumn) = Global.System.Convert.DBNull + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.FUNCTION_PARAMETERSColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) + Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ADDED_WHENColumn) End Function _ Public Sub SetADDED_WHENNull() - Me(Me.tableTBEDI_XML_ITEMS.ADDED_WHENColumn) = Global.System.Convert.DBNull + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.ADDED_WHENColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) + Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHOColumn) End Function _ Public Sub SetCHANGED_WHONull() - Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHOColumn) = Global.System.Convert.DBNull + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) + Return Me.IsNull(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHENColumn) End Function _ Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBEDI_XML_ITEMS.CHANGED_WHENColumn) = Global.System.Convert.DBNull + Me(Me.tableTBEDI_XML_TEMPLATE_ITEMS.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub _ - Public Function GetTBEDI_XML_ITEMSRowsByFK_TBEDI_XML_TYPES() As TBEDI_XML_ITEMSRow() + Public Function GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_TYPES() As TBEDI_XML_TEMPLATE_ITEMSRow() If (Me.Table.ChildRelations("FK_TBEDI_XML_TYPES") Is Nothing) Then - Return New TBEDI_XML_ITEMSRow(-1) {} + Return New TBEDI_XML_TEMPLATE_ITEMSRow(-1) {} Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_ITEMSRow()) + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow()) End If End Function _ - Public Function GetTBEDI_XML_ITEMSRowsByFK_TBEDI_XML_NODES() As TBEDI_XML_ITEMSRow() + Public Function GetTBEDI_XML_TEMPLATE_ITEMSRowsByFK_TBEDI_XML_NODES() As TBEDI_XML_TEMPLATE_ITEMSRow() If (Me.Table.ChildRelations("FK_TBEDI_XML_NODES") Is Nothing) Then - Return New TBEDI_XML_ITEMSRow(-1) {} + Return New TBEDI_XML_TEMPLATE_ITEMSRow(-1) {} Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_ITEMSRow()) + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBEDI_XML_NODES")),TBEDI_XML_TEMPLATE_ITEMSRow()) End If End Function End Class @@ -2836,9 +2837,9 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_ITEMSRow + Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_TYPES")) @@ -3057,9 +3058,9 @@ Partial Public Class DS_DD_ECM _ - Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_ITEMSRow + Public Property TBEDI_XML_ITEMSRow() As TBEDI_XML_TEMPLATE_ITEMSRow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_ITEMSRow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")),TBEDI_XML_TEMPLATE_ITEMSRow) End Get Set Me.SetParentRow(value, Me.Table.ParentRelations("TBEDI_XML_ITEMS_TBEDI_XML_FUNCTIONS")) @@ -3224,16 +3225,16 @@ Partial Public Class DS_DD_ECM '''Row event argument class ''' _ - Public Class TBEDI_XML_ITEMSRowChangeEvent + Public Class TBEDI_XML_TEMPLATE_ITEMSRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBEDI_XML_ITEMSRow + Private eventRow As TBEDI_XML_TEMPLATE_ITEMSRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBEDI_XML_ITEMSRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBEDI_XML_TEMPLATE_ITEMSRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -3241,7 +3242,7 @@ Partial Public Class DS_DD_ECM _ - Public ReadOnly Property Row() As TBEDI_XML_ITEMSRow + Public ReadOnly Property Row() As TBEDI_XML_TEMPLATE_ITEMSRow Get Return Me.eventRow End Get @@ -3448,7 +3449,7 @@ Namespace DS_DD_ECMTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBEDI_XML_ITEMSTableAdapter + Partial Public Class TBEDI_XML_TEMPLATE_ITEMSTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -3565,7 +3566,7 @@ Namespace DS_DD_ECMTableAdapters 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_ITEMS" + tableMapping.DataSetTable = "TBEDI_XML_TEMPLATE_ITEMS" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("XML_NAME", "XML_NAME") tableMapping.ColumnMappings.Add("XML_TYPE_ID", "XML_TYPE_ID") @@ -3665,7 +3666,7 @@ 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.Fill, true)> _ - Public Overloads Overridable Function Fill(ByVal dataTable As DS_DD_ECM.TBEDI_XML_ITEMSDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMSDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -3678,9 +3679,9 @@ 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.[Select], true)> _ - Public Overloads Overridable Function GetData() As DS_DD_ECM.TBEDI_XML_ITEMSDataTable + Public Overloads Overridable Function GetData() As DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMSDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DS_DD_ECM.TBEDI_XML_ITEMSDataTable = New DS_DD_ECM.TBEDI_XML_ITEMSDataTable() + Dim dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMSDataTable = New DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMSDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -3688,7 +3689,7 @@ Namespace DS_DD_ECMTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As DS_DD_ECM.TBEDI_XML_ITEMSDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMSDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -3696,7 +3697,7 @@ 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")> _ Public Overloads Overridable Function Update(ByVal dataSet As DS_DD_ECM) As Integer - Return Me.Adapter.Update(dataSet, "TBEDI_XML_ITEMS") + Return Me.Adapter.Update(dataSet, "TBEDI_XML_TEMPLATE_ITEMS") End Function _ - Public Property TBEDI_XML_ITEMSTableAdapter() As TBEDI_XML_ITEMSTableAdapter + Public Property TBEDI_XML_TEMPLATE_ITEMSTableAdapter() As TBEDI_XML_TEMPLATE_ITEMSTableAdapter Get - Return Me._tBEDI_XML_ITEMSTableAdapter + Return Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter End Get Set - Me._tBEDI_XML_ITEMSTableAdapter = value + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter = value End Set End Property @@ -5680,9 +5681,9 @@ Namespace DS_DD_ECMTableAdapters If (Not (Me._connection) Is Nothing) Then Return Me._connection End If - If ((Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) _ - AndAlso (Not (Me._tBEDI_XML_ITEMSTableAdapter.Connection) Is Nothing)) Then - Return Me._tBEDI_XML_ITEMSTableAdapter.Connection + If ((Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection) Is Nothing)) Then + Return Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection End If If ((Not (Me._tBEDI_XML_TYPESTableAdapter) Is Nothing) _ AndAlso (Not (Me._tBEDI_XML_TYPESTableAdapter.Connection) Is Nothing)) Then @@ -5717,7 +5718,7 @@ Namespace DS_DD_ECMTableAdapters Public ReadOnly Property TableAdapterInstanceCount() As Integer Get Dim count As Integer = 0 - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then count = (count + 1) End If If (Not (Me._tBEDI_XML_TYPESTableAdapter) Is Nothing) Then @@ -5746,15 +5747,15 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As DS_DD_ECM, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATE_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then 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)) + result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -5813,14 +5814,14 @@ Namespace DS_DD_ECMTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As DS_DD_ECM, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATE_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_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)) + result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -5914,14 +5915,14 @@ Namespace DS_DD_ECMTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBEDI_XML_TEMPLATE_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_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)) + result = (result + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -5966,8 +5967,8 @@ Namespace DS_DD_ECMTableAdapters If (dataSet.HasChanges = false) Then Return 0 End If - If ((Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) _ - AndAlso (Me.MatchTableAdapterConnection(Me._tBEDI_XML_ITEMSTableAdapter.Connection) = false)) Then + If ((Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.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 @@ -6030,13 +6031,13 @@ Namespace DS_DD_ECMTableAdapters Try '---- Prepare for update ----------- ' - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then - revertConnections.Add(Me._tBEDI_XML_ITEMSTableAdapter, Me._tBEDI_XML_ITEMSTableAdapter.Connection) - Me._tBEDI_XML_ITEMSTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) - Me._tBEDI_XML_ITEMSTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) - If Me._tBEDI_XML_ITEMSTableAdapter.Adapter.AcceptChangesDuringUpdate Then - Me._tBEDI_XML_ITEMSTableAdapter.Adapter.AcceptChangesDuringUpdate = false - adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_ITEMSTableAdapter.Adapter) + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter, Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection) + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Adapter) End If End If If (Not (Me._tBEDI_XML_TYPESTableAdapter) Is Nothing) Then @@ -6144,9 +6145,9 @@ Namespace DS_DD_ECMTableAdapters If workConnOpened Then workConnection.Close End If - If (Not (Me._tBEDI_XML_ITEMSTableAdapter) Is Nothing) Then - Me._tBEDI_XML_ITEMSTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_ITEMSTableAdapter),Global.System.Data.SqlClient.SqlConnection) - Me._tBEDI_XML_ITEMSTableAdapter.Transaction = Nothing + If (Not (Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter) Is Nothing) Then + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBEDI_XML_TEMPLATE_ITEMSTableAdapter.Transaction = Nothing End If If (Not (Me._tBEDI_XML_TYPESTableAdapter) Is Nothing) Then Me._tBEDI_XML_TYPESTableAdapter.Connection = CType(revertConnections(Me._tBEDI_XML_TYPESTableAdapter),Global.System.Data.SqlClient.SqlConnection) diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd index 79f774d..c781a82 100644 --- a/MultiTool.Form/DS_DD_ECM.xsd +++ b/MultiTool.Form/DS_DD_ECM.xsd @@ -7,7 +7,7 @@ - + @@ -369,7 +369,7 @@ WHERE (GUID = @Original_GUID) - + @@ -414,7 +414,7 @@ WHERE (GUID = @Original_GUID) - + @@ -428,7 +428,7 @@ WHERE (GUID = @Original_GUID) - + @@ -449,7 +449,7 @@ WHERE (GUID = @Original_GUID) - + @@ -465,7 +465,7 @@ WHERE (GUID = @Original_GUID) - + @@ -493,7 +493,7 @@ WHERE (GUID = @Original_GUID) - + @@ -533,7 +533,7 @@ WHERE (GUID = @Original_GUID) - + @@ -555,11 +555,11 @@ WHERE (GUID = @Original_GUID) - - - - - + + + + + \ No newline at end of file diff --git a/MultiTool.Form/DS_DD_ECM.xss b/MultiTool.Form/DS_DD_ECM.xss index 1e1348a..beba0f0 100644 --- a/MultiTool.Form/DS_DD_ECM.xss +++ b/MultiTool.Form/DS_DD_ECM.xss @@ -6,7 +6,7 @@ --> - + diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb index c8ff012..7b01b94 100644 --- a/MultiTool.Form/frmConfig.Designer.vb +++ b/MultiTool.Form/frmConfig.Designer.vb @@ -48,7 +48,7 @@ Partial Class frmConfig Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() 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() + Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter = New MultiTool.Form.DS_DD_ECMTableAdapters.TBEDI_XML_TEMPLATE_ITEMSTableAdapter() 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() @@ -250,7 +250,7 @@ Partial Class frmConfig ' 'TBEDI_XML_ITEMSTableAdapter ' - Me.TBEDI_XML_ITEMSTableAdapter.ClearBeforeFill = True + Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter.ClearBeforeFill = True ' 'TBEDI_XML_CONFIGTableAdapter ' @@ -261,7 +261,7 @@ Partial Class frmConfig 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_TEMPLATE_ITEMSTableAdapter = Me.TBEDI_XML_TEMPLATE_ITEMSTableAdapter Me.TableAdapterManager.TBEDI_XML_NODESTableAdapter = Nothing Me.TableAdapterManager.TBEDI_XML_TEMPLATESTableAdapter = Nothing Me.TableAdapterManager.TBEDI_XML_TYPESTableAdapter = Nothing @@ -413,7 +413,7 @@ Partial Class frmConfig Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView 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 TBEDI_XML_TEMPLATE_ITEMSTableAdapter As DS_DD_ECMTableAdapters.TBEDI_XML_TEMPLATE_ITEMSTableAdapter 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 diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 76f09db..aaea886 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -29,8 +29,8 @@ Public Class frmConfig .InitialCatalog = "DD_ECM" } - TBEDI_XML_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString() - TBEDI_XML_ITEMSTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_ITEMS) + TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Connection.ConnectionString = oBuilder.ToString() + TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMS) TBEDI_XML_CONFIGTableAdapter.Connection.ConnectionString = oBuilder.ToString() TBEDI_XML_CONFIGTableAdapter.Fill(Me.DS_DD_ECM.TBEDI_XML_CONFIG) @@ -42,7 +42,7 @@ Public Class frmConfig TBEDI_XML_CONFIGTableAdapter.Update(DS_DD_ECM.TBEDI_XML_CONFIG) TBEDIXMLITEMSBindingSource.EndEdit() - TBEDI_XML_ITEMSTableAdapter.Update(DS_DD_ECM.TBEDI_XML_ITEMS) + TBEDI_XML_TEMPLATE_ITEMSTableAdapter.Update(DS_DD_ECM.TBEDI_XML_TEMPLATE_ITEMS) Catch ex As Exception FormHelper.ShowError(ex, "Speichern der Konfiguration") End Try diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index 3824f5e..96bdf25 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -23,7 +23,6 @@ Partial Class frmExportMain _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmExportMain)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.txtResults = New DevExpress.XtraBars.BarStaticItem() @@ -40,7 +39,6 @@ Partial Class frmExportMain Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.GridControlDocuments = New DevExpress.XtraGrid.GridControl() Me.GridViewDocuments = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colSelected = New DevExpress.XtraGrid.Columns.GridColumn() Me.colImported = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemImageComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox() Me.BooleanImages = New DevExpress.Utils.SvgImageCollection(Me.components) @@ -233,22 +231,12 @@ Partial Class frmExportMain ' 'GridViewDocuments ' - Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelected, Me.colImported, Me.colNumber, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6}) + Me.GridViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colImported, Me.colNumber, Me.colAccount, Me.GridColumn7, Me.colDate, Me.GridColumn5, Me.GridColumn6}) Me.GridViewDocuments.GridControl = Me.GridControlDocuments Me.GridViewDocuments.Name = "GridViewDocuments" - ' - 'colSelected - ' - Me.colSelected.FieldName = "IsSelected" - Me.colSelected.ImageOptions.SvgImage = CType(resources.GetObject("colSelected.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.colSelected.MaxWidth = 27 - Me.colSelected.MinWidth = 27 - Me.colSelected.Name = "colSelected" - Me.colSelected.ToolTip = "Ausgewählt" - Me.colSelected.Visible = True - Me.colSelected.VisibleIndex = 0 - Me.colSelected.Width = 27 + Me.GridViewDocuments.OptionsSelection.CheckBoxSelectorField = "IsSelected" + Me.GridViewDocuments.OptionsSelection.MultiSelect = True + Me.GridViewDocuments.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect ' 'colImported ' @@ -714,7 +702,6 @@ Partial Class frmExportMain Friend WithEvents colNumber As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colAccount As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colDate As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem diff --git a/MultiTool.Form/frmExportMain.resx b/MultiTool.Form/frmExportMain.resx index ed25826..2876866 100644 --- a/MultiTool.Form/frmExportMain.resx +++ b/MultiTool.Form/frmExportMain.resx @@ -117,28 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFUCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku - WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 - N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk - aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyNyw0 - IDExLDIwIDUsMTQgMiwxNyAxMSwyNiAzMCw3ICIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== - - 189, 17 - - 189, 17 + + 87 \ No newline at end of file diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index a7163ed..3480182 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -6,6 +6,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports MultiTool.Shared Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Exceptions Imports MultiTool.Shared.Winline Imports MultiTool.Shared.Winline.Entities @@ -57,7 +58,7 @@ Public Class frmExportMain Winline = My.Winline FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) - WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) + WebService = New WebServiceData(LogConfig, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress Catch ex As Exception @@ -79,6 +80,12 @@ Public Class frmExportMain lookupDocumentKind.Properties.DataSource = Winline.DocumentKinds lookupDocumentKind.ForceInitialize() lookupDocumentKind.Properties.View.BestFitColumns() + + If ConfigManager.Config.LastUsedMandator <> "" Then + lookupMandator.EditValue = Winline.Mandators. + Where(Function(mandator) mandator.Id = ConfigManager.Config.LastUsedMandator). + FirstOrDefault() + End If Catch ex As Exception FormHelper.ShowError(ex, "Initialisierung der Form") End Try @@ -96,6 +103,9 @@ Public Class frmExportMain Dim oMandator As Mandator = lookupMandator.EditValue lookupAccount.Properties.DataSource = Winline.Accounts.Where(Function(acc) acc.Mandator.Equals(oMandator)) lookupDocumentKind.Properties.DataSource = Winline.DocumentKinds.Where(Function(kind) kind.Mandator.Equals(oMandator)) + + ConfigManager.Config.LastUsedMandator = oMandator.Id + ConfigManager.Save() End Sub Private Sub lookup_Properties_ButtonClick(sender As Object, e As DevExpress.XtraEditors.Controls.ButtonPressedEventArgs) _ @@ -156,16 +166,33 @@ Public Class frmExportMain Try SplashScreenManager.ShowWaitForm() - Dim oDocument As Document = GridViewDocuments.GetRow(GridViewDocuments.FocusedRowHandle) - Dim oMandator As Mandator = lookupMandator.EditValue + Dim oExportResult = False + Dim oRowHandles = GridViewDocuments.GetSelectedRows() + Dim oExportCount = 0 - Dim oExportResult = Await WebService.ExportDocumentFromWinline(oDocument, CurrentTemplate, oMandator) + For Each oRowHandle In oRowHandles + oExportCount += 1 - If oExportResult = True Then - 'TODO: Execute the FinalSql before exiting - 'TODO: Replace a few numbers like account numbers back to GLNs - MsgBox("Datei wurde ergfolgreich exportiert!", MsgBoxStyle.Information, Text) - End If + Dim oDocument As Document = GridViewDocuments.GetRow(oRowHandle) + Dim oMandator As Mandator = lookupMandator.EditValue + + Dim oMessage = String.Format("Beleg {0} exportieren.. ({1}/{2})", oDocument.Number, oExportCount, oRowHandles.Length) + SplashScreenManager.SetWaitFormDescription(oMessage) + + Await WebService.ExportDocumentFromWinline(oDocument, CurrentTemplate, oMandator) + Dim oFinalSqlResult = Await Winline.ExecuteFinalSQL(oDocument, CurrentTemplate, oMandator) + + If oFinalSqlResult = False Then + Throw New DatabaseException("FinalSQL was not executed successfully!") + End If + + oDocument.IsExported = True + Next + + MsgBox($"{oExportCount} Dateien wurde erfolgreich exportiert!", MsgBoxStyle.Information, Text) + + Catch ex As MissingAttributeException + FormHelper.ShowError(ex, "Exportieren der Daten") Catch ex As Exception FormHelper.ShowError(ex, "Exportieren der Daten") diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 16db233..e96bf8b 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -36,7 +36,6 @@ Partial Class frmImportMain Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colMandator = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.cmbMandators = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.BandedGridColumn1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.txtFilesLoaded = New DevExpress.XtraBars.BarStaticItem() Me.btnLoadFiles = New DevExpress.XtraBars.BarButtonItem() @@ -162,7 +161,7 @@ Partial Class frmImportMain 'GridViewFiles ' Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.GridBand2}) - Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt, Me.BandedGridColumn1}) + Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt}) Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.Name = "GridViewFiles" Me.GridViewFiles.OptionsView.ShowBands = False @@ -228,12 +227,6 @@ Partial Class frmImportMain Me.cmbMandators.Items.AddRange(New Object() {resources.GetString("cmbMandators.Items")}) Me.cmbMandators.Name = "cmbMandators" ' - 'BandedGridColumn1 - ' - resources.ApplyResources(Me.BandedGridColumn1, "BandedGridColumn1") - Me.BandedGridColumn1.FieldName = "Mandator" - Me.BandedGridColumn1.Name = "BandedGridColumn1" - ' 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 @@ -734,7 +727,6 @@ Partial Class frmImportMain Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager Friend WithEvents btnTestTransferFile As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BandedGridColumn1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn 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 diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 7e734e7..9280066 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -196,12 +196,6 @@ 683 - - BandedGridColumn1 - - - True - 0 Dateien geladen @@ -356,12 +350,6 @@ DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BandedGridColumn1 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - txtFilesLoaded diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 1c62d59..b5bf4d1 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -77,7 +77,7 @@ Public Class frmImportMain Winline = My.Winline FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) - WebService = New WebServiceData(LogConfig, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) + WebService = New WebServiceData(LogConfig, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration) AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress Catch ex As Exception diff --git a/MultiTool.Form/frmMain.vb b/MultiTool.Form/frmMain.vb index e89a30b..56f1107 100644 --- a/MultiTool.Form/frmMain.vb +++ b/MultiTool.Form/frmMain.vb @@ -74,9 +74,9 @@ Public Class frmMain ' Initialize Schemas TemplateLoader = New TemplateLoader(LogConfig, Database) - Await TemplateLoader.LoadGeneralConfiguration() Await TemplateLoader.LoadTemplates() Await TemplateLoader.LoadTemplateConfiguration() + Await TemplateLoader.LoadGeneralConfiguration() Await TemplateLoader.LoadMappingConfiguration() Await TemplateLoader.LoadMandatorConfiguration() @@ -123,49 +123,8 @@ Public Class frmMain End Sub Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick - Try - Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle) - - If oTemplate Is Nothing Then - MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text) - Exit Sub - End If - - ' Initialize template tables - oTemplate.Tables = New List(Of Template.Table) - - ' Fill tables - oTemplate = TemplateLoader.UpdateTemplateFromFile(oTemplate, My.GeneralConfiguration.TemplateDirectory) - oTemplate = TemplateLoader.UpdateTemplateFromDatabase(oTemplate) - oTemplate = TemplateLoader.UpdateTemplateTablesFromDatabase(oTemplate, TemplateLoader.TemplateConfiguration) - - Dim oBaseDirectories As New List(Of String) From { - oTemplate.InputDirectory, - oTemplate.OutputDirectory, - oTemplate.ArchiveDirectory - } - Dim oOutputDirectories As New List(Of String) From { - oTemplate.OutputReportDirectory, - oTemplate.OutputWebserviceDirectory, - oTemplate.OutputXmlFileDirectory - } - - If TryCreateTemplateDirectories(oBaseDirectories) Then - If TryCreateTemplateDirectories(oOutputDirectories) Then - If oTemplate.IsImport Then - Dim oForm As New frmImportMain(LogConfig, ConfigManager, oTemplate) - oForm.ShowDialog() - Else - Dim oForm As New frmExportMain(LogConfig, ConfigManager, oTemplate) - oForm.ShowDialog() - End If - End If - End If - - Catch ex As Exception - FormHelper.ShowError(ex, My.Resources.frmMainExtra.Laden_der_Vorlage) - - End Try + Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle) + OpenImportExportForm(oTemplate) End Sub Private Function TryCreateTemplateDirectories(pDirectories As List(Of String)) As Boolean @@ -207,4 +166,55 @@ Public Class frmMain Private Sub btnOpenSchemaDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenSchemaDirectory.ItemClick FormHelper.TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis) End Sub + + Private Sub GridViewTemplates_DoubleClick(sender As Object, e As EventArgs) Handles GridViewTemplates.DoubleClick + Dim oTemplate As Template = GridViewTemplates.GetRow(GridViewTemplates.FocusedRowHandle) + OpenImportExportForm(oTemplate) + End Sub + + Private Sub OpenImportExportForm(pTemplate As Template) + Try + + + If pTemplate Is Nothing Then + MsgBox("Keine Vorlage ausgewählt! Bitte wählen Sie eine Vorlage aus!", MsgBoxStyle.Exclamation, Text) + Exit Sub + End If + + ' Initialize template tables + pTemplate.Tables = New List(Of Template.Table) + + ' Fill tables + pTemplate = TemplateLoader.UpdateTemplateFromFile(pTemplate, My.GeneralConfiguration.TemplateDirectory) + pTemplate = TemplateLoader.UpdateTemplateFromDatabase(pTemplate) + pTemplate = TemplateLoader.UpdateTemplateTablesFromDatabase(pTemplate, TemplateLoader.TemplateConfiguration) + + Dim oBaseDirectories As New List(Of String) From { + pTemplate.InputDirectory, + pTemplate.OutputDirectory, + pTemplate.ArchiveDirectory + } + Dim oOutputDirectories As New List(Of String) From { + pTemplate.OutputReportDirectory, + pTemplate.OutputWebserviceDirectory, + pTemplate.OutputXmlFileDirectory + } + + If TryCreateTemplateDirectories(oBaseDirectories) Then + If TryCreateTemplateDirectories(oOutputDirectories) Then + If pTemplate.IsImport Then + Dim oForm As New frmImportMain(LogConfig, ConfigManager, pTemplate) + oForm.ShowDialog() + Else + Dim oForm As New frmExportMain(LogConfig, ConfigManager, pTemplate) + oForm.ShowDialog() + End If + End If + End If + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmMainExtra.Laden_der_Vorlage) + + End Try + End Sub End Class \ No newline at end of file diff --git a/MultiTool.Shared/Config.vb b/MultiTool.Shared/Config.vb index 23d6564..8c66802 100644 --- a/MultiTool.Shared/Config.vb +++ b/MultiTool.Shared/Config.vb @@ -3,5 +3,6 @@ Public Class Config Public Property ConnectionString As String = "" + Public Property LastUsedMandator As String = "" Public Property Debug As Boolean = False End Class diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Shared/Documents/DocumentLoader.vb index b0d04da..91100d5 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Shared/Documents/DocumentLoader.vb @@ -241,15 +241,15 @@ Namespace Documents If oMandator Is Nothing Then Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name) Else - pDocument = MatchDocumentDataFromHardcodedMappings(pDocument, oMandator, pTemplate) - pDocument = MatchDocumentDataFromDynamicMappings(pDocument, oMandator) + pDocument = ApplyDefinedItemFunctionsForImport(pDocument, oMandator, pTemplate) + pDocument = ApplyDynamicItemFunctionsForImport(pDocument, oMandator) End If pDocument.Mandator = oMandator Return pDocument End Function - Private Function MatchDocumentDataFromHardcodedMappings(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document + Private Function ApplyDefinedItemFunctionsForImport(pDocument As Document, pMandator As Mandator, pTemplate As Template) As Document If pMandator Is Nothing Then Return pDocument End If @@ -284,7 +284,7 @@ Namespace Documents Return pDocument End Function - Private Function MatchDocumentDataFromDynamicMappings(pDocument As Document, pMandator As Mandator) As Document + Private Function ApplyDynamicItemFunctionsForImport(pDocument As Document, pMandator As Mandator) As Document If pMandator Is Nothing Then Return pDocument End If diff --git a/MultiTool.Shared/Exceptions.vb b/MultiTool.Shared/Exceptions.vb index 7d811a4..cc5dd75 100644 --- a/MultiTool.Shared/Exceptions.vb +++ b/MultiTool.Shared/Exceptions.vb @@ -20,49 +20,57 @@ End Sub End Class + Public Class DatabaseException + Inherits MultiToolException + + Public Sub New(message As String) + MyBase.New(message) + End Sub + End Class + Public Class WebServiceException - Inherits MultiToolException - - Public Sub New(message As String) - MyBase.New(message) - End Sub - End Class - - Public Class MissingAttributeException - Inherits MultiToolException - - Public Sub New(attributeName As String) - MyBase.New(attributeName) - End Sub - End Class - Public Class MultipleAccountsException - Inherits MultiToolException - - Public Sub New(message As String) - MyBase.New(message) - End Sub - End Class - Public Class NoAccountException - Inherits MultiToolException - - Public Sub New(message As String) - MyBase.New(message) - End Sub - End Class - Public Class NoMandatorException - Inherits MultiToolException - - Public Sub New(message As String) - MyBase.New(message) - End Sub - End Class - Public Class MalformedXmlException - Inherits MultiToolException - - Public Sub New(message As String) - MyBase.New(message) - End Sub - End Class + Inherits MultiToolException + Public Sub New(message As String) + MyBase.New(message) + End Sub + End Class + + Public Class MissingAttributeException + Inherits MultiToolException + + Public Sub New(attributeName As String) + MyBase.New(attributeName) + End Sub + End Class + Public Class MultipleAccountsException + Inherits MultiToolException + Public Sub New(message As String) + MyBase.New(message) + End Sub End Class + Public Class NoAccountException + Inherits MultiToolException + + Public Sub New(message As String) + MyBase.New(message) + End Sub + End Class + Public Class NoMandatorException + Inherits MultiToolException + + Public Sub New(message As String) + MyBase.New(message) + End Sub + End Class + Public Class MalformedXmlException + Inherits MultiToolException + + Public Sub New(message As String) + MyBase.New(message) + End Sub + End Class + + +End Class diff --git a/MultiTool.Shared/Patterns.vb b/MultiTool.Shared/Patterns.vb index 3385dae..ae16993 100644 --- a/MultiTool.Shared/Patterns.vb +++ b/MultiTool.Shared/Patterns.vb @@ -2,6 +2,7 @@ Imports DigitalData.Modules.Logging Imports MultiTool.Shared.Documents Imports MultiTool.Shared.Templates +Imports MultiTool.Shared.Winline.Entities Public Class Patterns Inherits BaseClass @@ -13,7 +14,7 @@ Public Class Patterns GeneralConfig = pGeneralConfig End Sub - Public Function Replace(pDocument As Document, pRow As DocumentRow, oString As String) + Public Function ReplaceForImport(pDocument As Documents.Document, pRow As DocumentRow, oString As String) Dim oRegex = New Regex("{#(\w+)#([\w\s_-]+)}+") Dim oMatches As MatchCollection = oRegex.Matches(oString) @@ -34,7 +35,7 @@ Public Class Patterns Case "CONST" Dim oValue = "" - Select Case oMatch.Groups.Item(2).Value.ToUpper + Select Case oPlaceholderValue.ToUpper Case "MESOYEAR" oValue = GeneralConfig.GetWinLineYear() @@ -56,7 +57,59 @@ Public Class Patterns End Select If oValue <> "" Then - oString = oString.Replace(oPlaceholderValue, oValue) + oString = oString.Replace(oPlaceholderString, oValue) + End If + End Select + Next + + Return oString + End Function + + Public Function ReplaceForExport(pTemplate As Template, pDocument As Winline.Entities.Document, pMandator As Mandator, oString As String) + Dim oRegex = New Regex("{#(\w+)#([\w\s_-]+)}+") + Dim oMatches As MatchCollection = oRegex.Matches(oString) + + 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 "CONST" + Dim oValue = "" + + Select Case oPlaceholderValue.ToUpper + Case "MESOYEAR" + oValue = GeneralConfig.GetWinLineYear() + + Case "MESOCOMP" + oValue = pMandator.Id + + Case "USERNAME" + oValue = Environment.UserName + + Case "CURRENTDATE" + oValue = Now.ToString() + + Case "FILENAME" + oValue = pDocument.FilenameExport + + Case "ACCOUNTNUMBER" + oValue = pDocument.Account.Id + + Case "RUNNINGNUMBER" + oValue = pDocument.RunningNumber + + Case "MANDATORDB" + oValue = pMandator.Database + + Case Else + oValue = "" + + End Select + + If oValue <> "" Then + oString = oString.Replace(oPlaceholderString, oValue) End If End Select Next diff --git a/MultiTool.Shared/Report/ReportGenerator.vb b/MultiTool.Shared/Report/ReportGenerator.vb index 9dd1208..3bd19d5 100644 --- a/MultiTool.Shared/Report/ReportGenerator.vb +++ b/MultiTool.Shared/Report/ReportGenerator.vb @@ -116,7 +116,7 @@ Public Class ReportGenerator(Of TReport As IReport) SingleOrDefault() Dim oSQL = oSQLConfigItem.Function.Params - oSQL = Patterns.Replace(pDocument, oRow, oSQL) + oSQL = Patterns.ReplaceForImport(pDocument, oRow, oSQL) Dim oValue = Database.GetScalarValue(oSQL) diff --git a/MultiTool.Shared/Templates/GeneralConfig.vb b/MultiTool.Shared/Templates/GeneralConfig.vb index 3873348..af0aff3 100644 --- a/MultiTool.Shared/Templates/GeneralConfig.vb +++ b/MultiTool.Shared/Templates/GeneralConfig.vb @@ -2,8 +2,6 @@ Public Class GeneralConfig Public Property TemplateDirectory As String = "" - Public Property Templates As New List(Of TemplateConfig) - Public Property Webservice As New WebServiceConfig() Public Property DefaultYearOverride As Integer = 0 diff --git a/MultiTool.Shared/Templates/Template.vb b/MultiTool.Shared/Templates/Template.vb index 3f5c771..0051e32 100644 --- a/MultiTool.Shared/Templates/Template.vb +++ b/MultiTool.Shared/Templates/Template.vb @@ -46,6 +46,10 @@ ''' Public Property IsRequired As Boolean Public Property Config As TemplateConfigItem + + Public Overrides Function ToString() As String + Return Name + End Function End Class End Class End Namespace diff --git a/MultiTool.Shared/Templates/TemplateConfig.vb b/MultiTool.Shared/Templates/TemplateConfig.vb index e032a0b..3014a9a 100644 --- a/MultiTool.Shared/Templates/TemplateConfig.vb +++ b/MultiTool.Shared/Templates/TemplateConfig.vb @@ -8,9 +8,9 @@ Namespace Templates Public Class TemplateConfig Public Property Items As List(Of TemplateConfigItem) - Public Function GetColumn(pName As String) As TemplateConfigItem + Public Function GetColumn(pName As String, pTable As String) As TemplateConfigItem Return Items. - Where(Function(c) c.Name = pName). + Where(Function(c) c.Name = pName And c.Table = pTable). FirstOrDefault() End Function End Class diff --git a/MultiTool.Shared/Templates/TemplateLoader.vb b/MultiTool.Shared/Templates/TemplateLoader.vb index 1efbaa1..ca6195f 100644 --- a/MultiTool.Shared/Templates/TemplateLoader.vb +++ b/MultiTool.Shared/Templates/TemplateLoader.vb @@ -242,7 +242,7 @@ Namespace Templates For Each oTable In pTemplate.Tables For Each oColumn As Template.Column In oTable.Columns - Dim oConfig = pTemplateConfig.GetColumn(oColumn.Name) + Dim oConfig = pTemplateConfig.GetColumn(oColumn.Name, oTable.Name) If oConfig Is Nothing Then oConfig = New TemplateConfigItem With { diff --git a/MultiTool.Shared/Winline/Entities/Article.vb b/MultiTool.Shared/Winline/Entities/Article.vb index df38dcb..20987a7 100644 --- a/MultiTool.Shared/Winline/Entities/Article.vb +++ b/MultiTool.Shared/Winline/Entities/Article.vb @@ -1,8 +1,8 @@ Namespace Winline.Entities Public Class Article - Public Property Id - Public Property Name - Public Property EAN + Public Property Id As String + Public Property Name As String + Public Property EAN As String Public Property Mandator As Mandator Public Overrides Function GetHashCode() As Integer diff --git a/MultiTool.Shared/Winline/Entities/Document.vb b/MultiTool.Shared/Winline/Entities/Document.vb index e4d0c40..321fadb 100644 --- a/MultiTool.Shared/Winline/Entities/Document.vb +++ b/MultiTool.Shared/Winline/Entities/Document.vb @@ -19,6 +19,8 @@ Public Property IsSelected As Boolean = False Public Property IsExported As Boolean = False + + Public Property FilenameExport As String End Class End Namespace \ No newline at end of file diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb index b3d179c..d5cdc3d 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Shared/Winline/WebServiceData.vb @@ -15,16 +15,18 @@ Namespace Winline Private ReadOnly Config As WebServiceConfig Private ReadOnly Serializer As Serializer Private ReadOnly GeneralConfig As GeneralConfig + Private ReadOnly Winline As WinlineData Private ReadOnly FileEx As File Public Event WebServiceProgress As EventHandler(Of String) - Public Sub New(pLogConfig As LogConfig, pWebserviceConfig As WebServiceConfig, pGeneralConfig As GeneralConfig) + Public Sub New(pLogConfig As LogConfig, pWinline As WinlineData, pWebserviceConfig As WebServiceConfig, pGeneralConfig As GeneralConfig) MyBase.New(pLogConfig) Serializer = New Serializer(pLogConfig) Config = pWebserviceConfig GeneralConfig = pGeneralConfig FileEx = New DigitalData.Modules.Filesystem.File(LogConfig) + Winline = pWinline End Sub Public Sub RaiseWebServiceProgress(pMessage As String) @@ -208,6 +210,9 @@ Namespace Winline Dim oBaseFileName As String = FileEx.GetDateTimeString() Dim oFileName = FileEx.GetFilenameWithSuffix(oBaseFileName, "Request", "xml") + ' Save the filename to the document + pDocument.FilenameExport = oFileName + ' Absolute Path to copy Request file Dim oImportAbsolutePath = IO.Path.Combine(oWS.ImportBasePath, oWS.ImportRelativePath) Dim oImportAbsoluteFilePath = IO.Path.Combine(FileEx.GetDateDirectory(oImportAbsolutePath), oFileName) @@ -242,18 +247,21 @@ Namespace Winline ' --- Bring the action! Try Dim oResponse As HttpResponseMessage = Await oClient.GetAsync(oURL) - Await HandleExportResponse(oResponse, pTemplate, oBaseFileName) + Await HandleExportResponse(oResponse, pTemplate, pMandator, oBaseFileName) Return True + Catch ex As Exception Logger.Error(ex) Throw ex + Finally oClient.Dispose() + End Try End Function - Private Async Function HandleExportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pBaseFileNAme As String) As Task + Private Async Function HandleExportResponse(pResponse As HttpResponseMessage, pTemplate As Template, pMandator As Mandator, pBaseFileNAme As String) As Task pResponse.EnsureSuccessStatusCode() Dim oResponseBody As String = Await pResponse.Content.ReadAsStringAsync() Dim oContentType = pResponse.Content.Headers.ContentType.MediaType @@ -261,11 +269,13 @@ Namespace Winline RaiseEvent WebServiceProgress(Me, "Antwort verarbeiten") + oResponseBody = ApplyItemFunctionsForExport(pTemplate, pMandator, oResponseBody) + Select Case oContentType Case "text/xml" WriteResponseFile(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "xml") WriteResponseFile(pTemplate.OutputXmlFileDirectory, pBaseFileNAme, oResponseBody, "xml") - WriteResponseFile(FileEx.GetDateDirectory(pTemplate.ArchiveDirectory), pBaseFileNAme, oResponseBody, "xml") + WriteResponseFile(FileEx.CreateDateDirectory(pTemplate.ArchiveDirectory), pBaseFileNAme, oResponseBody, "xml") Case "text/html" WriteResponseFile(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "txt") @@ -276,9 +286,54 @@ Namespace Winline Throw New ApplicationException(oResponseBody) End Select End Function + + Private Function ApplyItemFunctionsForExport(pTemplate As Template, pMandator As Mandator, oResponseBody As String) As String + Dim oDoc As New XmlDocument() + oDoc.LoadXml(oResponseBody) + + For Each oTable In pTemplate.Tables + For Each oItem As Template.Column In oTable.Columns + Dim oTableName As String = oTable.Name + Dim oItemName As String = oItem.Name + + If oItem.Config.Function Is Nothing Then + Continue For + End If + + Dim oFunction = oItem.Config.Function.Name + Dim oNode = oDoc.SelectSingleNode($"//MESOWebService/{oTableName}/{oItemName}") + + If oItem.Config.Function.Name = "GLN" Then + Dim oGLN = Winline.TryGetGLN(oNode.InnerText, pMandator) + If oGLN Is Nothing Then + Throw New Exceptions.MissingAttributeException("GLN") + End If + + oNode.InnerText = oGLN + ElseIf oItem.Config.Function.Name = "EAN" Then + Dim oEAN = Winline.TryGetEAN(oNode.InnerText, pMandator) + If oEAN Is Nothing Then + Throw New Exceptions.MissingAttributeException("EAN") + End If + + oNode.InnerText = oEAN + End If + Next + Next + + Dim oArray As Byte() + Using oStream As New IO.MemoryStream + oDoc.Save(oStream) + oArray = oStream.ToArray() + End Using + + Dim oXml = Text.Encoding.UTF8.GetString(oArray) + oResponseBody = oXml + Return oResponseBody + End Function #End Region - Private Function WriteResponseFile(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String) + Private Function WriteResponseFile(pPath As String, pBaseFileName As String, pResponseBody As String, pExtension As String) As Boolean Try Dim oRequestFileName As String = FileEx.GetFilenameWithSuffix(pBaseFileName, "Response", pExtension) Dim oFilePath As String = IO.Path.Combine(pPath, oRequestFileName) diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Shared/Winline/WinlineData.vb index ff57831..c9bd4af 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Shared/Winline/WinlineData.vb @@ -13,6 +13,7 @@ Namespace Winline Private ReadOnly Property Config As GeneralConfig Private ReadOnly Property MandatorConfig As MandatorConfig Private ReadOnly Property MappingConfig As MappingConfig + Private ReadOnly Property Patterns As Patterns Public Property Articles As New List(Of Article) Public Property Accounts As New List(Of Account) @@ -23,6 +24,7 @@ Namespace Winline Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As GeneralConfig, pMappingConfig As MappingConfig, pMandatorConfig As MandatorConfig) MyBase.New(pLogConfig) + Patterns = New Patterns(pLogConfig, pConfig) Database = pDatabase Config = pConfig MandatorConfig = pMandatorConfig @@ -223,7 +225,7 @@ Namespace Winline [c052], -- Ort [c051] -- PLZ FROM [{pMandator.Database}].[dbo].[v050] - WHERE [c004] = 2 -- KontoTyp + WHERE [c004] IN (2, 3) -- KontoTyp Debitor/Kreditor AND [c260] = '{pGLN}' AND [mesocomp] = '{pMandator.Id}' and [mesoyear] = {oYear}" Dim oTable As DataTable = Database.GetDatatable(oSQL) @@ -264,6 +266,37 @@ Namespace Winline End Try End Function + Public Function TryGetGLN(pAccountId As String, pMandator As Mandator) As String + Try + If pAccountId Is Nothing OrElse pAccountId = String.Empty Then + Return Nothing + End If + + Dim oYear As Integer = Config.GetWinLineYear() + Dim oSQL = $" + SELECT + [c260] -- GLN + FROM [{pMandator.Database}].[dbo].[v050] + WHERE [c004] IN (2, 3) -- KontoTyp Debitor/Kreditor + AND [c002] = '{pAccountId}' + AND [mesocomp] = '{pMandator.Id}' and [mesoyear] = {oYear}" + Dim oGLN As String = Database.GetScalarValue(oSQL) + + ' GLN not found in this Mandator, continue to next one + If oGLN Is Nothing Then + Logger.Debug("Account [{0}] was not found in Mandator: [{1}]", pAccountId, pMandator.Id) + Return Nothing + + End If + + Return oGLN + Catch ex As Exception + Logger.Warn("Error while trying to get GLN for Account [{0}]", pAccountId) + Logger.Error(ex) + Return Nothing + End Try + End Function + Public Function TryGetArticleNumber(pEAN As String, pMandator As Mandator) As String Try Dim oYear As Integer = Config.GetWinLineYear() @@ -303,6 +336,33 @@ Namespace Winline End Try End Function + Public Function TryGetEAN(pArticleNumber As String, pMandator As Mandator) As String + Try + Dim oYear As Integer = Config.GetWinLineYear() + Dim oSQL As String = $" + SELECT + [c075] -- EAN-Nummer + FROM [{pMandator.Database}].[dbo].[v021] + WHERE [c011] = '{pArticleNumber}' + AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}" + Dim oEAN As String = Database.GetScalarValue(oSQL) + + ' EAN not found in this Mandator, continue to next one + If oEAN Is Nothing Then + Logger.Debug("ArticleNumber [{0}] was not found in Mandator: [{1}]", pArticleNumber, pMandator.Id) + Return Nothing + + End If + + Return oEAN + + Catch ex As Exception + Logger.Error(ex) + Return Nothing + + End Try + End Function + Public Function GetContacts(pAccountNumber As String, pMandator As Mandator) As List(Of Contact) Try Dim oContacts As New List(Of Contact) @@ -480,7 +540,7 @@ Namespace Winline oDateConstraint = $"" End If - Dim oExportedConstraint = "c111 = 0 AND" + Dim oExportedConstraint = "U010 = 0 AND" If pOptions.ShowExported Then oExportedConstraint = "" End If @@ -509,7 +569,7 @@ Namespace Winline c100 GROSS_AMOUNT, c114 NET_AMOUNT, - c111 ALREADY_EXPORTED + U010 ALREADY_EXPORTED FROM [{pMandator.Database}].[dbo].[T025] WHERE @@ -543,13 +603,14 @@ Namespace Winline End Try End Function - Public Async Function ExecuteFinalSQL(pDocument As Document, pTemplate As Template) As Task(Of Boolean) + Public Async Function ExecuteFinalSQL(pDocument As Document, pTemplate As Template, pMandator As Mandator) As Task(Of Boolean) Try - Dim oSql As String = pTemplate.FinalSQL - + Dim oSql As String = Patterns.ReplaceForExport(pTemplate, pDocument, pMandator, pTemplate.FinalSQL) + Return Await Database.ExecuteNonQueryAsync(oSql) Catch ex As Exception - + Logger.Error(ex) + Return False End Try End Function