Update Report, Fix Paths issues, Small Tweaks, Work on Exports

This commit is contained in:
Jonathan Jenne
2021-12-23 15:58:45 +01:00
parent 79cfec3173
commit 4859406fe3
22 changed files with 495 additions and 243 deletions

View File

@@ -87,9 +87,9 @@ Partial Public Class OrderReport
Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell()
Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell()
Me.XrTableCell8 = New DevExpress.XtraReports.UI.XRTableCell()
Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
Me.GroupFooter1 = New DevExpress.XtraReports.UI.GroupFooterBand()
Me.label2 = New DevExpress.XtraReports.UI.XRLabel()
Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -301,7 +301,7 @@ Partial Public Class OrderReport
'XrTable2
'
Me.XrTable2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
Me.XrTable2.LocationFloat = New DevExpress.Utils.PointFloat(354.8623!, 0!)
Me.XrTable2.LocationFloat = New DevExpress.Utils.PointFloat(448.4831!, 0!)
Me.XrTable2.Name = "XrTable2"
Me.XrTable2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
Me.XrTable2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow3, Me.XrTableRow5, Me.XrTableRow4})
@@ -385,7 +385,7 @@ Partial Public Class OrderReport
Me.XrTable1.Name = "XrTable1"
Me.XrTable1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!)
Me.XrTable1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow1, Me.XrTableRow2})
Me.XrTable1.SizeF = New System.Drawing.SizeF(322.9167!, 50.0!)
Me.XrTable1.SizeF = New System.Drawing.SizeF(415.625!, 50.0!)
Me.XrTable1.StylePriority.UseForeColor = False
'
'XrTableRow1
@@ -409,7 +409,7 @@ Partial Public Class OrderReport
Me.XrTableCell2.Multiline = True
Me.XrTableCell2.Name = "XrTableCell2"
Me.XrTableCell2.Text = "XrTableCell2"
Me.XrTableCell2.Weight = 1.0R
Me.XrTableCell2.Weight = 1.5741933862025337R
'
'XrTableRow2
'
@@ -432,7 +432,7 @@ Partial Public Class OrderReport
Me.XrTableCell4.Multiline = True
Me.XrTableCell4.Name = "XrTableCell4"
Me.XrTableCell4.Text = "XrTableCell4"
Me.XrTableCell4.Weight = 1.0R
Me.XrTableCell4.Weight = 1.5741933862025337R
'
'DetailReport
'
@@ -688,6 +688,11 @@ Partial Public Class OrderReport
Me.XrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight
Me.XrTableCell8.Weight = 0.089263976911086243R
'
'ObjectDataSource1
'
Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
Me.ObjectDataSource1.Name = "ObjectDataSource1"
'
'GroupFooter1
'
Me.GroupFooter1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label2})
@@ -697,18 +702,15 @@ Partial Public Class OrderReport
'
'label2
'
Me.label2.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
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(1080.0!, 2.083333!)
Me.label2.StyleName = "GroupFooterBackground3"
Me.label2.StylePriority.UseBackColor = False
Me.label2.StylePriority.UseBorders = False
'
'ObjectDataSource1
'
Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource)
Me.ObjectDataSource1.Name = "ObjectDataSource1"
'
'OrderReport
'
Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport})
@@ -720,7 +722,7 @@ Partial Public Class OrderReport
Me.PageHeight = 850
Me.PageWidth = 1100
Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption1, Me.DetailData1, Me.GroupCaption2, Me.GroupData2, Me.DetailCaption2, Me.DetailData2, Me.GroupFooterBackground3, Me.DetailData3_Odd, Me.PageInfo})
Me.Version = "19.2"
Me.Version = "21.2"
CType(Me.XrTable2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XrTable1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.table3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -768,8 +770,6 @@ Partial Public Class OrderReport
Friend WithEvents tableCell44 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents tableCell45 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents tableCell46 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents GroupFooter1 As DevExpress.XtraReports.UI.GroupFooterBand
Friend WithEvents label2 As DevExpress.XtraReports.UI.XRLabel
Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
Friend WithEvents XrTable1 As DevExpress.XtraReports.UI.XRTable
Friend WithEvents XrTableRow1 As DevExpress.XtraReports.UI.XRTableRow
@@ -800,4 +800,6 @@ Partial Public Class OrderReport
Friend WithEvents XrTableCell16 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents XrTableCell17 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents XrTableCell18 As DevExpress.XtraReports.UI.XRTableCell
Friend WithEvents GroupFooter1 As DevExpress.XtraReports.UI.GroupFooterBand
Friend WithEvents label2 As DevExpress.XtraReports.UI.XRLabel
End Class