diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj
index 6ead589..1e05d50 100644
--- a/MultiTool.Form/MultiTool.Form.vbproj
+++ b/MultiTool.Form/MultiTool.Form.vbproj
@@ -54,6 +54,9 @@
My Project\app.manifest
+
+ ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll
+
@@ -167,12 +170,36 @@
Form
+
+ frmMapper.vb
+
+
+ Form
+
frmRowEditor.vb
Form
+
+ OrderReport.vb
+
+
+ Component
+
+
+ OrderReport2.vb
+
+
+ Component
+
+
+ XtraReport3.vb
+
+
+ Component
+
True
True
@@ -201,12 +228,6 @@
Settings.settings
True
-
- OrderReport.vb
-
-
- Component
-
frmWaitForm.vb
@@ -240,9 +261,21 @@
frmMain.vb
+
+ frmMapper.vb
+
frmRowEditor.vb
+
+ OrderReport.vb
+
+
+ OrderReport2.vb
+
+
+ XtraReport3.vb
+
My.Resources
ResXFileCodeGenerator
@@ -258,9 +291,6 @@
My.Resources
Designer
-
- OrderReport.vb
-
frmWaitForm.vb
@@ -339,5 +369,6 @@
MultiTool.Shared
+
\ No newline at end of file
diff --git a/MultiTool.Form/Reports/OrderReport.Designer.vb b/MultiTool.Form/Reports/OrderReport.Designer.vb
index 83d32a1..70541f5 100644
--- a/MultiTool.Form/Reports/OrderReport.Designer.vb
+++ b/MultiTool.Form/Reports/OrderReport.Designer.vb
@@ -20,568 +20,44 @@ Partial Public Class OrderReport
_
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Me.Title = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.GroupCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.GroupData1 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.DetailCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.DetailCaption2 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.DetailData2 = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle()
- Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
- Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
- Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
- Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
- Me.table3 = New DevExpress.XtraReports.UI.XRTable()
- Me.tableRow4 = New DevExpress.XtraReports.UI.XRTableRow()
- Me.tableCell44 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell47 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell49 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell50 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell52 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell53 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell54 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.table4 = New DevExpress.XtraReports.UI.XRTable()
- Me.tableRow5 = New DevExpress.XtraReports.UI.XRTableRow()
- Me.tableCell65 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell67 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell68 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell70 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell71 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell73 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell74 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.tableCell75 = New DevExpress.XtraReports.UI.XRTableCell()
- Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
- Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand()
- Me.DetailReport = New DevExpress.XtraReports.UI.DetailReportBand()
- Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel3 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel5 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel6 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel7 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel8 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel9 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel10 = New DevExpress.XtraReports.UI.XRLabel()
- Me.XrLabel11 = New DevExpress.XtraReports.UI.XRLabel()
- Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
- Me.XrLabel12 = New DevExpress.XtraReports.UI.XRLabel()
- CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.table4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
'
- 'Title
+ 'ObjectDataSource1
'
- Me.Title.BackColor = System.Drawing.Color.Transparent
- Me.Title.BorderColor = System.Drawing.Color.Black
- Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None
- Me.Title.BorderWidth = 1.0!
- Me.Title.Font = New System.Drawing.Font("Arial", 14.25!)
- Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer))
- Me.Title.Name = "Title"
- '
- 'GroupCaption1
- '
- Me.GroupCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
- Me.GroupCaption1.BorderColor = System.Drawing.Color.White
- Me.GroupCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
- Me.GroupCaption1.BorderWidth = 2.0!
- Me.GroupCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
- Me.GroupCaption1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer))
- Me.GroupCaption1.Name = "GroupCaption1"
- Me.GroupCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
- Me.GroupCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'GroupData1
- '
- Me.GroupData1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
- Me.GroupData1.BorderColor = System.Drawing.Color.White
- Me.GroupData1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
- Me.GroupData1.BorderWidth = 2.0!
- Me.GroupData1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
- Me.GroupData1.ForeColor = System.Drawing.Color.White
- Me.GroupData1.Name = "GroupData1"
- Me.GroupData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
- Me.GroupData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'DetailCaption1
- '
- Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
- Me.DetailCaption1.BorderColor = System.Drawing.Color.White
- Me.DetailCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Left
- Me.DetailCaption1.BorderWidth = 2.0!
- Me.DetailCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
- Me.DetailCaption1.ForeColor = System.Drawing.Color.White
- Me.DetailCaption1.Name = "DetailCaption1"
- Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
- Me.DetailCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'DetailData1
- '
- Me.DetailData1.BorderColor = System.Drawing.Color.Transparent
- Me.DetailData1.Borders = DevExpress.XtraPrinting.BorderSide.Left
- Me.DetailData1.BorderWidth = 2.0!
- Me.DetailData1.Font = New System.Drawing.Font("Arial", 8.25!)
- Me.DetailData1.ForeColor = System.Drawing.Color.Black
- Me.DetailData1.Name = "DetailData1"
- Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
- Me.DetailData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'DetailCaption2
- '
- Me.DetailCaption2.BackColor = System.Drawing.Color.FromArgb(CType(CType(37, Byte), Integer), CType(CType(129, Byte), Integer), CType(CType(216, Byte), Integer))
- Me.DetailCaption2.BorderColor = System.Drawing.Color.White
- Me.DetailCaption2.Borders = DevExpress.XtraPrinting.BorderSide.Left
- Me.DetailCaption2.BorderWidth = 2.0!
- Me.DetailCaption2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
- Me.DetailCaption2.ForeColor = System.Drawing.Color.White
- Me.DetailCaption2.Name = "DetailCaption2"
- Me.DetailCaption2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
- Me.DetailCaption2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'DetailData2
- '
- Me.DetailData2.BorderColor = System.Drawing.Color.Transparent
- Me.DetailData2.Borders = DevExpress.XtraPrinting.BorderSide.Left
- Me.DetailData2.BorderWidth = 2.0!
- Me.DetailData2.Font = New System.Drawing.Font("Arial", 8.25!)
- Me.DetailData2.ForeColor = System.Drawing.Color.Black
- Me.DetailData2.Name = "DetailData2"
- Me.DetailData2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
- Me.DetailData2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'DetailData3_Odd
- '
- Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(248, Byte), Integer))
- Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent
- Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None
- Me.DetailData3_Odd.BorderWidth = 1.0!
- Me.DetailData3_Odd.Font = New System.Drawing.Font("Arial", 8.25!)
- Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black
- Me.DetailData3_Odd.Name = "DetailData3_Odd"
- Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
- Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
- '
- 'PageInfo
- '
- Me.PageInfo.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
- Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer))
- Me.PageInfo.Name = "PageInfo"
- Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].ReportSource)
+ Me.ObjectDataSource1.Name = "ObjectDataSource1"
'
'TopMargin
'
- Me.TopMargin.HeightF = 25.0!
Me.TopMargin.Name = "TopMargin"
'
'BottomMargin
'
- Me.BottomMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.pageInfo1, Me.pageInfo2})
- Me.BottomMargin.HeightF = 29.0!
Me.BottomMargin.Name = "BottomMargin"
'
- 'pageInfo1
- '
- Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!)
- Me.pageInfo1.Name = "pageInfo1"
- Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
- Me.pageInfo1.SizeF = New System.Drawing.SizeF(513.0!, 23.0!)
- Me.pageInfo1.StyleName = "PageInfo"
- '
- 'pageInfo2
- '
- Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(531.0!, 6.0!)
- Me.pageInfo2.Name = "pageInfo2"
- Me.pageInfo2.SizeF = New System.Drawing.SizeF(513.0!, 23.0!)
- Me.pageInfo2.StyleName = "PageInfo"
- Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
- Me.pageInfo2.TextFormatString = "Seite {0} von {1}"
- '
- 'ReportHeader
- '
- Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel12, Me.XrLabel11, Me.XrLabel9, Me.XrLabel10, Me.XrLabel8, Me.XrLabel6, Me.XrLabel7, Me.XrLabel5, Me.XrLabel4, Me.XrLabel3, Me.XrLabel2})
- Me.ReportHeader.HeightF = 234.2917!
- Me.ReportHeader.Name = "ReportHeader"
- '
'Detail
'
- Me.Detail.HeightF = 0!
- Me.Detail.KeepTogether = True
Me.Detail.Name = "Detail"
'
- 'table3
- '
- Me.table3.LocationFloat = New DevExpress.Utils.PointFloat(0.00003973643!, 0!)
- Me.table3.Name = "table3"
- Me.table3.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow4})
- Me.table3.SizeF = New System.Drawing.SizeF(1050.0!, 28.0!)
- '
- 'tableRow4
- '
- Me.tableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell44, Me.tableCell46, Me.tableCell47, Me.tableCell49, Me.tableCell50, Me.tableCell52, Me.tableCell53, Me.tableCell54})
- Me.tableRow4.Name = "tableRow4"
- Me.tableRow4.Weight = 1.0R
- '
- 'tableCell44
- '
- Me.tableCell44.Name = "tableCell44"
- Me.tableCell44.StyleName = "DetailCaption2"
- Me.tableCell44.Text = "Zeilennummer"
- Me.tableCell44.Weight = 0.04382187252952939R
- '
- 'tableCell46
- '
- Me.tableCell46.Name = "tableCell46"
- Me.tableCell46.StyleName = "DetailCaption2"
- Me.tableCell46.Text = "Artikelnummer"
- Me.tableCell46.Weight = 0.0450318363734654R
- '
- 'tableCell47
- '
- Me.tableCell47.Name = "tableCell47"
- Me.tableCell47.StyleName = "DetailCaption2"
- Me.tableCell47.Text = "Bezeichnung"
- Me.tableCell47.Weight = 0.10979868348239258R
- '
- 'tableCell49
- '
- Me.tableCell49.Name = "tableCell49"
- Me.tableCell49.StyleName = "DetailCaption2"
- Me.tableCell49.Text = "Lieferantenartikelnummer"
- Me.tableCell49.Weight = 0.044113117808847475R
- '
- 'tableCell50
- '
- Me.tableCell50.Name = "tableCell50"
- Me.tableCell50.StyleName = "DetailCaption2"
- Me.tableCell50.Text = "Bestellt"
- Me.tableCell50.Weight = 0.026839454366174756R
- '
- 'tableCell52
- '
- Me.tableCell52.Name = "tableCell52"
- Me.tableCell52.StyleName = "DetailCaption2"
- Me.tableCell52.Text = "Geliefert"
- Me.tableCell52.Weight = 0.024127269849467645R
- '
- 'tableCell53
- '
- Me.tableCell53.Name = "tableCell53"
- Me.tableCell53.StyleName = "DetailCaption2"
- Me.tableCell53.Text = "Colli"
- Me.tableCell53.Weight = 0.030175568915830075R
- '
- 'tableCell54
- '
- Me.tableCell54.Name = "tableCell54"
- Me.tableCell54.StyleName = "DetailCaption2"
- Me.tableCell54.Text = "Preis"
- Me.tableCell54.Weight = 0.023647549748139415R
- '
- 'table4
- '
- Me.table4.LocationFloat = New DevExpress.Utils.PointFloat(0!, 28.00001!)
- Me.table4.Name = "table4"
- Me.table4.OddStyleName = "DetailData3_Odd"
- Me.table4.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow5})
- Me.table4.SizeF = New System.Drawing.SizeF(1050.0!, 25.0!)
- '
- 'tableRow5
- '
- Me.tableRow5.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell65, Me.tableCell67, Me.tableCell68, Me.tableCell70, Me.tableCell71, Me.tableCell73, Me.tableCell74, Me.tableCell75})
- Me.tableRow5.Name = "tableRow5"
- Me.tableRow5.Weight = 11.5R
- '
- 'tableCell65
- '
- Me.tableCell65.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Zeilennummer]")})
- Me.tableCell65.Name = "tableCell65"
- Me.tableCell65.StyleName = "DetailData2"
- Me.tableCell65.Weight = 0.04382187252952939R
- '
- 'tableCell67
- '
- Me.tableCell67.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Artikelnummer]")})
- Me.tableCell67.Name = "tableCell67"
- Me.tableCell67.StyleName = "DetailData2"
- Me.tableCell67.Weight = 0.0450318363734654R
- '
- 'tableCell68
- '
- Me.tableCell68.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Bezeichnung]")})
- Me.tableCell68.Name = "tableCell68"
- Me.tableCell68.StyleName = "DetailData2"
- Me.tableCell68.Weight = 0.10979876020551542R
- '
- 'tableCell70
- '
- Me.tableCell70.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Lieferantenartikelnummer]")})
- Me.tableCell70.Name = "tableCell70"
- Me.tableCell70.StyleName = "DetailData2"
- Me.tableCell70.Weight = 0.044113126146570605R
- '
- 'tableCell71
- '
- Me.tableCell71.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_bestellt]")})
- Me.tableCell71.Name = "tableCell71"
- Me.tableCell71.StyleName = "DetailData2"
- Me.tableCell71.Weight = 0.026839462904304431R
- '
- 'tableCell73
- '
- Me.tableCell73.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_geliefert]")})
- Me.tableCell73.Name = "tableCell73"
- Me.tableCell73.StyleName = "DetailData2"
- Me.tableCell73.Weight = 0.024127176250492R
- '
- 'tableCell74
- '
- Me.tableCell74.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Colli]")})
- Me.tableCell74.Name = "tableCell74"
- Me.tableCell74.StyleName = "DetailData2"
- Me.tableCell74.Weight = 0.030175672656399144R
- '
- 'tableCell75
- '
- Me.tableCell75.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Einzelpreis]")})
- Me.tableCell75.Name = "tableCell75"
- Me.tableCell75.StyleName = "DetailData2"
- Me.tableCell75.Weight = 0.02364744600757035R
- '
- 'XrLabel1
- '
- Me.XrLabel1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Notizblock]")})
- Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.25!)
- Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 53.0!)
- Me.XrLabel1.Multiline = True
- Me.XrLabel1.Name = "XrLabel1"
- Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel1.SizeF = New System.Drawing.SizeF(1050.0!, 23.0!)
- Me.XrLabel1.StylePriority.UseFont = False
- Me.XrLabel1.Text = "XrLabel1"
- '
- 'Detail1
- '
- Me.Detail1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.table4, Me.table3})
- Me.Detail1.HeightF = 135.2917!
- Me.Detail1.Name = "Detail1"
- '
- 'DetailReport
- '
- Me.DetailReport.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail1})
- Me.DetailReport.DataMember = "Positions"
- Me.DetailReport.DataSource = Me.ObjectDataSource1
- Me.DetailReport.Level = 0
- Me.DetailReport.Name = "DetailReport"
- '
- 'XrLabel2
- '
- Me.XrLabel2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 10.00001!)
- Me.XrLabel2.Multiline = True
- Me.XrLabel2.Name = "XrLabel2"
- Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel2.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel2.StylePriority.UseFont = False
- Me.XrLabel2.Text = "Kunde"
- '
- 'XrLabel3
- '
- Me.XrLabel3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Fakt_Kontonummer]")})
- Me.XrLabel3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel3.LocationFloat = New DevExpress.Utils.PointFloat(118.3903!, 10.00001!)
- Me.XrLabel3.Multiline = True
- Me.XrLabel3.Name = "XrLabel3"
- Me.XrLabel3.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel3.SizeF = New System.Drawing.SizeF(265.092!, 23.0!)
- Me.XrLabel3.StylePriority.UseFont = False
- Me.XrLabel3.Text = "XrLabel2"
- '
- 'XrLabel4
- '
- Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Fakt_Name]")})
- Me.XrLabel4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(118.3904!, 33.00001!)
- Me.XrLabel4.Multiline = True
- Me.XrLabel4.Name = "XrLabel4"
- Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel4.SizeF = New System.Drawing.SizeF(265.092!, 23.0!)
- Me.XrLabel4.StylePriority.UseFont = False
- Me.XrLabel4.Text = "XrLabel2"
- '
- 'XrLabel5
- '
- Me.XrLabel5.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel5.LocationFloat = New DevExpress.Utils.PointFloat(383.4824!, 10.00001!)
- Me.XrLabel5.Multiline = True
- Me.XrLabel5.Name = "XrLabel5"
- Me.XrLabel5.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel5.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel5.StylePriority.UseFont = False
- Me.XrLabel5.Text = "Datum"
- '
- 'XrLabel6
- '
- Me.XrLabel6.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Datum_AuftragBestellung]")})
- Me.XrLabel6.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel6.LocationFloat = New DevExpress.Utils.PointFloat(491.8157!, 10.00001!)
- Me.XrLabel6.Multiline = True
- Me.XrLabel6.Name = "XrLabel6"
- Me.XrLabel6.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel6.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel6.StylePriority.UseFont = False
- Me.XrLabel6.Text = "XrLabel2"
- Me.XrLabel6.TextFormatString = "{0:dd.MM.yyyy}"
- '
- 'XrLabel7
- '
- Me.XrLabel7.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Leistungsdatum]")})
- Me.XrLabel7.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel7.LocationFloat = New DevExpress.Utils.PointFloat(491.8157!, 33.00001!)
- Me.XrLabel7.Multiline = True
- Me.XrLabel7.Name = "XrLabel7"
- Me.XrLabel7.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel7.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel7.StylePriority.UseFont = False
- Me.XrLabel7.Text = "XrLabel2"
- Me.XrLabel7.TextFormatString = "{0:dd.MM.yyyy}"
- '
- 'XrLabel8
- '
- Me.XrLabel8.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel8.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 64.16667!)
- Me.XrLabel8.Multiline = True
- Me.XrLabel8.Name = "XrLabel8"
- Me.XrLabel8.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel8.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel8.StylePriority.UseFont = False
- Me.XrLabel8.Text = "Bestellnummer"
- '
- 'XrLabel9
- '
- Me.XrLabel9.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[AuftragsBestellnummer]")})
- Me.XrLabel9.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel9.LocationFloat = New DevExpress.Utils.PointFloat(118.3333!, 64.16667!)
- Me.XrLabel9.Multiline = True
- Me.XrLabel9.Name = "XrLabel9"
- Me.XrLabel9.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel9.SizeF = New System.Drawing.SizeF(265.149!, 23.0!)
- Me.XrLabel9.StylePriority.UseFont = False
- Me.XrLabel9.Text = "XrLabel2"
- '
- 'XrLabel10
- '
- Me.XrLabel10.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Auftragsreferenz]")})
- Me.XrLabel10.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel10.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 110.1667!)
- Me.XrLabel10.Multiline = True
- Me.XrLabel10.Name = "XrLabel10"
- Me.XrLabel10.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel10.SizeF = New System.Drawing.SizeF(373.4824!, 120.9167!)
- Me.XrLabel10.StylePriority.UseFont = False
- Me.XrLabel10.Text = "XrLabel2"
- '
- 'XrLabel11
- '
- Me.XrLabel11.Font = New System.Drawing.Font("Arial", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel11.LocationFloat = New DevExpress.Utils.PointFloat(814.504!, 10.00001!)
- Me.XrLabel11.Multiline = True
- Me.XrLabel11.Name = "XrLabel11"
- Me.XrLabel11.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel11.SizeF = New System.Drawing.SizeF(225.496!, 77.16665!)
- Me.XrLabel11.StylePriority.UseFont = False
- Me.XrLabel11.StylePriority.UseTextAlignment = False
- Me.XrLabel11.Text = "ORDERS" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Offene EDI Sätze"
- Me.XrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
- '
- 'ObjectDataSource1
- '
- Me.ObjectDataSource1.DataSource = GetType(MultiTool.Shared.Schemas.Orders.ReportSource)
- Me.ObjectDataSource1.Name = "ObjectDataSource1"
- '
- 'XrLabel12
- '
- Me.XrLabel12.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.XrLabel12.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 87.16666!)
- Me.XrLabel12.Multiline = True
- Me.XrLabel12.Name = "XrLabel12"
- Me.XrLabel12.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
- Me.XrLabel12.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!)
- Me.XrLabel12.StylePriority.UseFont = False
- Me.XrLabel12.Text = "Auftragsreferenz"
- '
'OrderReport
'
- Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})
+ Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.Detail})
Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1})
Me.DataSource = Me.ObjectDataSource1
Me.Font = New System.Drawing.Font("Arial", 9.75!)
- Me.Landscape = True
- Me.Margins = New System.Drawing.Printing.Margins(25, 25, 25, 29)
- Me.PageHeight = 850
- Me.PageWidth = 1100
- Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.GroupCaption1, Me.GroupData1, Me.DetailCaption1, Me.DetailData1, Me.DetailCaption2, Me.DetailData2, Me.DetailData3_Odd, Me.PageInfo})
Me.Version = "19.2"
- CType(Me.table3, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.table4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
End Sub
Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource
- Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents GroupCaption1 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents GroupData1 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents DetailCaption1 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents DetailCaption2 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents DetailData2 As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle
- Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle
Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand
Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand
- Friend WithEvents pageInfo1 As DevExpress.XtraReports.UI.XRPageInfo
- Friend WithEvents pageInfo2 As DevExpress.XtraReports.UI.XRPageInfo
- Friend WithEvents ReportHeader As DevExpress.XtraReports.UI.ReportHeaderBand
Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand
- Friend WithEvents table3 As DevExpress.XtraReports.UI.XRTable
- Friend WithEvents tableRow4 As DevExpress.XtraReports.UI.XRTableRow
- Friend WithEvents tableCell44 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell46 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell47 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell49 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell50 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell52 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell53 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell54 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents table4 As DevExpress.XtraReports.UI.XRTable
- Friend WithEvents tableRow5 As DevExpress.XtraReports.UI.XRTableRow
- Friend WithEvents tableCell65 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell67 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell68 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell70 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell71 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell73 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell74 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents tableCell75 As DevExpress.XtraReports.UI.XRTableCell
- Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand
- Friend WithEvents DetailReport As DevExpress.XtraReports.UI.DetailReportBand
- Friend WithEvents XrLabel6 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel7 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel5 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel3 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel9 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel10 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel8 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel11 As DevExpress.XtraReports.UI.XRLabel
- Friend WithEvents XrLabel12 As DevExpress.XtraReports.UI.XRLabel
End Class
diff --git a/MultiTool.Form/Reports/OrderReport2.Designer.vb b/MultiTool.Form/Reports/OrderReport2.Designer.vb
new file mode 100644
index 0000000..01f09ee
--- /dev/null
+++ b/MultiTool.Form/Reports/OrderReport2.Designer.vb
@@ -0,0 +1,117 @@
+ _
+Partial Public Class OrderReport2
+ Inherits DevExpress.XtraReports.UI.XtraReport
+
+ 'XtraReport overrides dispose to clean up the component list.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ MyBase.Dispose(disposing)
+ End Sub
+
+ 'Required by the Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Designer
+ 'It can be modified using the Designer.
+ 'Do not modify it using the code editor.
+ _
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
+ Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
+ Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
+ Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel3 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
+ CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
+ '
+ 'TopMargin
+ '
+ Me.TopMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1})
+ Me.TopMargin.HeightF = 76.04166!
+ Me.TopMargin.Name = "TopMargin"
+ '
+ 'XrLabel1
+ '
+ Me.XrLabel1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Title]")})
+ Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(10.00001!, 10.00001!)
+ Me.XrLabel1.Multiline = True
+ Me.XrLabel1.Name = "XrLabel1"
+ Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel1.SizeF = New System.Drawing.SizeF(100.0!, 23.0!)
+ Me.XrLabel1.Text = "XrLabel1"
+ '
+ 'BottomMargin
+ '
+ Me.BottomMargin.Name = "BottomMargin"
+ '
+ 'Detail
+ '
+ Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel4, Me.XrLabel3, Me.XrLabel2})
+ Me.Detail.HeightF = 67.70834!
+ Me.Detail.Name = "Detail"
+ Me.Detail.SortFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("Positions.Id", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)})
+ '
+ 'XrLabel4
+ '
+ Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Positions].[Text2]")})
+ Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(238.5417!, 10.00001!)
+ Me.XrLabel4.Multiline = True
+ Me.XrLabel4.Name = "XrLabel4"
+ Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel4.SizeF = New System.Drawing.SizeF(100.0!, 23.0!)
+ Me.XrLabel4.Text = "XrLabel4"
+ '
+ 'XrLabel3
+ '
+ Me.XrLabel3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Positions].[Text1]")})
+ Me.XrLabel3.LocationFloat = New DevExpress.Utils.PointFloat(127.0833!, 10.00001!)
+ Me.XrLabel3.Multiline = True
+ Me.XrLabel3.Name = "XrLabel3"
+ Me.XrLabel3.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel3.SizeF = New System.Drawing.SizeF(100.0!, 23.0!)
+ Me.XrLabel3.Text = "XrLabel3"
+ '
+ 'XrLabel2
+ '
+ Me.XrLabel2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Positions].[Id]")})
+ Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(10.00001!, 10.00001!)
+ Me.XrLabel2.Multiline = True
+ Me.XrLabel2.Name = "XrLabel2"
+ Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel2.SizeF = New System.Drawing.SizeF(100.0!, 23.0!)
+ Me.XrLabel2.Text = "XrLabel2"
+ '
+ 'ObjectDataSource1
+ '
+ Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].ReportSource)
+ Me.ObjectDataSource1.Name = "ObjectDataSource1"
+ '
+ 'OrderReport2
+ '
+ Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.Detail})
+ Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1})
+ Me.DataSource = Me.ObjectDataSource1
+ Me.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.Margins = New System.Drawing.Printing.Margins(100, 100, 76, 100)
+ Me.Version = "19.2"
+ CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
+
+ End Sub
+
+ Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource
+ Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand
+ Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand
+ Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand
+ Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel3 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel
+End Class
diff --git a/MultiTool.Form/Reports/OrderReport2.resx b/MultiTool.Form/Reports/OrderReport2.resx
new file mode 100644
index 0000000..014e1c0
--- /dev/null
+++ b/MultiTool.Form/Reports/OrderReport2.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/MultiTool.Form/Reports/OrderReport2.vb b/MultiTool.Form/Reports/OrderReport2.vb
new file mode 100644
index 0000000..2bf3cd8
--- /dev/null
+++ b/MultiTool.Form/Reports/OrderReport2.vb
@@ -0,0 +1,3 @@
+Public Class OrderReport2
+
+End Class
\ No newline at end of file
diff --git a/MultiTool.Form/Reports/XtraReport3.Designer.vb b/MultiTool.Form/Reports/XtraReport3.Designer.vb
new file mode 100644
index 0000000..d094839
--- /dev/null
+++ b/MultiTool.Form/Reports/XtraReport3.Designer.vb
@@ -0,0 +1,605 @@
+ _
+Partial Public Class XtraReport3
+ Inherits DevExpress.XtraReports.UI.XtraReport
+
+ 'XtraReport overrides dispose to clean up the component list.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ MyBase.Dispose(disposing)
+ End Sub
+
+ 'Required by the Designer
+ Private components As System.ComponentModel.IContainer
+
+ 'NOTE: The following procedure is required by the Designer
+ 'It can be modified using the Designer.
+ 'Do not modify it using the code editor.
+ _
+ Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
+ Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
+ Me.Title = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.GroupCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.GroupData1 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.DetailCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.GroupCaption2 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.GroupData2 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.DetailCaption2 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.DetailData2 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.GroupFooterBackground3 = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle()
+ Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
+ Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
+ Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
+ Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
+ Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
+ Me.label1 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
+ Me.DetailReport = New DevExpress.XtraReports.UI.DetailReportBand()
+ Me.GroupHeader4 = New DevExpress.XtraReports.UI.GroupHeaderBand()
+ Me.table5 = New DevExpress.XtraReports.UI.XRTable()
+ Me.tableRow6 = New DevExpress.XtraReports.UI.XRTableRow()
+ Me.tableCell29 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell30 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell31 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell32 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell33 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell34 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell35 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell36 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell37 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell38 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand()
+ Me.table6 = New DevExpress.XtraReports.UI.XRTable()
+ Me.tableRow7 = New DevExpress.XtraReports.UI.XRTableRow()
+ Me.tableCell39 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell40 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell41 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell42 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell43 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell44 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell45 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell47 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.tableCell48 = New DevExpress.XtraReports.UI.XRTableCell()
+ Me.label2 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand()
+ Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel5 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel6 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel7 = New DevExpress.XtraReports.UI.XRLabel()
+ Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
+ CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.table5, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.table6, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
+ '
+ 'ObjectDataSource1
+ '
+ Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].ReportSource)
+ Me.ObjectDataSource1.Name = "ObjectDataSource1"
+ '
+ 'Title
+ '
+ Me.Title.BackColor = System.Drawing.Color.Transparent
+ Me.Title.BorderColor = System.Drawing.Color.Black
+ Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None
+ Me.Title.BorderWidth = 1.0!
+ Me.Title.Font = New System.Drawing.Font("Arial", 14.25!)
+ Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer))
+ Me.Title.Name = "Title"
+ '
+ 'GroupCaption1
+ '
+ Me.GroupCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
+ Me.GroupCaption1.BorderColor = System.Drawing.Color.White
+ Me.GroupCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+ Me.GroupCaption1.BorderWidth = 2.0!
+ Me.GroupCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.GroupCaption1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer))
+ Me.GroupCaption1.Name = "GroupCaption1"
+ Me.GroupCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
+ Me.GroupCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'GroupData1
+ '
+ Me.GroupData1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
+ Me.GroupData1.BorderColor = System.Drawing.Color.White
+ Me.GroupData1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+ Me.GroupData1.BorderWidth = 2.0!
+ Me.GroupData1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.GroupData1.ForeColor = System.Drawing.Color.White
+ Me.GroupData1.Name = "GroupData1"
+ Me.GroupData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
+ Me.GroupData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'DetailCaption1
+ '
+ Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer))
+ Me.DetailCaption1.BorderColor = System.Drawing.Color.White
+ Me.DetailCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Left
+ Me.DetailCaption1.BorderWidth = 2.0!
+ Me.DetailCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.DetailCaption1.ForeColor = System.Drawing.Color.White
+ Me.DetailCaption1.Name = "DetailCaption1"
+ Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
+ Me.DetailCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'DetailData1
+ '
+ Me.DetailData1.BorderColor = System.Drawing.Color.Transparent
+ Me.DetailData1.Borders = DevExpress.XtraPrinting.BorderSide.Left
+ Me.DetailData1.BorderWidth = 2.0!
+ Me.DetailData1.Font = New System.Drawing.Font("Arial", 8.25!)
+ Me.DetailData1.ForeColor = System.Drawing.Color.Black
+ Me.DetailData1.Name = "DetailData1"
+ Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
+ Me.DetailData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'GroupCaption2
+ '
+ Me.GroupCaption2.BackColor = System.Drawing.Color.FromArgb(CType(CType(37, Byte), Integer), CType(CType(129, Byte), Integer), CType(CType(216, Byte), Integer))
+ Me.GroupCaption2.BorderColor = System.Drawing.Color.White
+ Me.GroupCaption2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+ Me.GroupCaption2.BorderWidth = 2.0!
+ Me.GroupCaption2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.GroupCaption2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer))
+ Me.GroupCaption2.Name = "GroupCaption2"
+ Me.GroupCaption2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
+ Me.GroupCaption2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'GroupData2
+ '
+ Me.GroupData2.BackColor = System.Drawing.Color.FromArgb(CType(CType(37, Byte), Integer), CType(CType(129, Byte), Integer), CType(CType(216, Byte), Integer))
+ Me.GroupData2.BorderColor = System.Drawing.Color.White
+ Me.GroupData2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+ Me.GroupData2.BorderWidth = 2.0!
+ Me.GroupData2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.GroupData2.ForeColor = System.Drawing.Color.White
+ Me.GroupData2.Name = "GroupData2"
+ Me.GroupData2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
+ Me.GroupData2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'DetailCaption2
+ '
+ Me.DetailCaption2.BackColor = System.Drawing.Color.FromArgb(CType(CType(37, Byte), Integer), CType(CType(129, Byte), Integer), CType(CType(216, Byte), Integer))
+ Me.DetailCaption2.BorderColor = System.Drawing.Color.White
+ Me.DetailCaption2.Borders = DevExpress.XtraPrinting.BorderSide.Left
+ Me.DetailCaption2.BorderWidth = 2.0!
+ Me.DetailCaption2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.DetailCaption2.ForeColor = System.Drawing.Color.White
+ Me.DetailCaption2.Name = "DetailCaption2"
+ Me.DetailCaption2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
+ Me.DetailCaption2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'DetailData2
+ '
+ Me.DetailData2.BorderColor = System.Drawing.Color.Transparent
+ Me.DetailData2.Borders = DevExpress.XtraPrinting.BorderSide.Left
+ Me.DetailData2.BorderWidth = 2.0!
+ Me.DetailData2.Font = New System.Drawing.Font("Arial", 8.25!)
+ Me.DetailData2.ForeColor = System.Drawing.Color.Black
+ Me.DetailData2.Name = "DetailData2"
+ Me.DetailData2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
+ Me.DetailData2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'GroupFooterBackground3
+ '
+ Me.GroupFooterBackground3.BackColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(117, Byte), Integer), CType(CType(129, Byte), Integer))
+ Me.GroupFooterBackground3.BorderColor = System.Drawing.Color.White
+ Me.GroupFooterBackground3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
+ Me.GroupFooterBackground3.BorderWidth = 2.0!
+ Me.GroupFooterBackground3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.GroupFooterBackground3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer))
+ Me.GroupFooterBackground3.Name = "GroupFooterBackground3"
+ Me.GroupFooterBackground3.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!)
+ Me.GroupFooterBackground3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'DetailData3_Odd
+ '
+ Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(248, Byte), Integer))
+ Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent
+ Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None
+ Me.DetailData3_Odd.BorderWidth = 1.0!
+ Me.DetailData3_Odd.Font = New System.Drawing.Font("Arial", 8.25!)
+ Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black
+ Me.DetailData3_Odd.Name = "DetailData3_Odd"
+ Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!)
+ Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
+ '
+ 'PageInfo
+ '
+ Me.PageInfo.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
+ Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer))
+ Me.PageInfo.Name = "PageInfo"
+ Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ '
+ 'TopMargin
+ '
+ Me.TopMargin.Name = "TopMargin"
+ '
+ 'BottomMargin
+ '
+ Me.BottomMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.pageInfo1, Me.pageInfo2})
+ Me.BottomMargin.Name = "BottomMargin"
+ '
+ 'pageInfo1
+ '
+ Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!)
+ Me.pageInfo1.Name = "pageInfo1"
+ Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
+ Me.pageInfo1.SizeF = New System.Drawing.SizeF(313.0!, 23.0!)
+ Me.pageInfo1.StyleName = "PageInfo"
+ '
+ 'pageInfo2
+ '
+ Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(331.0!, 6.0!)
+ Me.pageInfo2.Name = "pageInfo2"
+ Me.pageInfo2.SizeF = New System.Drawing.SizeF(313.0!, 23.0!)
+ Me.pageInfo2.StyleName = "PageInfo"
+ Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
+ Me.pageInfo2.TextFormatString = "Seite {0} von {1}"
+ '
+ 'ReportHeader
+ '
+ Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label1})
+ Me.ReportHeader.HeightF = 32.91667!
+ Me.ReportHeader.Name = "ReportHeader"
+ '
+ 'label1
+ '
+ Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!)
+ Me.label1.Name = "label1"
+ Me.label1.SizeF = New System.Drawing.SizeF(638.0!, 24.19433!)
+ Me.label1.StyleName = "Title"
+ Me.label1.Text = "OrderReport"
+ '
+ 'Detail
+ '
+ Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel2, Me.XrLabel7, Me.XrLabel6, Me.XrLabel5, Me.XrLabel4, Me.XrLabel1})
+ Me.Detail.HeightF = 221.0!
+ Me.Detail.KeepTogether = True
+ Me.Detail.Name = "Detail"
+ '
+ 'DetailReport
+ '
+ Me.DetailReport.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.GroupHeader4, Me.Detail1, Me.GroupFooter1})
+ Me.DetailReport.DataMember = "Positions"
+ Me.DetailReport.DataSource = Me.ObjectDataSource1
+ Me.DetailReport.Level = 0
+ Me.DetailReport.Name = "DetailReport"
+ '
+ 'GroupHeader4
+ '
+ Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table5})
+ Me.GroupHeader4.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WithFirstDetail
+ Me.GroupHeader4.HeightF = 58.83334!
+ Me.GroupHeader4.Name = "GroupHeader4"
+ '
+ 'table5
+ '
+ Me.table5.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+ Me.table5.Name = "table5"
+ Me.table5.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow6})
+ Me.table5.SizeF = New System.Drawing.SizeF(650.0!, 28.0!)
+ '
+ 'tableRow6
+ '
+ Me.tableRow6.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell29, Me.tableCell30, Me.tableCell31, Me.tableCell32, Me.tableCell33, Me.tableCell34, Me.tableCell35, Me.tableCell36, Me.tableCell37, Me.tableCell38})
+ Me.tableRow6.Name = "tableRow6"
+ Me.tableRow6.Weight = 1.0R
+ '
+ 'tableCell29
+ '
+ Me.tableCell29.Borders = DevExpress.XtraPrinting.BorderSide.None
+ Me.tableCell29.Name = "tableCell29"
+ Me.tableCell29.StyleName = "DetailCaption2"
+ Me.tableCell29.StylePriority.UseBorders = False
+ Me.tableCell29.Text = "Text1"
+ Me.tableCell29.Weight = 0.09857285719651443R
+ '
+ 'tableCell30
+ '
+ Me.tableCell30.Name = "tableCell30"
+ Me.tableCell30.StyleName = "DetailCaption2"
+ Me.tableCell30.Text = "Text2"
+ Me.tableCell30.Weight = 0.09857285719651443R
+ '
+ 'tableCell31
+ '
+ Me.tableCell31.Name = "tableCell31"
+ Me.tableCell31.StyleName = "DetailCaption2"
+ Me.tableCell31.Text = "Text3"
+ Me.tableCell31.Weight = 0.09857285719651443R
+ '
+ 'tableCell32
+ '
+ Me.tableCell32.Name = "tableCell32"
+ Me.tableCell32.StyleName = "DetailCaption2"
+ Me.tableCell32.Text = "Text4"
+ Me.tableCell32.Weight = 0.09857285719651443R
+ '
+ 'tableCell33
+ '
+ Me.tableCell33.Name = "tableCell33"
+ Me.tableCell33.StyleName = "DetailCaption2"
+ Me.tableCell33.Text = "Text5"
+ Me.tableCell33.Weight = 0.09857285719651443R
+ '
+ 'tableCell34
+ '
+ Me.tableCell34.Name = "tableCell34"
+ Me.tableCell34.StyleName = "DetailCaption2"
+ Me.tableCell34.Text = "Text6"
+ Me.tableCell34.Weight = 0.09857285719651443R
+ '
+ 'tableCell35
+ '
+ Me.tableCell35.Name = "tableCell35"
+ Me.tableCell35.StyleName = "DetailCaption2"
+ Me.tableCell35.Text = "Text7"
+ Me.tableCell35.Weight = 0.09857285719651443R
+ '
+ 'tableCell36
+ '
+ Me.tableCell36.Name = "tableCell36"
+ Me.tableCell36.StyleName = "DetailCaption2"
+ Me.tableCell36.Text = "Text8"
+ Me.tableCell36.Weight = 0.09857285719651443R
+ '
+ 'tableCell37
+ '
+ Me.tableCell37.Name = "tableCell37"
+ Me.tableCell37.StyleName = "DetailCaption2"
+ Me.tableCell37.Text = "Text9"
+ Me.tableCell37.Weight = 0.09857285719651443R
+ '
+ 'tableCell38
+ '
+ Me.tableCell38.Name = "tableCell38"
+ Me.tableCell38.StyleName = "DetailCaption2"
+ Me.tableCell38.Text = "Text10"
+ Me.tableCell38.Weight = 0.11284421480618991R
+ '
+ 'Detail1
+ '
+ Me.Detail1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table6})
+ Me.Detail1.HeightF = 189.3333!
+ Me.Detail1.Name = "Detail1"
+ '
+ 'table6
+ '
+ Me.table6.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+ Me.table6.Name = "table6"
+ Me.table6.OddStyleName = "DetailData3_Odd"
+ Me.table6.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow7})
+ Me.table6.SizeF = New System.Drawing.SizeF(650.0!, 25.0!)
+ '
+ 'tableRow7
+ '
+ Me.tableRow7.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell39, Me.tableCell40, Me.tableCell41, Me.tableCell42, Me.tableCell43, Me.tableCell44, Me.tableCell45, Me.tableCell46, Me.tableCell47, Me.tableCell48})
+ Me.tableRow7.Name = "tableRow7"
+ Me.tableRow7.Weight = 11.5R
+ '
+ 'tableCell39
+ '
+ Me.tableCell39.Borders = DevExpress.XtraPrinting.BorderSide.None
+ Me.tableCell39.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text1]")})
+ Me.tableCell39.Name = "tableCell39"
+ Me.tableCell39.StyleName = "DetailData2"
+ Me.tableCell39.StylePriority.UseBorders = False
+ Me.tableCell39.Weight = 0.098572868934044475R
+ '
+ 'tableCell40
+ '
+ Me.tableCell40.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text2]")})
+ Me.tableCell40.Name = "tableCell40"
+ Me.tableCell40.StyleName = "DetailData2"
+ Me.tableCell40.Weight = 0.098572868934044475R
+ '
+ 'tableCell41
+ '
+ Me.tableCell41.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text3]")})
+ Me.tableCell41.Name = "tableCell41"
+ Me.tableCell41.StyleName = "DetailData2"
+ Me.tableCell41.Weight = 0.098572868934044475R
+ '
+ 'tableCell42
+ '
+ Me.tableCell42.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text4]")})
+ Me.tableCell42.Name = "tableCell42"
+ Me.tableCell42.StyleName = "DetailData2"
+ Me.tableCell42.Weight = 0.098572868934044475R
+ '
+ 'tableCell43
+ '
+ Me.tableCell43.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text5]")})
+ Me.tableCell43.Name = "tableCell43"
+ Me.tableCell43.StyleName = "DetailData2"
+ Me.tableCell43.Weight = 0.098572868934044475R
+ '
+ 'tableCell44
+ '
+ Me.tableCell44.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text6]")})
+ Me.tableCell44.Name = "tableCell44"
+ Me.tableCell44.StyleName = "DetailData2"
+ Me.tableCell44.Weight = 0.098572868934044475R
+ '
+ 'tableCell45
+ '
+ Me.tableCell45.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text7]")})
+ Me.tableCell45.Name = "tableCell45"
+ Me.tableCell45.StyleName = "DetailData2"
+ Me.tableCell45.Weight = 0.098572868934044475R
+ '
+ 'tableCell46
+ '
+ Me.tableCell46.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text8]")})
+ Me.tableCell46.Name = "tableCell46"
+ Me.tableCell46.StyleName = "DetailData2"
+ Me.tableCell46.Weight = 0.098572868934044475R
+ '
+ '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.Weight = 0.098572868934044475R
+ '
+ 'tableCell48
+ '
+ Me.tableCell48.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Text10]")})
+ Me.tableCell48.Name = "tableCell48"
+ Me.tableCell48.StyleName = "DetailData2"
+ Me.tableCell48.Weight = 0.11284414438100962R
+ '
+ 'label2
+ '
+ Me.label2.Borders = DevExpress.XtraPrinting.BorderSide.None
+ Me.label2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+ Me.label2.Name = "label2"
+ Me.label2.SizeF = New System.Drawing.SizeF(650.0!, 2.08!)
+ Me.label2.StyleName = "GroupFooterBackground3"
+ Me.label2.StylePriority.UseBorders = False
+ '
+ 'GroupFooter1
+ '
+ Me.GroupFooter1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label2})
+ Me.GroupFooter1.GroupUnion = DevExpress.XtraReports.UI.GroupFooterUnion.WithLastDetail
+ Me.GroupFooter1.HeightF = 313.0417!
+ Me.GroupFooter1.Name = "GroupFooter1"
+ '
+ 'XrLabel1
+ '
+ Me.XrLabel1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Text1]")})
+ Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(144.8311!, 10.00001!)
+ Me.XrLabel1.Multiline = True
+ Me.XrLabel1.Name = "XrLabel1"
+ Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
+ Me.XrLabel1.SizeF = New System.Drawing.SizeF(126.7829!, 23.0!)
+ Me.XrLabel1.Text = "XrLabel1"
+ '
+ 'XrLabel4
+ '
+ Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Text4]")})
+ Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(144.8311!, 89.95828!)
+ Me.XrLabel4.Multiline = True
+ Me.XrLabel4.Name = "XrLabel4"
+ Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
+ Me.XrLabel4.SizeF = New System.Drawing.SizeF(126.7829!, 23.0!)
+ Me.XrLabel4.Text = "XrLabel4"
+ '
+ 'XrLabel5
+ '
+ Me.XrLabel5.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Text5]")})
+ Me.XrLabel5.LocationFloat = New DevExpress.Utils.PointFloat(144.8311!, 112.9583!)
+ Me.XrLabel5.Multiline = True
+ Me.XrLabel5.Name = "XrLabel5"
+ Me.XrLabel5.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
+ Me.XrLabel5.SizeF = New System.Drawing.SizeF(126.7829!, 23.00001!)
+ Me.XrLabel5.Text = "XrLabel5"
+ '
+ 'XrLabel6
+ '
+ Me.XrLabel6.LocationFloat = New DevExpress.Utils.PointFloat(28.14473!, 112.9583!)
+ Me.XrLabel6.Multiline = True
+ Me.XrLabel6.Name = "XrLabel6"
+ Me.XrLabel6.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
+ Me.XrLabel6.SizeF = New System.Drawing.SizeF(116.6864!, 23.00001!)
+ Me.XrLabel6.Text = "Bestelldatum"
+ '
+ 'XrLabel7
+ '
+ Me.XrLabel7.LocationFloat = New DevExpress.Utils.PointFloat(28.14473!, 89.95828!)
+ Me.XrLabel7.Multiline = True
+ Me.XrLabel7.Name = "XrLabel7"
+ Me.XrLabel7.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel7.SizeF = New System.Drawing.SizeF(116.6864!, 23.0!)
+ Me.XrLabel7.Text = "Bestellnummer"
+ '
+ 'XrLabel2
+ '
+ Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(28.14473!, 10.00001!)
+ Me.XrLabel2.Multiline = True
+ Me.XrLabel2.Name = "XrLabel2"
+ Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+ Me.XrLabel2.SizeF = New System.Drawing.SizeF(116.6864!, 23.0!)
+ Me.XrLabel2.Text = "Kundennummer"
+ '
+ 'XtraReport3
+ '
+ Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})
+ Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1})
+ Me.DataSource = Me.ObjectDataSource1
+ Me.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.GroupCaption1, Me.GroupData1, Me.DetailCaption1, Me.DetailData1, Me.GroupCaption2, Me.GroupData2, Me.DetailCaption2, Me.DetailData2, Me.GroupFooterBackground3, Me.DetailData3_Odd, Me.PageInfo})
+ Me.Version = "19.2"
+ CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.table5, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.table6, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
+
+ End Sub
+
+ Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource
+ Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents GroupCaption1 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents GroupData1 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents DetailCaption1 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents GroupCaption2 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents GroupData2 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents DetailCaption2 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents DetailData2 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents GroupFooterBackground3 As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle
+ Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand
+ Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand
+ Friend WithEvents pageInfo1 As DevExpress.XtraReports.UI.XRPageInfo
+ Friend WithEvents pageInfo2 As DevExpress.XtraReports.UI.XRPageInfo
+ Friend WithEvents ReportHeader As DevExpress.XtraReports.UI.ReportHeaderBand
+ Friend WithEvents label1 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand
+ Friend WithEvents DetailReport As DevExpress.XtraReports.UI.DetailReportBand
+ Friend WithEvents GroupHeader4 As DevExpress.XtraReports.UI.GroupHeaderBand
+ Friend WithEvents table5 As DevExpress.XtraReports.UI.XRTable
+ Friend WithEvents tableRow6 As DevExpress.XtraReports.UI.XRTableRow
+ Friend WithEvents tableCell29 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell30 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell31 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell32 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell33 As DevExpress.XtraReports.UI.XRTableCell
+ 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 tableCell38 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand
+ Friend WithEvents table6 As DevExpress.XtraReports.UI.XRTable
+ Friend WithEvents tableRow7 As DevExpress.XtraReports.UI.XRTableRow
+ Friend WithEvents tableCell39 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell40 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell41 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell42 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents tableCell43 As DevExpress.XtraReports.UI.XRTableCell
+ 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 tableCell48 As DevExpress.XtraReports.UI.XRTableCell
+ Friend WithEvents GroupFooter1 As DevExpress.XtraReports.UI.GroupFooterBand
+ Friend WithEvents label2 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel7 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel6 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel5 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
+ Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel
+End Class
diff --git a/MultiTool.Form/Reports/XtraReport3.resx b/MultiTool.Form/Reports/XtraReport3.resx
new file mode 100644
index 0000000..014e1c0
--- /dev/null
+++ b/MultiTool.Form/Reports/XtraReport3.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/MultiTool.Form/Reports/XtraReport3.vb b/MultiTool.Form/Reports/XtraReport3.vb
new file mode 100644
index 0000000..b0a2f95
--- /dev/null
+++ b/MultiTool.Form/Reports/XtraReport3.vb
@@ -0,0 +1,3 @@
+Public Class XtraReport3
+
+End Class
\ No newline at end of file
diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb
index a9a7077..0712853 100644
--- a/MultiTool.Form/frmImportMain.Designer.vb
+++ b/MultiTool.Form/frmImportMain.Designer.vb
@@ -44,7 +44,7 @@ Partial Class frmImportMain
Me.btnOpenSchemaDirectory = New DevExpress.XtraBars.BarButtonItem()
Me.btnReloadFile = New DevExpress.XtraBars.BarButtonItem()
Me.btnTransferAllFiles = New DevExpress.XtraBars.BarButtonItem()
- Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+ Me.btnOpenReport = New DevExpress.XtraBars.BarButtonItem()
Me.btnShowXml = New DevExpress.XtraBars.BarButtonItem()
Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem()
Me.btnOpenConfigDirectory = New DevExpress.XtraBars.BarButtonItem()
@@ -72,17 +72,17 @@ Partial Class frmImportMain
Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
Me.SplitContainerGrids = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerGrids1 = New DevExpress.XtraEditors.SplitContainerControl()
- Me.SplitContainerGrids2 = New DevExpress.XtraEditors.SplitContainerControl()
- Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
- Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
+ Me.SplitContainerGrids2 = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControl3 = New DevExpress.XtraGrid.GridControl()
Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.GridControl4 = New DevExpress.XtraGrid.GridControl()
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)
CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerMain.SuspendLayout()
CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -99,17 +99,17 @@ Partial Class frmImportMain
Me.SplitContainerGrids.SuspendLayout()
CType(Me.SplitContainerGrids1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerGrids1.SuspendLayout()
- CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.SplitContainerGrids2.SuspendLayout()
- CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.SplitContainerGrids2.SuspendLayout()
CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'SplitContainerMain
@@ -198,7 +198,7 @@ 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.BarButtonItem1, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.txtCulture, Me.btnRemoveRow})
+ 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})
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.MaxItemId = 28
Me.RibbonControl.Name = "RibbonControl"
@@ -275,13 +275,12 @@ Partial Class frmImportMain
Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send
Me.btnTransferAllFiles.Name = "btnTransferAllFiles"
'
- 'BarButtonItem1
+ 'btnOpenReport
'
- resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
- Me.BarButtonItem1.Enabled = False
- Me.BarButtonItem1.Id = 14
- Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview
- Me.BarButtonItem1.Name = "BarButtonItem1"
+ resources.ApplyResources(Me.btnOpenReport, "btnOpenReport")
+ Me.btnOpenReport.Id = 14
+ Me.btnOpenReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.mailmergepreview
+ Me.btnOpenReport.Name = "btnOpenReport"
'
'btnShowXml
'
@@ -349,7 +348,7 @@ Partial Class frmImportMain
'
'RibbonPageGroup4
'
- Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem1)
+ Me.RibbonPageGroup4.ItemLinks.Add(Me.btnOpenReport)
Me.RibbonPageGroup4.ItemLinks.Add(Me.btnShowXml)
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
@@ -481,21 +480,6 @@ Partial Class frmImportMain
resources.ApplyResources(Me.SplitContainerGrids1.Panel2, "SplitContainerGrids1.Panel2")
Me.SplitContainerGrids1.SplitterPosition = 129
'
- 'SplitContainerGrids2
- '
- resources.ApplyResources(Me.SplitContainerGrids2, "SplitContainerGrids2")
- Me.SplitContainerGrids2.Horizontal = False
- Me.SplitContainerGrids2.Name = "SplitContainerGrids2"
- Me.SplitContainerGrids2.Panel1.Controls.Add(Me.GridControl3)
- resources.ApplyResources(Me.SplitContainerGrids2.Panel1, "SplitContainerGrids2.Panel1")
- Me.SplitContainerGrids2.Panel2.Controls.Add(Me.GridControl4)
- resources.ApplyResources(Me.SplitContainerGrids2.Panel2, "SplitContainerGrids2.Panel2")
- Me.SplitContainerGrids2.SplitterPosition = 126
- '
- 'SplashScreenManager
- '
- Me.SplashScreenManager.ClosingDelay = 500
- '
'GridControl1
'
resources.ApplyResources(Me.GridControl1, "GridControl1")
@@ -521,6 +505,17 @@ Partial Class frmImportMain
Me.GridView2.GridControl = Me.GridControl2
Me.GridView2.Name = "GridView2"
'
+ 'SplitContainerGrids2
+ '
+ resources.ApplyResources(Me.SplitContainerGrids2, "SplitContainerGrids2")
+ Me.SplitContainerGrids2.Horizontal = False
+ Me.SplitContainerGrids2.Name = "SplitContainerGrids2"
+ Me.SplitContainerGrids2.Panel1.Controls.Add(Me.GridControl3)
+ resources.ApplyResources(Me.SplitContainerGrids2.Panel1, "SplitContainerGrids2.Panel1")
+ Me.SplitContainerGrids2.Panel2.Controls.Add(Me.GridControl4)
+ resources.ApplyResources(Me.SplitContainerGrids2.Panel2, "SplitContainerGrids2.Panel2")
+ Me.SplitContainerGrids2.SplitterPosition = 126
+ '
'GridControl3
'
resources.ApplyResources(Me.GridControl3, "GridControl3")
@@ -545,6 +540,10 @@ Partial Class frmImportMain
Me.GridView4.GridControl = Me.GridControl4
Me.GridView4.Name = "GridView4"
'
+ 'SplashScreenManager
+ '
+ Me.SplashScreenManager.ClosingDelay = 500
+ '
'frmImportMain
'
resources.ApplyResources(Me, "$this")
@@ -574,17 +573,17 @@ Partial Class frmImportMain
Me.SplitContainerGrids.ResumeLayout(False)
CType(Me.SplitContainerGrids1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerGrids1.ResumeLayout(False)
- CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).EndInit()
- Me.SplitContainerGrids2.ResumeLayout(False)
- CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.SplitContainerGrids2, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.SplitContainerGrids2.ResumeLayout(False)
CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.BehaviorManager, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -610,7 +609,7 @@ Partial Class frmImportMain
Friend WithEvents btnReloadFile As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnTransferAllFiles As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
- Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents btnOpenReport As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents btnShowXml As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnOpenLogDirectory As DevExpress.XtraBars.BarButtonItem
diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx
index 951018e..0c78b94 100644
--- a/MultiTool.Form/frmImportMain.resx
+++ b/MultiTool.Form/frmImportMain.resx
@@ -234,7 +234,7 @@
Ausgewählte Dateien übermitteln
-
+
Belegvorschau für aktuelle Datei anzeigen
@@ -783,10 +783,10 @@
DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- BarButtonItem1
+
+ btnOpenReport
-
+
DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -915,18 +915,6 @@
DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- BehaviorManager
-
-
- DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
-
- SplashScreenManager
-
-
- DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
GridView1
@@ -951,6 +939,18 @@
DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ BehaviorManager
+
+
+ DevExpress.Utils.Behaviors.BehaviorManager, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ SplashScreenManager
+
+
+ DevExpress.XtraSplashScreen.SplashScreenManager, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
frmImportMain
diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb
index c5c7400..22d2f6c 100644
--- a/MultiTool.Form/frmImportMain.vb
+++ b/MultiTool.Form/frmImportMain.vb
@@ -15,6 +15,8 @@ Imports MultiTool.Shared.Documents
Imports MultiTool.Shared.Schemas
Imports MultiTool.Shared.Winline
Imports MultiTool.Shared.Constants
+Imports DevExpress.XtraReports.UI
+Imports MultiTool.Shared.DocumentRow
Public Class frmImportMain
Private LogConfig As LogConfig
@@ -476,4 +478,56 @@ Public Class frmImportMain
LoadDocument(oDocument)
End If
End Sub
+
+ Private Sub btnOpenReport_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenReport.ItemClick
+ Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
+ Dim oMapperConfig As New Mapper(LogConfig)
+ Dim oHeadMapper = oMapperConfig.GetMapper(Of ReportHead)(New Dictionary(Of String, String) From {
+ {"Fakt_Kontonummer[Original]", "Text1"},
+ {"Auftrags-Bestellnummer", "Text2"},
+ {"Datum_Auftrag-Bestellung", "Text5"}
+ })
+
+ Dim oPositionMapper = oMapperConfig.GetMapper(Of ReportPosition)(New Dictionary(Of String, String) From {
+ {"BELEGKEY", "Text1"},
+ {"Artikelnummer", "Text2"}
+ })
+
+ Dim oHeadRow = oDocument.Rows.
+ Where(Function(r) r.Name.EndsWith("T025")).
+ Select(Function(r) r.Fields).
+ FirstOrDefault()
+ Dim oPositionRows = oDocument.Rows.
+ Where(Function(r) r.Name.EndsWith("T026")).
+ ToList()
+
+ Dim oReportHead = oHeadMapper.Map(Of Dictionary(Of String, FieldValue), ReportHead)(oHeadRow)
+ Dim oReportPositions As New List(Of ReportPosition)
+
+ Dim oCounter = 0
+
+ For Each oRow As DocumentRow In oPositionRows
+ Dim oReportPosition As ReportPosition = oPositionMapper.Map(Of Dictionary(Of String, FieldValue), ReportPosition)(oRow.Fields)
+ oReportPosition.Id = oCounter
+ oReportPositions.Add(oReportPosition)
+
+ oCounter += 1
+ Next
+
+ Dim oReportSource As New ReportSource With {
+ .Head = oReportHead,
+ .Positions = oReportPositions
+ }
+
+ Dim oReport As New XtraReport3
+ Dim oDataSource = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource With {
+ .DataSource = oReportSource
+ }
+ oDataSource.Fill()
+ oReport.DataSource = oDataSource
+
+ Dim printTool As New ReportPrintTool(oReport)
+ printTool.Report.CreateDocument(False)
+ printTool.ShowPreviewDialog()
+ End Sub
End Class
\ No newline at end of file
diff --git a/MultiTool.Form/frmMapper.Designer.vb b/MultiTool.Form/frmMapper.Designer.vb
new file mode 100644
index 0000000..c4e37be
--- /dev/null
+++ b/MultiTool.Form/frmMapper.Designer.vb
@@ -0,0 +1,50 @@
+ _
+Partial Class frmMapper
+ Inherits System.Windows.Forms.Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As System.ComponentModel.IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+ _
+ Private Sub InitializeComponent()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.SuspendLayout()
+ '
+ 'Button1
+ '
+ Me.Button1.Location = New System.Drawing.Point(422, 242)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(75, 23)
+ Me.Button1.TabIndex = 0
+ Me.Button1.Text = "Button1"
+ Me.Button1.UseVisualStyleBackColor = True
+ '
+ 'frmMapper
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(800, 450)
+ Me.Controls.Add(Me.Button1)
+ Me.Name = "frmMapper"
+ Me.Text = "frmMapper"
+ Me.ResumeLayout(False)
+
+ End Sub
+
+ Friend WithEvents Button1 As Button
+End Class
diff --git a/MultiTool.Form/frmMapper.resx b/MultiTool.Form/frmMapper.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/MultiTool.Form/frmMapper.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/MultiTool.Form/frmMapper.vb b/MultiTool.Form/frmMapper.vb
new file mode 100644
index 0000000..ad7ebbe
--- /dev/null
+++ b/MultiTool.Form/frmMapper.vb
@@ -0,0 +1,36 @@
+Imports AutoMapper
+Imports MultiTool.Shared
+
+Public Class frmMapper
+ Public ExampleDict As New Dictionary(Of String, Object) From {
+ {"Laufnummer", "1"},
+ {"Rechnungsnummer", "4711"}
+ }
+
+ Public ExampleMapping As New Dictionary(Of String, String) From {
+ {"Laufnummer", "Text1"},
+ {"Rechnungsnummer", "Text2"}
+ }
+
+ Public Class ExampleObj
+ Public Property Text1 As String
+ Public Property Text2 As String
+ End Class
+
+ Private Sub frmMapper_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ 'Dim oConfig As New MapperConfiguration(AddressOf GetConfig)
+ 'Dim oMapper = oConfig.CreateMapper()
+
+ 'Dim oObj = oMapper.Map(Of ExampleObj)(ExampleDict)
+
+ End Sub
+
+ 'Private Sub GetConfig(c As IMapperConfigurationExpression)
+ ' c.CreateMap(Of Dictionary(Of String, Object), ExampleObj)()
+ ' c.AddProfile(New BlaProfile(ExampleMapping))
+ 'End Sub
+
+
+
+
+End Class
\ No newline at end of file
diff --git a/MultiTool.Form/packages.config b/MultiTool.Form/packages.config
index 63f3075..30c87d1 100644
--- a/MultiTool.Form/packages.config
+++ b/MultiTool.Form/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/MultiTool.Shared/Documents/Document.vb b/MultiTool.Shared/Documents/Document.vb
index bcaa49f..aa84f0b 100644
--- a/MultiTool.Shared/Documents/Document.vb
+++ b/MultiTool.Shared/Documents/Document.vb
@@ -5,7 +5,7 @@ Imports MultiTool.Shared.Winline
Namespace Documents
Public Class Document
Public File As FileInfo
- Public Type As DocumentType
+ Public Property Type As DocumentType
Public Schema As Schema
Public Mandator As Mandator
@@ -48,29 +48,6 @@ Namespace Documents
Public Overrides Function Equals(obj As Object) As Boolean
Return FullName = DirectCast(obj, Document).FullName
End Function
-
- ' Public Type As DocumentType
- ' Public Data As Object
- ' Public DataOriginal As Object
- ' Public DataOutput As Object
- ' Public DataString As String
-
- ' Public Selected As Boolean = False
-
-
- ' Public Shared Function GetDocumentTypeFromTemplateName(pTemplateName As String) As DocumentType
- ' Return DocumentMatch.TypeMatchingTable.
- ' Where(Function(kv) pTemplateName.Contains(kv.Key)).
- ' Select(Function(kv) kv.Value).
- ' FirstOrDefault()
- ' End Function
-
- ' Public Shared Function GetDocumentSchemaFromDocumentType(pDocumentType As DocumentType) As Type
- ' Return DocumentMatch.SchemaMatchingTable.
- ' Where(Function(kv) pDocumentType = kv.Key).
- ' Select(Function(kv) kv.Value).
- ' FirstOrDefault()
- ' End Function
End Class
End Namespace
\ No newline at end of file
diff --git a/MultiTool.Shared/Mapper.vb b/MultiTool.Shared/Mapper.vb
new file mode 100644
index 0000000..e2e7ff6
--- /dev/null
+++ b/MultiTool.Shared/Mapper.vb
@@ -0,0 +1,129 @@
+Imports System.Globalization
+Imports System.Text.RegularExpressions
+Imports AutoMapper
+Imports AutoMapper.Configuration
+Imports DigitalData.Modules.Logging
+Imports MultiTool.Shared.DocumentRow
+
+Public Class Mapper
+ Private MapperConfig As MapperConfiguration
+ Private LogConfig As LogConfig
+ Private Logger As Logger
+
+ Public Sub New(pLogConfig As LogConfig)
+ LogConfig = pLogConfig
+ Logger = pLogConfig.GetLogger
+ End Sub
+
+ Public Function GetMapper(Of T)(pPropertyMap As Dictionary(Of String, String)) As IMapper
+ MapperConfig = New MapperConfiguration(CreateMapperConfig(Of T)(pPropertyMap))
+ MapperConfig.AssertConfigurationIsValid()
+ Return MapperConfig.CreateMapper()
+ End Function
+
+ Private Function CreateMapperConfig(Of T)(pPropertyMap As Dictionary(Of String, String)) As MapperConfigurationExpression
+ Logger.Info("Creating mapper config for type [{0}]", GetType(T).Name)
+ Dim oConfig As New MapperConfigurationExpression()
+ oConfig.AddProfile(New MappingProfile(Of T)(LogConfig, pPropertyMap))
+ Return oConfig
+ End Function
+
+ Public Class MappingProfile(Of T)
+ Inherits Profile
+
+ Private LogConfig As LogConfig
+
+ Public Overrides ReadOnly Property ProfileName As String
+ Get
+ Return "MappingProfile"
+ End Get
+ End Property
+
+ Public Sub New(pLogConfig As LogConfig, pPropertyMap As Dictionary(Of String, String))
+ LogConfig = pLogConfig
+ CreateMap(Of Dictionary(Of String, FieldValue), T).ConvertUsing(New ReportTypeConverter(Of T)(LogConfig, pPropertyMap))
+ End Sub
+ End Class
+
+ Private Class ReportTypeConverter(Of TDestination)
+ Implements ITypeConverter(Of Dictionary(Of String, FieldValue), TDestination)
+
+ Private PropertyMap As Dictionary(Of String, String)
+ Private KeyWithSubkey As New Regex("(?[\w\s-]+)(?:\[(?[\w]+)\])?")
+
+ Private LogConfig As LogConfig
+ Private Logger As Logger
+
+ Public Sub New(pLogConfig As LogConfig, pPropertyMap As Dictionary(Of String, String))
+ MyBase.New()
+ LogConfig = pLogConfig
+ Logger = pLogConfig.GetLogger()
+ PropertyMap = pPropertyMap
+ End Sub
+
+ Public Function Convert(source As Dictionary(Of String, FieldValue), destination As TDestination, context As ResolutionContext) As TDestination Implements ITypeConverter(Of Dictionary(Of String, FieldValue), TDestination).Convert
+ If source Is Nothing Then
+ Return Nothing
+ End If
+
+ Dim oResult = Activator.CreateInstance(Of TDestination)
+
+ Logger.Info("Mapping object of Type [{0}]", GetType(TDestination).Name)
+
+ For Each oMapItem As KeyValuePair(Of String, String) In PropertyMap
+ Try
+ ' SourceKey will be something like 'Fakt_Kontonummer[Final]'
+ ' DestinationKey will be something like 'Text1'
+ Dim oSourceKeyCombined As String = oMapItem.Key
+ Dim oDestinationKey As String = oMapItem.Value
+
+ ' Resolve SourceKey into Key and Subkey
+ Dim oMatch As Match = KeyWithSubkey.Match(oSourceKeyCombined)
+ Dim oSourceKey As String = oMatch.Groups("Key")?.Value
+ Dim oSourceSubkey As String = oMatch.Groups("Subkey")?.Value
+
+ ' Set property value if property exists in source
+ If source.ContainsKey(oSourceKey) Then
+ ' Try to get the value from 'source'
+ Dim oFieldValue As FieldValue = source.Item(oSourceKey)
+
+ ' Get the destination property by DestinationKey
+ Dim oProperty = GetType(TDestination).
+ GetProperties().
+ SingleOrDefault(Function(p) p.Name = oDestinationKey)
+
+ ' Set the property if it exists
+ If oProperty IsNot Nothing Then
+ Dim oValue = GetFieldValue(oFieldValue, oSourceKey, oSourceSubkey)
+ Logger.Info("Transferring value [{0}] from [{1}] -> [{2}]", oValue, oSourceKeyCombined, oDestinationKey)
+ oProperty.SetValue(oResult, oValue)
+
+ Else
+ Logger.Warn("Property [{0}] does not exist in destination object. Possible error in configuration.", oDestinationKey)
+
+ End If
+
+ End If
+ Catch ex As Exception
+ Logger.Warn("Could not transfer key [{0}] to destination object", oMapItem.Key)
+ Logger.Error(ex)
+ End Try
+ Next
+
+ Return oResult
+ End Function
+
+ Private Function GetFieldValue(pValue As FieldValue, pKey As String, pSubKey As String) As String
+ If pSubKey = "Original" Then
+ Return pValue.Original
+
+ ElseIf pSubKey = "External" Then
+ Return pValue.External
+
+ Else
+ Return pValue.Final
+
+ End If
+ End Function
+ End Class
+End Class
diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj b/MultiTool.Shared/MultiTool.Shared.vbproj
index 8f0eda7..aa76c04 100644
--- a/MultiTool.Shared/MultiTool.Shared.vbproj
+++ b/MultiTool.Shared/MultiTool.Shared.vbproj
@@ -44,6 +44,9 @@
On
+
+ ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll
+
..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll
@@ -103,6 +106,7 @@
+
True
@@ -123,7 +127,9 @@
-
+
+
+
diff --git a/MultiTool.Shared/Schemas/Orders/ReportSource.vb b/MultiTool.Shared/Schemas/Orders/ReportSource.vb
deleted file mode 100644
index 328cc07..0000000
--- a/MultiTool.Shared/Schemas/Orders/ReportSource.vb
+++ /dev/null
@@ -1,21 +0,0 @@
-Imports DevExpress.DataAccess.ObjectBinding
-Imports System.Collections.Generic
-Imports System.ComponentModel
-
-Namespace Schemas.Orders
-
- Public Class ReportSource
-
- Public Property Head As Orders.Input.MESOWebServiceEXIMVRG_ordersT025
-
-
- Public Property Positions As IEnumerable(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)
-
-
- Public Iterator Function GetPositionList() As IEnumerable(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)
- For Each oPosition In Positions
- Yield oPosition
- Next
- End Function
- End Class
-End Namespace
diff --git a/MultiTool.Shared/Schemas/Report/ReportHead.vb b/MultiTool.Shared/Schemas/Report/ReportHead.vb
new file mode 100644
index 0000000..170e3d3
--- /dev/null
+++ b/MultiTool.Shared/Schemas/Report/ReportHead.vb
@@ -0,0 +1,16 @@
+Public Class ReportHead
+ Public Property Title As String
+ Public Property DateCreated As Date
+ Public Property Id As String
+
+ Public Property Text1 As String
+ Public Property Text2 As String
+ Public Property Text3 As String
+ Public Property Text4 As String
+ Public Property Text5 As String
+ Public Property Text6 As String
+ Public Property Text7 As String
+ Public Property Text8 As String
+ Public Property Text9 As String
+ Public Property Text10 As String
+End Class
diff --git a/MultiTool.Shared/Schemas/Report/ReportPosition.vb b/MultiTool.Shared/Schemas/Report/ReportPosition.vb
new file mode 100644
index 0000000..da922f6
--- /dev/null
+++ b/MultiTool.Shared/Schemas/Report/ReportPosition.vb
@@ -0,0 +1,14 @@
+Public Class ReportPosition
+ Public Property Id As String
+
+ Public Property Text1 As String
+ Public Property Text2 As String
+ Public Property Text3 As String
+ Public Property Text4 As String
+ Public Property Text5 As String
+ Public Property Text6 As String
+ Public Property Text7 As String
+ Public Property Text8 As String
+ Public Property Text9 As String
+ Public Property Text10 As String
+End Class
diff --git a/MultiTool.Shared/Schemas/Report/ReportSource.vb b/MultiTool.Shared/Schemas/Report/ReportSource.vb
new file mode 100644
index 0000000..0ead533
--- /dev/null
+++ b/MultiTool.Shared/Schemas/Report/ReportSource.vb
@@ -0,0 +1,16 @@
+Imports System.ComponentModel
+Imports DevExpress.DataAccess.ObjectBinding
+
+
+Public Class ReportSource
+
+ Public Property Head As ReportHead
+
+ Public Property Positions As IEnumerable(Of ReportPosition)
+
+ Public Iterator Function GetPositionList() As IEnumerable(Of ReportPosition)
+ For Each oPosition In Positions
+ Yield oPosition
+ Next
+ End Function
+End Class
diff --git a/MultiTool.Shared/packages.config b/MultiTool.Shared/packages.config
index 63f3075..30c87d1 100644
--- a/MultiTool.Shared/packages.config
+++ b/MultiTool.Shared/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file