diff --git a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs index d858e9a1f..be61a35c9 100644 --- a/ReportImp/VSDHammReports/SettlementReport2.Designer.cs +++ b/ReportImp/VSDHammReports/SettlementReport2.Designer.cs @@ -31,6 +31,7 @@ namespace VSDHammReports this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); @@ -92,18 +93,6 @@ namespace VSDHammReports this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -121,15 +110,28 @@ namespace VSDHammReports this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -741,7 +743,7 @@ namespace VSDHammReports // GroupHeader2 // this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + new DevExpress.XtraReports.UI.GroupField("ItemDescription", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.GroupHeader2.HeightF = 0F; this.GroupHeader2.Name = "GroupHeader2"; // @@ -830,167 +832,15 @@ namespace VSDHammReports this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.Weight = 3D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, - this.xrTable3, - this.xrLabel7, - this.xrLabel19, - this.xrLabel21, - this.xrLabel22, - this.xrTable7, - this.xrLabel11, this.xrTable5}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 12F); - this.GroupFooter1.HeightF = 450.4791F; + this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // - // xrLabel10 - // - this.xrLabel10.BackColor = System.Drawing.Color.Transparent; - this.xrLabel10.CanShrink = true; - this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 149.2292F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel10.StylePriority.UseBackColor = false; - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Abwesenheitszeiten"; - this.xrLabel10.WordWrap = false; - // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.2291F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow22}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.47619047619047605D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrLabel7 - // - this.xrLabel7.BackColor = System.Drawing.Color.Transparent; - this.xrLabel7.CanShrink = true; - this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.5625F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Erklärung des Anbieters:"; - this.xrLabel7.WordWrap = false; - // - // xrLabel19 - // - this.xrLabel19.BackColor = System.Drawing.Color.Transparent; - this.xrLabel19.CanShrink = true; - this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 277.5625F); - this.xrLabel19.Multiline = true; - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F); - this.xrLabel19.StylePriority.UseBackColor = false; - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.Text = resources.GetString("xrLabel19.Text"); - // - // xrLabel21 - // - this.xrLabel21.BackColor = System.Drawing.Color.Transparent; - this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel21.CanShrink = true; - this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 425.6874F); - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F); - this.xrLabel21.StylePriority.UseBackColor = false; - this.xrLabel21.StylePriority.UseBorders = false; - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.Text = "Ort, Datum"; - this.xrLabel21.WordWrap = false; - // - // xrLabel22 - // - this.xrLabel22.BackColor = System.Drawing.Color.Transparent; - this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel22.CanShrink = true; - this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1249F, 425.6874F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F); - this.xrLabel22.StylePriority.UseBackColor = false; - this.xrLabel22.StylePriority.UseBorders = false; - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en"; - this.xrLabel22.WordWrap = false; - // - // xrTable7 - // - this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 216.521F); - this.xrTable7.Name = "xrTable7"; - this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow3}); - this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrTable7.StylePriority.UseFont = false; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.47619047619047605D; - // - // xrTableCell3 - // - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.StylePriority.UsePadding = false; - this.xrTableCell3.Text = "xrTableCell4"; - this.xrTableCell3.Weight = 3D; - // - // xrLabel11 - // - this.xrLabel11.BackColor = System.Drawing.Color.Transparent; - this.xrLabel11.CanShrink = true; - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.5209F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Fehlkontakte"; - this.xrLabel11.WordWrap = false; - // // xrTable5 // this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -1182,6 +1032,165 @@ namespace VSDHammReports this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.21685899000901443D; // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Abwesenheitszeiten"; + this.xrLabel10.WordWrap = false; + // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99968F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow22}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.47619047619047605D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.Text = "xrTableCell4"; + this.xrTableCell29.Weight = 3D; + // + // xrLabel7 + // + this.xrLabel7.BackColor = System.Drawing.Color.Transparent; + this.xrLabel7.CanShrink = true; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.333F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "Erklärung des Anbieters:"; + this.xrLabel7.WordWrap = false; + // + // xrLabel19 + // + this.xrLabel19.BackColor = System.Drawing.Color.Transparent; + this.xrLabel19.CanShrink = true; + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.3331F); + this.xrLabel19.Multiline = true; + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(650F, 66.66667F); + this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.Text = resources.GetString("xrLabel19.Text"); + // + // xrLabel21 + // + this.xrLabel21.BackColor = System.Drawing.Color.Transparent; + this.xrLabel21.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel21.CanShrink = true; + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 276.4579F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(229.1667F, 20F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseBorders = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.Text = "Ort, Datum"; + this.xrLabel21.WordWrap = false; + // + // xrLabel22 + // + this.xrLabel22.BackColor = System.Drawing.Color.Transparent; + this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel22.CanShrink = true; + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(303.1246F, 276.4579F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(346.8752F, 20F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.Text = "Stempel, rechtsverbindliche Unterschrift/en"; + this.xrLabel22.WordWrap = false; + // + // xrTable7 + // + this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 67.29162F); + this.xrTable7.Name = "xrTable7"; + this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable7.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrTable7.StylePriority.UseFont = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.47619047619047605D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 12F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Text = "xrTableCell4"; + this.xrTableCell3.Weight = 3D; + // + // xrLabel11 + // + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.CanShrink = true; + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.29155F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Fehlkontakte"; + this.xrLabel11.WordWrap = false; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.xrTable3, + this.xrLabel7, + this.xrLabel19, + this.xrLabel21, + this.xrLabel22, + this.xrTable7, + this.xrLabel10}); + this.ReportFooter.HeightF = 296.4579F; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1190,7 +1199,8 @@ namespace VSDHammReports this.bottomMarginBand1, this.GroupHeader1, this.DetailReport, - this.GroupFooter1}); + this.GroupFooter1, + this.ReportFooter}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldApprovedFLSWithFactor}); this.DataSource = this.bindingSource1; @@ -1199,18 +1209,20 @@ namespace VSDHammReports this.ruleRateFactorNull}); this.Margins = new DevExpress.Drawing.DXMargins(77F, 39F, 100F, 27F); this.PageHeight = 1169; - this.PageWidth = 827; + this.PageWidth = 826; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1307,5 +1319,6 @@ namespace VSDHammReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; } } diff --git a/ReportImp/VSDHammReports/SettlementReport2.cs b/ReportImp/VSDHammReports/SettlementReport2.cs index f872e9caf..5788925e1 100644 --- a/ReportImp/VSDHammReports/SettlementReport2.cs +++ b/ReportImp/VSDHammReports/SettlementReport2.cs @@ -46,7 +46,8 @@ namespace VSDHammReports ratefactor = ii.RateFactor ?? 1; - if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) + if (!pRO.FehlkontakteString.IsNullOrEmpty() && + ii.ItemDescription != null && ii.ItemDescription.ToLower().Contains("fehlkontakt")) { Zwischensumme.Visible = true; ii.DetailDescription = ii.DetailDescription.Replace("FLS", "Std.");