From 52f41c251673be4c6de130ef55bbdc8078b38895 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 21 Jan 2026 12:32:25 +0100 Subject: [PATCH] SelbstWerk/SettlementReport2 - streichen Schlusssatz --- .../SelbstWerk/SettlementReport2.Designer.cs | 89 ++++++++----------- ReportImp/SelbstWerk/SettlementReport2.cs | 6 +- 2 files changed, 39 insertions(+), 56 deletions(-) diff --git a/ReportImp/SelbstWerk/SettlementReport2.Designer.cs b/ReportImp/SelbstWerk/SettlementReport2.Designer.cs index 05d1face1..cb99f9e84 100644 --- a/ReportImp/SelbstWerk/SettlementReport2.Designer.cs +++ b/ReportImp/SelbstWerk/SettlementReport2.Designer.cs @@ -41,7 +41,6 @@ namespace SelbstWerk this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAnrede = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -85,6 +84,9 @@ namespace SelbstWerk this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -120,17 +122,14 @@ namespace SelbstWerk this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTable7 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -207,16 +206,6 @@ namespace SelbstWerk this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); - // - // lblAnrede - // - this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); - this.lblAnrede.Name = "lblAnrede"; - this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAnrede.SizeF = new System.Drawing.SizeF(649.9998F, 17F); - this.lblAnrede.StylePriority.UseFont = false; - this.lblAnrede.Text = "Die geleistete Überzahlung wird in den nächsten Tagen Ihrem Konto gutgeschrieben." + - ""; // // xrLabel4 // @@ -466,21 +455,20 @@ namespace SelbstWerk // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblAnrede, this.xrLabel10, this.xrTable3, this.xrLabel12, this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportFooter.HeightF = 252.7499F; + this.ReportFooter.HeightF = 226.7082F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 148.625F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 122.5834F); 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); @@ -489,7 +477,7 @@ namespace SelbstWerk // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 72.04167F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow7, @@ -573,7 +561,7 @@ namespace SelbstWerk // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.625F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 181.5833F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -582,7 +570,7 @@ namespace SelbstWerk // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235.7499F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.7082F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); @@ -595,7 +583,7 @@ namespace SelbstWerk // this.lblNotice.CanShrink = true; this.lblNotice.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.04167F); + this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 21F); this.lblNotice.Name = "lblNotice"; this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); @@ -633,6 +621,33 @@ namespace SelbstWerk this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrTable7 + // + this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.3333F); + this.xrTable7.Name = "xrTable7"; + this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow13}); + this.xrTable7.SizeF = new System.Drawing.SizeF(650.0001F, 39.95837F); + // + // xrTableRow13 + // + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell14}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 1D; + // + // xrTableCell14 + // + this.xrTableCell14.CanShrink = true; + this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.Text = "Abrechnung von Leistungen der Eingliederungshilfe [CustomerFirstName] [CustomerLa" + + "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; + this.xrTableCell14.Weight = 1D; + // // xrLabel5 // this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.0417F); @@ -1019,33 +1034,6 @@ namespace SelbstWerk // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // - // xrTable7 - // - this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.3333F); - this.xrTable7.Name = "xrTable7"; - this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); - this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow13}); - this.xrTable7.SizeF = new System.Drawing.SizeF(650.0001F, 39.95837F); - // - // xrTableRow13 - // - this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell14}); - this.xrTableRow13.Name = "xrTableRow13"; - this.xrTableRow13.Weight = 1D; - // - // xrTableCell14 - // - this.xrTableCell14.CanShrink = true; - this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell14.Multiline = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.Text = "Abrechnung von Leistungen der Eingliederungshilfe [CustomerFirstName] [CustomerLa" + - "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; - this.xrTableCell14.Weight = 1D; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1076,11 +1064,11 @@ namespace SelbstWerk ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1091,7 +1079,6 @@ namespace SelbstWerk private System.Windows.Forms.BindingSource bindingSource1; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel lblAnrede; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable2; diff --git a/ReportImp/SelbstWerk/SettlementReport2.cs b/ReportImp/SelbstWerk/SettlementReport2.cs index 473f7784c..161a69b1a 100644 --- a/ReportImp/SelbstWerk/SettlementReport2.cs +++ b/ReportImp/SelbstWerk/SettlementReport2.cs @@ -49,11 +49,7 @@ namespace SelbstWerk } } pRO.RateFactor = (double)rateFactor; - - if (pRO.Salutation1.IsNullOrEmpty() && pRO.Salutation2.IsNullOrEmpty()) - { - lblAnrede.Text = "Guten Tag " + pRO.CustomerFirstName + " " + pRO.CustomerLastName + ","; - } + pRO.FinalSentence = ""; this.bindingSource1.DataSource = pRO; }