From af95fac7152bb0afd1892f3e7eddbea89ab24b98 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 21 Apr 2023 15:13:28 +0200 Subject: [PATCH] GenderBeWoReports/SettlementReport2 Fehlkontakte CaritasAachen/ServicesOverviewReport und SR2 Fehlkontakte --- .../ServicesOverviewReport.Designer.cs | 61 +- .../CaritasAachen/ServicesOverviewReport.cs | 28 + ReportImp/CaritasAachen/SettlementReport2.cs | 23 +- .../SettlementReport2.designer.cs | 608 +++++++++++------- .../GenderBeWoReports/SettlementReport2.cs | 26 +- .../SettlementReport2.designer.cs | 289 ++++++--- .../WohnstaettenEssen/SettlementReport2.cs | 5 +- 7 files changed, 696 insertions(+), 344 deletions(-) diff --git a/ReportImp/CaritasAachen/ServicesOverviewReport.Designer.cs b/ReportImp/CaritasAachen/ServicesOverviewReport.Designer.cs index aa43c680f..79260d16b 100644 --- a/ReportImp/CaritasAachen/ServicesOverviewReport.Designer.cs +++ b/ReportImp/CaritasAachen/ServicesOverviewReport.Designer.cs @@ -60,6 +60,7 @@ namespace BeWo.CaritasAachen this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -69,7 +70,8 @@ namespace BeWo.CaritasAachen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -95,7 +97,7 @@ namespace BeWo.CaritasAachen this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(620F, 20F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(660F, 20F); this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTableRow2 @@ -104,6 +106,7 @@ namespace BeWo.CaritasAachen this.xrTableCell3, this.xrTableCell4, this.xrTableCell1, + this.xrTableCell7, this.xrTableCell5}); this.xrTableRow2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); this.xrTableRow2.Name = "xrTableRow2"; @@ -138,7 +141,7 @@ namespace BeWo.CaritasAachen this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Minuten"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell1.Weight = 0.24495057949038296D; + this.xrTableCell1.Weight = 0.21229050215460005D; // // xrTableCell5 // @@ -146,7 +149,7 @@ namespace BeWo.CaritasAachen this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Gruppe"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.32660077287241995D; + this.xrTableCell5.Weight = 0.21229050219717985D; // // DetailReport // @@ -179,7 +182,7 @@ namespace BeWo.CaritasAachen this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(620F, 20F); + this.xrTable3.SizeF = new System.Drawing.SizeF(660F, 20F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -189,6 +192,7 @@ namespace BeWo.CaritasAachen this.xrTableCell13, this.xrTableCell14, this.xrTableCell2, + this.xrTableCell8, this.xrTableCell6}); this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -229,7 +233,7 @@ namespace BeWo.CaritasAachen this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.22433447775582185D; + this.xrTableCell2.Weight = 0.19442321376075347D; // // xrTableCell6 // @@ -239,7 +243,7 @@ namespace BeWo.CaritasAachen this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "xrTableCell6"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.29911266074197551D; + this.xrTableCell6.Weight = 0.19442323675923623D; // // bindingSource1 // @@ -401,6 +405,20 @@ namespace BeWo.CaritasAachen this.ReportHeader.HeightF = 100F; this.ReportHeader.Name = "ReportHeader"; // + // xrLabel2 + // + this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "Bewilligte FLS wöchentl.: {0:0.00}")}); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(355.2083F, 57.99999F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(264.7918F, 25F); + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // xrLabel7 // this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -478,19 +496,22 @@ namespace BeWo.CaritasAachen this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // - // xrLabel2 + // xrTableCell7 // - this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "Bewilligte FLS wöchentl.: {0:0.00}")}); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(355.2083F, 57.99999F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(264.7918F, 25F); - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Art des Kontakts"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.21229050215460008D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.19442321376075347D; // // Stundenzettel // @@ -564,5 +585,7 @@ namespace BeWo.CaritasAachen private DevExpress.XtraReports.UI.CalculatedField fieldGruppe; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; } } diff --git a/ReportImp/CaritasAachen/ServicesOverviewReport.cs b/ReportImp/CaritasAachen/ServicesOverviewReport.cs index ad9265ac9..60a937a5e 100644 --- a/ReportImp/CaritasAachen/ServicesOverviewReport.cs +++ b/ReportImp/CaritasAachen/ServicesOverviewReport.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using System.Collections.Generic; namespace BeWo.CaritasAachen { @@ -16,6 +17,33 @@ namespace BeWo.CaritasAachen public void SetReportDataSource(ServicesOverviewRO pRO) { + if (pRO.Services != null) + { + List servicesBillable = new List(); + + foreach (var sd in pRO.Services) + { + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + //ServicesOverviewRO.CreateSignatureString(sd); + sd.Notice5 = "E"; + if (sd.IsGroup) + { + //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); + sd.Notice5 = "GR"; + //hatGruppen = true; + } + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + sd.Notice5 = "F"; + } + servicesBillable.Add(sd); + } + } + + pRO.Services = servicesBillable; + } + if (String.IsNullOrEmpty(pRO.AbsenceTimes)) xrCheckBox1.Checked = true; diff --git a/ReportImp/CaritasAachen/SettlementReport2.cs b/ReportImp/CaritasAachen/SettlementReport2.cs index 1ad443c6b..4ccb1a936 100644 --- a/ReportImp/CaritasAachen/SettlementReport2.cs +++ b/ReportImp/CaritasAachen/SettlementReport2.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using System.Text.RegularExpressions; namespace BeWo.CaritasAachen.Neu { @@ -28,19 +29,27 @@ namespace BeWo.CaritasAachen.Neu } } + decimal rateFactor = 1; if (pRO.InvoiceItems != null) { foreach (var ii in pRO.InvoiceItems) { - ii.DetailDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", - ii.PeriodStartDate, ii.PeriodEndDate, - ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); + if (ii.RateFactor.HasValue) + { + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + if (pRO.FehlkontakteString != null && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (ii.ItemDescription != null) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; + } } } - - - + pRO.RateFactor = (double)rateFactor; this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/CaritasAachen/SettlementReport2.designer.cs b/ReportImp/CaritasAachen/SettlementReport2.designer.cs index 34ba78834..3775c73f7 100644 --- a/ReportImp/CaritasAachen/SettlementReport2.designer.cs +++ b/ReportImp/CaritasAachen/SettlementReport2.designer.cs @@ -29,8 +29,8 @@ namespace BeWo.CaritasAachen.Neu /// private void InitializeComponent() { - 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.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -66,38 +66,49 @@ namespace BeWo.CaritasAachen.Neu this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.bindingSource1 = new System.Windows.Forms.BindingSource(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow35 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell62 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell65 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow38 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell66 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow39 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell68 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell69 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow40 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow41 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell71 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell72 = new DevExpress.XtraReports.UI.XRTableCell(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -119,7 +130,7 @@ namespace BeWo.CaritasAachen.Neu this.xrLabel3, this.xrLabel2}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportHeader.HeightF = 570.0833F; + this.ReportHeader.HeightF = 570.0834F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -147,14 +158,14 @@ namespace BeWo.CaritasAachen.Neu // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 502.0833F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 502.0834F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, this.xrTableRow10, this.xrTableRow11, this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(586.1251F, 68F); + this.xrTable1.SizeF = new System.Drawing.SizeF(638.5414F, 67.99997F); this.xrTable1.StylePriority.UseBorderColor = false; // // xrTableRow9 @@ -176,7 +187,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:"; - this.xrTableCell19.Weight = 0.78314100999098568D; + this.xrTableCell19.Weight = 0.83602589872557209D; // // xrTableCell6 // @@ -192,7 +203,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "[ApprovedFLS]"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 0.21685899000901443D; + this.xrTableCell6.Weight = 0.163974101274428D; // // xrTableRow10 // @@ -214,7 +225,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:"; - this.xrTableCell20.Weight = 0.78314100999098568D; + this.xrTableCell20.Weight = 0.83602579459224979D; // // ruleRateFactorNull // @@ -236,7 +247,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 0.21685899000901443D; + this.xrTableCell7.Weight = 0.16397420540775029D; // // xrTableRow11 // @@ -350,14 +361,14 @@ namespace BeWo.CaritasAachen.Neu this.xrLabel11, this.xrLabel7}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 226.2917F; + this.ReportFooter.HeightF = 248.1667F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 106.5833F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 128.4583F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(195.8333F, 17.00001F); @@ -366,13 +377,15 @@ namespace BeWo.CaritasAachen.Neu // // xrTable3 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.99999F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 25F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, this.xrTableRow21, + this.xrTableRow1, + this.xrTableRow2, this.xrTableRow22}); - this.xrTable3.SizeF = new System.Drawing.SizeF(638.5417F, 41.99998F); + this.xrTable3.SizeF = new System.Drawing.SizeF(638.5417F, 67.99998F); this.xrTable3.StylePriority.UseFont = false; // // xrTableRow20 @@ -409,7 +422,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell29}); this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; + this.xrTableRow22.Weight = 0.38095249448508439D; // // xrTableCell29 // @@ -423,7 +436,7 @@ namespace BeWo.CaritasAachen.Neu // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 164.2916F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 186.1666F); 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); @@ -432,7 +445,7 @@ namespace BeWo.CaritasAachen.Neu // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.2917F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.1667F); 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); @@ -469,7 +482,9 @@ namespace BeWo.CaritasAachen.Neu // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, - this.GroupFooter1}); + this.Zwischensumme, + this.GroupHeader1, + this.GroupFooter2}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -484,15 +499,6 @@ namespace BeWo.CaritasAachen.Neu this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // - // GroupFooter1 - // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); - this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 132F; - this.GroupFooter1.Name = "GroupFooter1"; - this.GroupFooter1.StylePriority.UseFont = false; - // // xrTable2 // this.xrTable2.BorderColor = System.Drawing.SystemColors.ControlLight; @@ -500,7 +506,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable2.SizeF = new System.Drawing.SizeF(586.1251F, 17F); + this.xrTable2.SizeF = new System.Drawing.SizeF(638.5416F, 17F); this.xrTable2.StylePriority.UseBorderColor = false; // // xrTableRow6 @@ -524,7 +530,7 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; - this.xrTableCell15.Weight = 0.78314100999098546D; + this.xrTableCell15.Weight = 0.83602579459224957D; // // xrTableCell26 // @@ -542,214 +548,333 @@ namespace BeWo.CaritasAachen.Neu this.xrTableCell26.StylePriority.UsePadding = false; this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell26.Weight = 0.21685899000901443D; + this.xrTableCell26.Weight = 0.16397420540775032D; // - // xrTable4 + // Zwischensumme // - this.xrTable4.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow35, - this.xrTableRow36, - this.xrTableRow37, - this.xrTableRow38, - this.xrTableRow39, - this.xrTableRow40, - this.xrTableRow41}); - this.xrTable4.SizeF = new System.Drawing.SizeF(586.1251F, 132F); - this.xrTable4.StylePriority.UseBorderColor = false; + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.Font = new System.Drawing.Font("Verdana", 10F); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.StylePriority.UseFont = false; + this.Zwischensumme.Visible = false; // - // xrTableRow35 + // xrTableRow1 // - this.xrTableRow35.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell62}); - this.xrTableRow35.Name = "xrTableRow35"; - this.xrTableRow35.Weight = 0.085D; + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.38095238095238088D; // - // xrTableCell62 + // xrTableCell1 // - this.xrTableCell62.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell62.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Weight = 3D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.23809533812675518D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.Weight = 3D; + // + // GroupHeader1 + // + this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader1.HeightF = 0F; + this.GroupHeader1.Name = "GroupHeader1"; + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable5}); + this.GroupFooter2.HeightF = 115F; + this.GroupFooter2.Level = 1; + this.GroupFooter2.Name = "GroupFooter2"; + // + // xrTable5 + // + this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3, + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow7, + this.xrTableRow8, + this.xrTableRow12}); + this.xrTable5.SizeF = new System.Drawing.SizeF(638.5416F, 115F); + this.xrTable5.StylePriority.UseBorderColor = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell4}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.085D; + // + // xrTableCell3 + // + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell3.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Text = "Gesamtforderung:"; + this.xrTableCell3.Weight = 0.83602579459224957D; + // + // xrTableCell4 + // + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell62.Name = "xrTableCell62"; - this.xrTableCell62.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell62.StylePriority.UseBorderColor = false; - this.xrTableCell62.StylePriority.UseBorders = false; - this.xrTableCell62.Weight = 1D; - // - // xrTableRow36 - // - this.xrTableRow36.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell63, - this.xrTableCell64}); - this.xrTableRow36.Name = "xrTableRow36"; - this.xrTableRow36.Weight = 0.085D; - // - // xrTableCell63 - // - this.xrTableCell63.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell63.Name = "xrTableCell63"; - this.xrTableCell63.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell63.StylePriority.UseBorders = false; - this.xrTableCell63.StylePriority.UseFont = false; - this.xrTableCell63.StylePriority.UsePadding = false; - this.xrTableCell63.Text = "Gesamtforderung:"; - this.xrTableCell63.Weight = 0.78314100999098546D; - // - // xrTableCell64 - // - this.xrTableCell64.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell64.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")}); - this.xrTableCell64.Name = "xrTableCell64"; - this.xrTableCell64.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell64.StylePriority.UseBorders = false; - this.xrTableCell64.StylePriority.UseFont = false; - this.xrTableCell64.StylePriority.UsePadding = false; - this.xrTableCell64.StylePriority.UseTextAlignment = false; - this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell64.Weight = 0.21685899000901443D; + this.xrTableCell4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 0.16397420540775032D; // - // xrTableRow37 + // xrTableRow4 // - this.xrTableRow37.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell65}); - this.xrTableRow37.Name = "xrTableRow37"; - this.xrTableRow37.Weight = 0.085D; + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.085D; // - // xrTableCell65 + // xrTableCell5 // - this.xrTableCell65.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell65.Name = "xrTableCell65"; - this.xrTableCell65.StylePriority.UseBorders = false; - this.xrTableCell65.Weight = 1D; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.Weight = 1D; // - // xrTableRow38 + // xrTableRow5 // - this.xrTableRow38.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell66, - this.xrTableCell67}); - this.xrTableRow38.Name = "xrTableRow38"; - this.xrTableRow38.Weight = 0.085D; + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8, + this.xrTableCell9}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.085D; // - // xrTableCell66 + // xrTableCell8 // - this.xrTableCell66.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell66.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell66.Name = "xrTableCell66"; - this.xrTableCell66.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell66.StylePriority.UseBorderColor = false; - this.xrTableCell66.StylePriority.UseBorders = false; - this.xrTableCell66.StylePriority.UseFont = false; - this.xrTableCell66.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell66.Weight = 0.78314100999098568D; + this.xrTableCell8.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell8.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.Text = "abzüglich der geleisteten Abschlagszahlung:"; + this.xrTableCell8.Weight = 0.83602589872557209D; // - // xrTableCell67 + // xrTableCell9 // - this.xrTableCell67.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell67.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell67.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); - this.xrTableCell67.Name = "xrTableCell67"; - this.xrTableCell67.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell67.StylePriority.UseBorderColor = false; - this.xrTableCell67.StylePriority.UseBorders = false; - this.xrTableCell67.StylePriority.UseFont = false; - this.xrTableCell67.StylePriority.UseTextAlignment = false; - this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell67.Weight = 0.21685899000901443D; + this.xrTableCell9.Font = new System.Drawing.Font("Verdana", 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.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell9.Weight = 0.163974101274428D; // - // xrTableRow39 + // xrTableRow7 // - this.xrTableRow39.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell68, - this.xrTableCell69}); - this.xrTableRow39.Name = "xrTableRow39"; - this.xrTableRow39.Weight = 0.085D; + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10, + this.xrTableCell11}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.085D; // - // xrTableCell68 + // xrTableCell10 // - this.xrTableCell68.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell68.Name = "xrTableCell68"; - this.xrTableCell68.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell68.StylePriority.UseBorders = false; - this.xrTableCell68.StylePriority.UsePadding = false; - this.xrTableCell68.Text = "abzüglich Eigenanteil:"; - this.xrTableCell68.Weight = 0.78314100999098568D; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.Text = "abzüglich Eigenanteil:"; + this.xrTableCell10.Weight = 0.8360260549255556D; // - // xrTableCell69 + // xrTableCell11 // - this.xrTableCell69.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell69.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Eigenbeteiligung", "{0:c}")}); - this.xrTableCell69.Name = "xrTableCell69"; - this.xrTableCell69.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell69.StylePriority.UseBorders = false; - this.xrTableCell69.StylePriority.UsePadding = false; - this.xrTableCell69.StylePriority.UseTextAlignment = false; - this.xrTableCell69.Text = "xrTableCell2"; - this.xrTableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell69.Weight = 0.21685899000901443D; + this.xrTableCell11.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "xrTableCell2"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell11.Weight = 0.16397394507444452D; // - // xrTableRow40 + // xrTableRow8 // - this.xrTableRow40.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell70}); - this.xrTableRow40.Name = "xrTableRow40"; - this.xrTableRow40.Weight = 0.085D; + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.085D; // - // xrTableCell70 + // xrTableCell12 // - this.xrTableCell70.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell70.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + 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.xrTableCell70.Name = "xrTableCell70"; - this.xrTableCell70.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell70.StylePriority.UseBorderColor = false; - this.xrTableCell70.StylePriority.UseBorders = false; - this.xrTableCell70.Weight = 1D; + 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.Weight = 1D; // - // xrTableRow41 + // xrTableRow12 // - this.xrTableRow41.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell71, - this.xrTableCell72}); - this.xrTableRow41.Name = "xrTableRow41"; - this.xrTableRow41.Weight = 0.15D; + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13, + this.xrTableCell14}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.15D; // - // xrTableCell71 + // xrTableCell13 // - this.xrTableCell71.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell71.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell71.Name = "xrTableCell71"; - this.xrTableCell71.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell71.StylePriority.UseBorderColor = false; - this.xrTableCell71.StylePriority.UseBorders = false; - this.xrTableCell71.StylePriority.UseFont = false; - this.xrTableCell71.Text = "Restforderung:"; - this.xrTableCell71.Weight = 0.78314100999098568D; + this.xrTableCell13.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell13.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseBorderColor = false; + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.Text = "Restforderung:"; + this.xrTableCell13.Weight = 0.83602579459224979D; // - // xrTableCell72 + // xrTableCell14 // - this.xrTableCell72.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell72.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell14.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell72.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")}); - this.xrTableCell72.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrTableCell72.Name = "xrTableCell72"; - this.xrTableCell72.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell72.StylePriority.UseBorderColor = false; - this.xrTableCell72.StylePriority.UseBorders = false; - this.xrTableCell72.StylePriority.UseFont = false; - this.xrTableCell72.StylePriority.UseTextAlignment = false; - this.xrTableCell72.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell72.Weight = 0.21685899000901443D; + this.xrTableCell14.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBorderColor = false; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell14.Weight = 0.16397420540775029D; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow13, + this.xrTableRow14}); + this.xrTable6.SizeF = new System.Drawing.SizeF(638.5418F, 34F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow13 + // + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell17, + this.xrTableCell23}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 0.40476190476190466D; + // + // xrTableCell17 + // + this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell17.StylePriority.UseBorderColor = false; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseFont = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell17.Weight = 2.5080772986778848D; + // + // xrTableCell23 + // + this.xrTableCell23.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell23.StylePriority.UseBorderColor = false; + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UsePadding = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell23.Summary = xrSummary1; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell23.Weight = 0.4919227013221153D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell24}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.40476190476190466D; + // + // xrTableCell24 + // + this.xrTableCell24.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell24.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell24.StylePriority.UseBorderColor = false; + this.xrTableCell24.StylePriority.UseBorders = false; + this.xrTableCell24.StylePriority.UseFont = false; + this.xrTableCell24.StylePriority.UsePadding = false; + this.xrTableCell24.Weight = 3D; // // Spitzabrechnung // @@ -773,7 +898,8 @@ namespace BeWo.CaritasAachen.Neu ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -822,25 +948,35 @@ namespace BeWo.CaritasAachen.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow35; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell62; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow36; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell63; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell64; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell65; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow38; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell66; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell67; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow39; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell68; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell69; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow40; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell70; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow41; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell71; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell72; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; } } diff --git a/ReportImp/GenderBeWoReports/SettlementReport2.cs b/ReportImp/GenderBeWoReports/SettlementReport2.cs index f41504c48..201f2d6fb 100644 --- a/ReportImp/GenderBeWoReports/SettlementReport2.cs +++ b/ReportImp/GenderBeWoReports/SettlementReport2.cs @@ -9,6 +9,7 @@ using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; using BS.Shared.DataContracts; +using System.Text.RegularExpressions; namespace BeWo.GenderBeWoReports.Neu { @@ -48,17 +49,30 @@ namespace BeWo.GenderBeWoReports.Neu if (pRO.InvoiceItems != null) { - foreach (var ii in pRO.InvoiceItems) + decimal rateFactor = 1; + if (pRO.InvoiceItems != null) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", - ii.PeriodStartDate, ii.PeriodEndDate, - ii.UnitCount, !hasRatefactor ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); + foreach (var ii in pRO.InvoiceItems) + { + if (ii.RateFactor.HasValue) + { + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + if (pRO.FehlkontakteString != null && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (ii.ItemDescription != null) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; + } + } } + pRO.RateFactor = (double)rateFactor; } this.bindingSource1.DataSource = pRO; } - } } diff --git a/ReportImp/GenderBeWoReports/SettlementReport2.designer.cs b/ReportImp/GenderBeWoReports/SettlementReport2.designer.cs index 713c5b905..692eda61c 100644 --- a/ReportImp/GenderBeWoReports/SettlementReport2.designer.cs +++ b/ReportImp/GenderBeWoReports/SettlementReport2.designer.cs @@ -31,6 +31,7 @@ namespace BeWo.GenderBeWoReports.Neu { 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.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); @@ -62,10 +63,13 @@ namespace BeWo.GenderBeWoReports.Neu this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); 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.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = 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(); @@ -74,6 +78,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); @@ -84,10 +89,16 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable6 = 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.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -109,6 +120,7 @@ namespace BeWo.GenderBeWoReports.Neu ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -170,7 +182,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt"; - this.xrTableCell19.Weight = 0.74999997652493988D; + this.xrTableCell19.Weight = 0.8360256214630909D; // // xrTableCell6 // @@ -186,7 +198,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "[ApprovedFLS]"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell6.Weight = 0.25000002347506012D; + this.xrTableCell6.Weight = 0.16397437853690908D; // // xrTableRow10 // @@ -209,7 +221,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]"; - this.xrTableCell20.Weight = 0.74999997652494D; + this.xrTableCell20.Weight = 0.83602572318835144D; // // ruleRateFactorNull // @@ -232,7 +244,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell7.Weight = 0.25000002347506012D; + this.xrTableCell7.Weight = 0.16397427681164867D; // // xrTableRow11 // @@ -272,7 +284,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell22.StylePriority.UseBorders = false; this.xrTableCell22.StylePriority.UseFont = false; this.xrTableCell22.Text = "Erbrachte Leistungen"; - this.xrTableCell22.Weight = 0.74999997652494D; + this.xrTableCell22.Weight = 0.83602572318835144D; // // xrTableCell14 // @@ -289,7 +301,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "[RecordedFLS!0.00] FLS"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell14.Weight = 0.25000002347506012D; + this.xrTableCell14.Weight = 0.16397427681164867D; // // xrTableRow13 // @@ -462,36 +474,27 @@ namespace BeWo.GenderBeWoReports.Neu // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, this.xrTable3, + this.xrLabel10, this.xrLabel12, this.xrLabel7}); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 229.8334F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); - 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 System.Drawing.Font("Verdana", 10F); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow20, + this.xrTableRow3, + this.xrTableRow4, this.xrTableRow21, this.xrTableRow22, this.xrTableRow23, this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(600F, 68F); + this.xrTable3.SizeF = new System.Drawing.SizeF(600F, 94F); this.xrTable3.StylePriority.UseFont = false; // // xrTableRow20 @@ -505,12 +508,48 @@ namespace BeWo.GenderBeWoReports.Neu // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Font = new System.Drawing.Font("Verdana", 10F); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseFont = false; this.xrTableCell16.StylePriority.UsePadding = false; this.xrTableCell16.Text = "xrTableCell1"; this.xrTableCell16.Weight = 3D; // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.23809523809523808D; + // + // xrTableCell5 + // + this.xrTableCell5.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.Weight = 3D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.38095238095238088D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell8.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.Weight = 3D; + // // xrTableRow21 // this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -520,7 +559,9 @@ namespace BeWo.GenderBeWoReports.Neu // // xrTableCell18 // + this.xrTableCell18.Font = new System.Drawing.Font("Verdana", 10F); this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseFont = false; this.xrTableCell18.Weight = 3D; // // xrTableRow22 @@ -534,8 +575,10 @@ namespace BeWo.GenderBeWoReports.Neu // this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new System.Drawing.Font("Verdana", 10F); 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; @@ -549,7 +592,9 @@ namespace BeWo.GenderBeWoReports.Neu // // xrTableCell30 // + this.xrTableCell30.Font = new System.Drawing.Font("Verdana", 10F); this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseFont = false; this.xrTableCell30.Weight = 3D; // // xrTableRow24 @@ -557,22 +602,34 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell31}); this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238093D; + 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.Font = new System.Drawing.Font("Verdana", 10F); this.xrTableCell31.Name = "xrTableCell31"; this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UseFont = false; this.xrTableCell31.StylePriority.UsePadding = false; this.xrTableCell31.Text = "xrTableCell8"; this.xrTableCell31.Weight = 3D; // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 137.8333F); + 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"; + // // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Verdana", 10F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 212.8334F); 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); @@ -602,7 +659,9 @@ namespace BeWo.GenderBeWoReports.Neu // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.Zwischensumme, + this.GroupHeader1}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -641,14 +700,14 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell1.CanShrink = true; this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell1.StylePriority.UseBorderColor = false; this.xrTableCell1.StylePriority.UseBorders = false; this.xrTableCell1.StylePriority.UseFont = false; this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Weight = 0.69230769230769229D; + this.xrTableCell1.Weight = 0.771716073843149D; // // xrTableCell2 // @@ -667,13 +726,102 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell23"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell2.Weight = 0.23076923076923075D; + this.xrTableCell2.Weight = 0.15136084923377402D; + // + // Zwischensumme + // + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow2}); + this.xrTable6.SizeF = new System.Drawing.SizeF(600F, 34F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow12 + // + 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 System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.5080772986778848D; + // + // 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.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.4919227013221153D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.40476190476190466D; + // + // xrTableCell4 + // + this.xrTableCell4.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.Weight = 3D; + // + // GroupHeader1 + // + this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader1.HeightF = 0F; + this.GroupHeader1.Name = "GroupHeader1"; // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4}); - this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; // // xrTable4 @@ -681,31 +829,13 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow6, this.xrTableRow8, this.xrTableRow25, this.xrTableRow26, this.xrTableRow27, this.xrTableRow28, this.xrTableRow29}); - this.xrTable4.SizeF = new System.Drawing.SizeF(600F, 132F); - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell34}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.085D; - // - // xrTableCell34 - // - this.xrTableCell34.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell34.StylePriority.UseBorderColor = false; - this.xrTableCell34.StylePriority.UseBorders = false; - this.xrTableCell34.Weight = 1D; + this.xrTable4.SizeF = new System.Drawing.SizeF(600F, 115F); // // xrTableRow8 // @@ -718,8 +848,7 @@ namespace BeWo.GenderBeWoReports.Neu // xrTableCell35 // this.xrTableCell35.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell35.Font = new System.Drawing.Font("Verdana", 10F); this.xrTableCell35.Name = "xrTableCell35"; @@ -728,13 +857,12 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell35.StylePriority.UseBorders = false; this.xrTableCell35.StylePriority.UseFont = false; this.xrTableCell35.Text = "Summe der bereits gezahlten Leistungsvergütungen"; - this.xrTableCell35.Weight = 0.74999997652494D; + this.xrTableCell35.Weight = 0.83602572318835144D; // // xrTableCell36 // this.xrTableCell36.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")}); @@ -746,7 +874,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell36.StylePriority.UseFont = false; this.xrTableCell36.StylePriority.UseTextAlignment = false; this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell36.Weight = 0.25000002347506012D; + this.xrTableCell36.Weight = 0.16397427681164867D; // // xrTableRow25 // @@ -785,7 +913,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell38.StylePriority.UseBorders = false; this.xrTableCell38.StylePriority.UseFont = false; this.xrTableCell38.Text = "Summe der Vergütung für abrechenbare Leistungen"; - this.xrTableCell38.Weight = 0.74999997652494D; + this.xrTableCell38.Weight = 0.83602572318835144D; // // xrTableCell39 // @@ -802,7 +930,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell39.StylePriority.UseFont = false; this.xrTableCell39.StylePriority.UseTextAlignment = false; this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell39.Weight = 0.25000002347506012D; + this.xrTableCell39.Weight = 0.16397427681164867D; // // xrTableRow27 // @@ -824,7 +952,7 @@ namespace BeWo.GenderBeWoReports.Neu this.lblInklPauschFaktorText.StylePriority.UseBorders = false; this.lblInklPauschFaktorText.StylePriority.UseFont = false; this.lblInklPauschFaktorText.StylePriority.UsePadding = false; - this.lblInklPauschFaktorText.Weight = 0.74999997652494D; + this.lblInklPauschFaktorText.Weight = 0.83602572318835144D; // // lblInklPauschBetrag // @@ -839,7 +967,7 @@ namespace BeWo.GenderBeWoReports.Neu this.lblInklPauschBetrag.StylePriority.UsePadding = false; this.lblInklPauschBetrag.StylePriority.UseTextAlignment = false; this.lblInklPauschBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.lblInklPauschBetrag.Weight = 0.25000002347506012D; + this.lblInklPauschBetrag.Weight = 0.16397427681164867D; // // xrTableRow28 // @@ -879,7 +1007,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; this.xrTableCell43.Text = "Restforderung:"; - this.xrTableCell43.Weight = 0.74999997652494D; + this.xrTableCell43.Weight = 0.83602572318835144D; // // xrTableCell44 // @@ -897,7 +1025,7 @@ namespace BeWo.GenderBeWoReports.Neu this.xrTableCell44.StylePriority.UseFont = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell44.Weight = 0.25000002347506012D; + this.xrTableCell44.Weight = 0.16397427681164867D; // // bindingSource1 // @@ -926,6 +1054,7 @@ namespace BeWo.GenderBeWoReports.Neu ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -967,17 +1096,6 @@ namespace BeWo.GenderBeWoReports.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - 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; @@ -990,8 +1108,6 @@ namespace BeWo.GenderBeWoReports.Neu private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; @@ -1008,5 +1124,28 @@ namespace BeWo.GenderBeWoReports.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow29; private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; + private DevExpress.XtraReports.UI.XRTable xrTable6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + 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/WohnstaettenEssen/SettlementReport2.cs b/ReportImp/WohnstaettenEssen/SettlementReport2.cs index c0e2d26ba..35659b404 100644 --- a/ReportImp/WohnstaettenEssen/SettlementReport2.cs +++ b/ReportImp/WohnstaettenEssen/SettlementReport2.cs @@ -34,7 +34,10 @@ namespace WohnstaettenEssen if (pRO.FehlkontakteString != null && ii.RateFactor == 0) { Zwischensumme.Visible = true; - ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + if (ii.ItemDescription != null) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } ii.ItemDescription = "Fehlkontakte"; } }