From c11dbaf544aeff033ce05c73d78c1b1675c5c7ac Mon Sep 17 00:00:00 2001 From: Kojo Date: Thu, 26 Mar 2026 19:27:34 +0100 Subject: [PATCH] =?UTF-8?q?SKFAlsdorf:=20F=C3=BCr=20Spitzabrechnung=20Fehl?= =?UTF-8?q?kontakt-Support=20eingebaut=20SupportOID=3D158783?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SKFAlsdorf/SettlementReport2.Designer.cs | 451 ++++++++++++------ ReportImp/SKFAlsdorf/SettlementReport2.cs | 23 +- 2 files changed, 311 insertions(+), 163 deletions(-) diff --git a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs index ccc8b9645..e998873ec 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport2.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.SKFAlsdorf { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -68,17 +69,6 @@ namespace BeWo.SKFAlsdorf this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); @@ -104,7 +94,10 @@ namespace BeWo.SKFAlsdorf this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow45 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -124,15 +117,35 @@ namespace BeWo.SKFAlsdorf this.xrTableRow51 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell82 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell83 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -240,7 +253,7 @@ namespace BeWo.SKFAlsdorf this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(610F, 67F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(621.9999F, 67F); this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); // @@ -525,8 +538,8 @@ namespace BeWo.SKFAlsdorf // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, this.xrTable3, + this.xrLabel10, this.xrLabel12, this.xrLabel11, this.xrLabel7}); @@ -539,102 +552,13 @@ namespace BeWo.SKFAlsdorf // xrLabel10 // this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 122F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrTable3 - // - this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33.00001F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow21, - this.xrTableRow22, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(621.9999F, 68.00001F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow21 - // - this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell18}); - this.xrTableRow21.Name = "xrTableRow21"; - this.xrTableRow21.Weight = 0.23809523809523808D; - // - // xrTableCell18 - // - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Weight = 3D; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; - // - // 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; - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell30}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 0.23809523809523803D; - // - // xrTableCell30 - // - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238093D; - // - // xrTableCell31 - // - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; - // // xrLabel12 // this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -660,7 +584,7 @@ namespace BeWo.SKFAlsdorf // xrLabel7 // this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Italic); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 8F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(250F, 17F); @@ -751,7 +675,8 @@ namespace BeWo.SKFAlsdorf this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, this.GroupHeader2, - this.GroupFooter1}); + this.Zwischensumme, + this.GroupFooter2}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -763,6 +688,8 @@ namespace BeWo.SKFAlsdorf this.xrTable5}); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); // // xrTable5 // @@ -790,7 +717,7 @@ namespace BeWo.SKFAlsdorf this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell44.CanShrink = true; this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AbrechnungsText")}); this.xrTableCell44.Name = "xrTableCell44"; this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell44.StylePriority.UseBorderColor = false; @@ -822,6 +749,8 @@ namespace BeWo.SKFAlsdorf // this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); this.GroupHeader2.HeightF = 51F; this.GroupHeader2.Name = "GroupHeader2"; // @@ -917,12 +846,44 @@ namespace BeWo.SKFAlsdorf this.xrTableCell22.Text = "Erbrachte Leistungen:"; this.xrTableCell22.Weight = 0.78314111507523521D; // - // GroupFooter1 + // xrTableCell7 // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")}); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell7.Multiline = true; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell7.TextFormatString = "{0:0.00}"; + this.xrTableCell7.Weight = 0.21685888492476485D; + // + // Zwischensumme + // + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable7}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable6}); - this.GroupFooter1.HeightF = 132F; - this.GroupFooter1.Name = "GroupFooter1"; + this.GroupFooter2.HeightF = 128F; + this.GroupFooter2.Level = 1; + this.GroupFooter2.Name = "GroupFooter2"; // // xrTable6 // @@ -938,7 +899,7 @@ namespace BeWo.SKFAlsdorf this.xrTableRow49, this.xrTableRow50, this.xrTableRow51}); - this.xrTable6.SizeF = new System.Drawing.SizeF(621.9999F, 132F); + this.xrTable6.SizeF = new System.Drawing.SizeF(621.9999F, 128F); this.xrTable6.StylePriority.UseBorderColor = false; this.xrTable6.StylePriority.UseFont = false; // @@ -1104,7 +1065,7 @@ namespace BeWo.SKFAlsdorf this.xrTableCell82, this.xrTableCell83}); this.xrTableRow51.Name = "xrTableRow51"; - this.xrTableRow51.Weight = 0.15D; + this.xrTableRow51.Weight = 0.13D; // // xrTableCell82 // @@ -1136,28 +1097,202 @@ namespace BeWo.SKFAlsdorf this.xrTableCell83.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell83.Weight = 0.21685899000901443D; // - // bindingSource1 + // xrTable7 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + this.xrTable7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable7.Name = "xrTable7"; + this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow10}); + this.xrTable7.SizeF = new System.Drawing.SizeF(622F, 34F); + this.xrTable7.StylePriority.UseFont = false; // - // xrTableCell7 + // xrTableRow12 // - this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.40476190476190466D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell9.Weight = 2.3494227392143348D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLS")}); - this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.TextFormatString = "{0:0.00}"; - this.xrTableCell7.Weight = 0.21685888492476485D; + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.Weight = 0.65057726078566536D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.40476190476190466D; + // + // xrTableCell12 + // + this.xrTableCell12.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell12.StylePriority.UseBorderColor = false; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.Weight = 3D; + // + // xrTable3 + // + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow20, + this.xrTableRow13, + this.xrTableRow14, + this.xrTableRow21, + this.xrTableRow22, + this.xrTableRow23, + this.xrTableRow24}); + this.xrTable3.SizeF = new System.Drawing.SizeF(621.9999F, 93.99999F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow20 + // + this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16}); + this.xrTableRow20.Name = "xrTableRow20"; + this.xrTableRow20.Weight = 0.38095238095238093D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.Text = "xrTableCell1"; + this.xrTableCell16.Weight = 3D; + // + // xrTableRow13 + // + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell14}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 0.23809523809523808D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.Weight = 3D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell15}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.38095238095238088D; + // + // xrTableCell15 + // + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.Weight = 3D; + // + // xrTableRow21 + // + this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18}); + this.xrTableRow21.Name = "xrTableRow21"; + this.xrTableRow21.Weight = 0.23809523809523808D; + // + // xrTableCell18 + // + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Weight = 3D; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.38095238095238088D; + // + // 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; + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell30}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 0.23809523809523803D; + // + // xrTableCell30 + // + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Weight = 3D; + // + // xrTableRow24 + // + this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell31}); + this.xrTableRow24.Name = "xrTableRow24"; + this.xrTableRow24.Weight = 0.38095238095238088D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.Text = "xrTableCell8"; + this.xrTableCell31.Weight = 3D; // // Spitzabrechnung // @@ -1179,12 +1314,13 @@ namespace BeWo.SKFAlsdorf this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1223,17 +1359,6 @@ namespace BeWo.SKFAlsdorf private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRTable xrTable3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; @@ -1264,7 +1389,11 @@ namespace BeWo.SKFAlsdorf private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.XRTable xrTable6; private DevExpress.XtraReports.UI.XRTableRow xrTableRow45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell73; @@ -1284,8 +1413,26 @@ namespace BeWo.SKFAlsdorf private DevExpress.XtraReports.UI.XRTableRow xrTableRow51; private DevExpress.XtraReports.UI.XRTableCell xrTableCell82; private DevExpress.XtraReports.UI.XRTableCell xrTableCell83; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTable xrTable7; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/SKFAlsdorf/SettlementReport2.cs b/ReportImp/SKFAlsdorf/SettlementReport2.cs index 4678fe6be..4af52a7ce 100644 --- a/ReportImp/SKFAlsdorf/SettlementReport2.cs +++ b/ReportImp/SKFAlsdorf/SettlementReport2.cs @@ -1,6 +1,7 @@ using System; using BeWo.Report; using BeWo.Report.ReportObjects; +using BS.Shared.Extensions; namespace BeWo.SKFAlsdorf { @@ -13,28 +14,29 @@ namespace BeWo.SKFAlsdorf public void SetReportDataSource(Settlement2RO pRO) { - decimal rateFactor = 1; foreach (var ii in pRO.InvoiceItems) { - if (ii.RateFactor.HasValue) { rateFactor = (100 + ii.RateFactor.Value) / 100; - - ii.DetailDescription = String.Format( - "{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00} x {4:0.00} x {3:c} ", ii.PeriodStartDate, - ii.PeriodEndDate, ii.UnitCount, ii.AmountPerUnit, rateFactor); } - else + + if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { - ii.DetailDescription = String.Format( - "{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.00} x {3:c}", ii.PeriodStartDate, - ii.PeriodEndDate, ii.UnitCount, ii.AmountPerUnit); + Zwischensumme.Visible = true; + ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); + ii.ItemDescription = "Fehlkontakte"; + } + else if (ii.ItemDescription.IsNullOrEmpty()) + { + ii.ItemDescription = "Fachleistungsstunden"; } } + pRO.RateFactor = (double)rateFactor; + if (rateFactor != 1) { pRO.RateFactorText2 = String.Format("{0:0.00}", rateFactor); @@ -43,7 +45,6 @@ namespace BeWo.SKFAlsdorf { pRO.RateFactorText2 = ""; } - this.bindingSource1.DataSource = pRO; }