From 86fd27bd28ab85136b9cd07408328bb7fd31bcac Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 26 Apr 2023 17:01:37 +0200 Subject: [PATCH] PaSMoenchengladbach und SPZLeverkusen SettlementReport2 Fehlkontakte --- .../SettlementReport2.Designer.cs | 354 ++++++++++++++---- .../PaSMoenchengladbach/SettlementReport2.cs | 34 ++ .../SettlementReport2.Designer.cs | 213 ++++++++--- ReportImp/SPZLeverkusen/SettlementReport2.cs | 28 +- 4 files changed, 480 insertions(+), 149 deletions(-) diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs index da5093a6c..a6f92fb9e 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs +++ b/ReportImp/PaSMoenchengladbach/SettlementReport2.Designer.cs @@ -30,13 +30,11 @@ namespace PaSMoenchengladbach private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + 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(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -70,8 +68,6 @@ namespace PaSMoenchengladbach this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -88,11 +84,31 @@ namespace PaSMoenchengladbach this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + 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.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -134,37 +150,6 @@ namespace PaSMoenchengladbach this.xrLabel8.Text = "xrLabel8"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // xrTable1 - // - this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(7.947286E-05F, 287.8333F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(589.5831F, 16.99997F); - this.xrTable1.StylePriority.UseBorderColor = false; - // - // rowErbrachteLeistung - // - this.rowErbrachteLeistung.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell22}); - this.rowErbrachteLeistung.Name = "rowErbrachteLeistung"; - this.rowErbrachteLeistung.Weight = 0.085D; - // - // xrTableCell22 - // - this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell22.StylePriority.UseBorderColor = false; - this.xrTableCell22.StylePriority.UseBorders = false; - this.xrTableCell22.StylePriority.UseFont = false; - this.xrTableCell22.Text = "Erbrachte Leistungen:"; - this.xrTableCell22.Weight = 1D; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -368,6 +353,7 @@ namespace PaSMoenchengladbach // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1, this.xrLabel7, this.xrLabel1, this.xrLabel_RecipientContactPerson, @@ -376,10 +362,9 @@ namespace PaSMoenchengladbach this.RecipientPostCodeAndTown, this.xrLabel3, this.xrLabel4, - this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 304.8333F; + this.GroupHeader1.HeightF = 358.6667F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -407,7 +392,9 @@ namespace PaSMoenchengladbach // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.GroupHeader2, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -452,7 +439,7 @@ namespace PaSMoenchengladbach this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.67198706993689916D; + this.xrTableCell52.Weight = 0.74615345903604458D; // // xrTableCell53 // @@ -469,7 +456,7 @@ namespace PaSMoenchengladbach this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "xrTableCell10"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.23506403996394229D; + this.xrTableCell53.Weight = 0.16089765086479685D; // // bindingSource1 // @@ -480,7 +467,7 @@ namespace PaSMoenchengladbach this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -490,34 +477,15 @@ namespace PaSMoenchengladbach this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow30, this.xrTableRow31, this.xrTableRow32, this.xrTableRow34, this.xrTableRow35, this.xrTableRow36, this.xrTableRow37}); - this.xrTable5.SizeF = new System.Drawing.SizeF(589.5833F, 132F); + this.xrTable5.SizeF = new System.Drawing.SizeF(589.5833F, 115F); this.xrTable5.StylePriority.UseBorderColor = false; // - // xrTableRow30 - // - this.xrTableRow30.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell48}); - this.xrTableRow30.Name = "xrTableRow30"; - this.xrTableRow30.Weight = 0.085D; - // - // xrTableCell48 - // - this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell48.StylePriority.UseBorderColor = false; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.Weight = 1D; - // // xrTableRow31 // this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -535,7 +503,7 @@ namespace PaSMoenchengladbach this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.74084831522600725D; + this.xrTableCell49.Weight = 0.822614809186037D; // // xrTableCell50 // @@ -551,7 +519,7 @@ namespace PaSMoenchengladbach this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "xrTableCell9"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.25915168477399264D; + this.xrTableCell50.Weight = 0.17738519081396292D; // // xrTableRow32 // @@ -586,7 +554,7 @@ namespace PaSMoenchengladbach this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell54.Weight = 0.74084821170346671D; + this.xrTableCell54.Weight = 0.82261470566349648D; // // xrTableCell55 // @@ -603,7 +571,7 @@ namespace PaSMoenchengladbach this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell10"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.25915178829653346D; + this.xrTableCell55.Weight = 0.17738529433650369D; // // xrTableRow35 // @@ -621,7 +589,7 @@ namespace PaSMoenchengladbach this.xrTableCell56.StylePriority.UseBorders = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.Text = "abzüglich Eigenanteil:"; - this.xrTableCell56.Weight = 0.74084821170346671D; + this.xrTableCell56.Weight = 0.82261470566349648D; // // xrTableCell57 // @@ -636,7 +604,7 @@ namespace PaSMoenchengladbach this.xrTableCell57.StylePriority.UseTextAlignment = false; this.xrTableCell57.Text = "xrTableCell15"; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.25915178829653346D; + this.xrTableCell57.Weight = 0.17738529433650369D; // // xrTableRow36 // @@ -674,7 +642,7 @@ namespace PaSMoenchengladbach this.xrTableCell59.StylePriority.UseBorders = false; this.xrTableCell59.StylePriority.UseFont = false; this.xrTableCell59.Text = "Restforderung:"; - this.xrTableCell59.Weight = 0.74084821170346671D; + this.xrTableCell59.Weight = 0.82261470566349648D; // // xrTableCell60 // @@ -691,7 +659,224 @@ namespace PaSMoenchengladbach this.xrTableCell60.StylePriority.UseTextAlignment = false; this.xrTableCell60.Text = "xrTableCell17"; this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell60.Weight = 0.25915178829653346D; + this.xrTableCell60.Weight = 0.17738529433650369D; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 290.6667F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow9, + this.xrTableRow10, + this.xrTableRow11, + this.xrTableRow14}); + this.xrTable1.SizeF = new System.Drawing.SizeF(589.5833F, 68F); + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell19, + this.xrTableCell6}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.085D; + // + // xrTableCell19 + // + this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell19.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorderColor = false; + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UseFont = false; + this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt"; + this.xrTableCell19.Weight = 0.8360256214630909D; + // + // xrTableCell6 + // + this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell6.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorderColor = false; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "[ApprovedFLS]"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell6.Weight = 0.16397437853690908D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell20, + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.085D; + // + // xrTableCell20 + // + this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell20.StylePriority.UseBorderColor = false; + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UseFont = false; + this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]"; + this.xrTableCell20.Weight = 0.83602572318835144D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "[ApprovedFLSWithFactor]"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell7.Weight = 0.16397427681164867D; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell21}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 0.085D; + // + // xrTableCell21 + // + this.xrTableCell21.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell21.StylePriority.UseBorderColor = false; + this.xrTableCell21.StylePriority.UseBorders = false; + this.xrTableCell21.Weight = 1D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell22}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.085D; + // + // xrTableCell22 + // + this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell22.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell22.StylePriority.UseBorderColor = false; + this.xrTableCell22.StylePriority.UseBorders = false; + this.xrTableCell22.StylePriority.UseFont = false; + this.xrTableCell22.Text = "Erbrachte Leistungen"; + this.xrTableCell22.Weight = 1D; + // + // GroupHeader2 + // + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; + // + // 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(0.0001589457F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow1}); + this.xrTable6.SizeF = new System.Drawing.SizeF(589.5833F, 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.4678440396185235D; + // + // 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.53215596038147639D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.40476190476190466D; + // + // xrTableCell1 + // + this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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 = 3D; // // Spitzabrechnung // @@ -715,11 +900,12 @@ namespace PaSMoenchengladbach this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -738,9 +924,6 @@ namespace PaSMoenchengladbach private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; @@ -761,8 +944,6 @@ namespace PaSMoenchengladbach private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow30; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableRow xrTableRow31; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; @@ -784,5 +965,24 @@ namespace PaSMoenchengladbach private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + 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 xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; } } diff --git a/ReportImp/PaSMoenchengladbach/SettlementReport2.cs b/ReportImp/PaSMoenchengladbach/SettlementReport2.cs index 662756a7e..d3cadec61 100644 --- a/ReportImp/PaSMoenchengladbach/SettlementReport2.cs +++ b/ReportImp/PaSMoenchengladbach/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 PaSMoenchengladbach { @@ -21,6 +22,26 @@ namespace PaSMoenchengladbach { lblNotice.Visible = false; } + + bool hasRatefactor = false; + if (!String.IsNullOrWhiteSpace(pRO.RateFactorText2)) + { + hasRatefactor = true; + if (pRO.RateFactorText2 == "1,2") + { + pRO.RateFactorText2 = "1,20"; + } + + decimal rf = 0; + + //if (Decimal.TryParse(pRO.RateFactorText2, out rf) && rf > 0) + //{ + // lblInklPauschFaktorText.Text = "Inkl. pauschaler Faktor"; + // lblInklPauschBetrag.Text = + // String.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountBillableTotal / rf)); + //} + } + decimal rateFactor = 1; @@ -30,6 +51,19 @@ namespace PaSMoenchengladbach { rateFactor = (100 + ii.RateFactor.Value) / 100; } + if (ii.ItemDescription != null && ii.ItemDescription.Length > 0) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "FLS"); + } + if (pRO.FehlkontakteString != null && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (ii.ItemDescription != null && ii.ItemDescription.Length > 0) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; + } } pRO.RateFactor = (double)rateFactor; diff --git a/ReportImp/SPZLeverkusen/SettlementReport2.Designer.cs b/ReportImp/SPZLeverkusen/SettlementReport2.Designer.cs index 9da78e3ad..e3141270b 100644 --- a/ReportImp/SPZLeverkusen/SettlementReport2.Designer.cs +++ b/ReportImp/SPZLeverkusen/SettlementReport2.Designer.cs @@ -30,6 +30,7 @@ namespace SPZLeverkusen { 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(); @@ -67,8 +68,8 @@ namespace SPZLeverkusen this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblGpnr = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -77,8 +78,6 @@ namespace SPZLeverkusen this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -95,12 +94,21 @@ namespace SPZLeverkusen this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblGpnr = new DevExpress.XtraReports.UI.XRLabel(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + 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.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -162,7 +170,7 @@ namespace SPZLeverkusen 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.83602595402644242D; // // xrTableCell6 // @@ -178,7 +186,7 @@ namespace SPZLeverkusen 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.16397404597355769D; // // xrTableRow10 // @@ -200,7 +208,7 @@ namespace SPZLeverkusen 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.83602595402644242D; // // ruleRateFactorNull // @@ -222,7 +230,7 @@ namespace SPZLeverkusen 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.16397404597355769D; // // xrTableRow11 // @@ -486,10 +494,24 @@ namespace SPZLeverkusen this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // lblGpnr + // + this.lblGpnr.BackColor = System.Drawing.Color.Transparent; + this.lblGpnr.CanShrink = true; + this.lblGpnr.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.lblGpnr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195.4583F); + this.lblGpnr.Name = "lblGpnr"; + this.lblGpnr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGpnr.SizeF = new System.Drawing.SizeF(650F, 17F); + this.lblGpnr.StylePriority.UseBackColor = false; + this.lblGpnr.StylePriority.UseFont = false; + this.lblGpnr.Text = "GPNr. 2000086909-01"; + this.lblGpnr.WordWrap = false; + // // xrLabel7 // this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "{0:dd.MM.yyyy}")}); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(350F, 137.62F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -498,14 +520,12 @@ namespace SPZLeverkusen this.xrLabel7.Text = "xrLabel8"; this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); + this.Detail1, + this.GroupHeader2, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -518,6 +538,8 @@ namespace SPZLeverkusen this.Detail1.Font = new System.Drawing.Font("Verdana", 10F); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // // xrTable5 @@ -544,14 +566,14 @@ namespace SPZLeverkusen this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell17.CanShrink = true; this.xrTableCell17.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.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.Weight = 0.78314100999098546D; + this.xrTableCell17.Weight = 0.8360259540264422D; // // xrTableCell23 // @@ -570,14 +592,14 @@ namespace SPZLeverkusen this.xrTableCell23.StylePriority.UseTextAlignment = false; this.xrTableCell23.Text = "xrTableCell23"; this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell23.Weight = 0.21685899000901443D; + this.xrTableCell23.Weight = 0.16397404597355769D; // // 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.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -587,34 +609,15 @@ namespace SPZLeverkusen this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow30, this.xrTableRow31, this.xrTableRow32, this.xrTableRow33, this.xrTableRow34, this.xrTableRow35, this.xrTableRow36}); - this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 115F); this.xrTable4.StylePriority.UseBorderColor = false; // - // xrTableRow30 - // - this.xrTableRow30.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell48}); - this.xrTableRow30.Name = "xrTableRow30"; - this.xrTableRow30.Weight = 0.085D; - // - // xrTableCell48 - // - this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell48.StylePriority.UseBorderColor = false; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.Weight = 1D; - // // xrTableRow31 // this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -632,7 +635,7 @@ namespace SPZLeverkusen this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.8360259540264422D; // // xrTableCell50 // @@ -647,7 +650,7 @@ namespace SPZLeverkusen this.xrTableCell50.StylePriority.UsePadding = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.16397404597355769D; // // xrTableRow32 // @@ -682,7 +685,7 @@ namespace SPZLeverkusen this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.83602595402644242D; // // xrTableCell53 // @@ -698,7 +701,7 @@ namespace SPZLeverkusen this.xrTableCell53.StylePriority.UseFont = false; this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.16397404597355769D; // // xrTableRow34 // @@ -716,7 +719,7 @@ namespace SPZLeverkusen this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UsePadding = false; this.xrTableCell54.Text = "abzüglich Eigenanteil:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.83602595402644242D; // // xrTableCell55 // @@ -731,7 +734,7 @@ namespace SPZLeverkusen this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell15"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.16397404597355769D; // // xrTableRow35 // @@ -769,7 +772,7 @@ namespace SPZLeverkusen this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.Text = "Restforderung:"; - this.xrTableCell57.Weight = 0.78314100999098568D; + this.xrTableCell57.Weight = 0.83602595402644242D; // // xrTableCell58 // @@ -786,21 +789,100 @@ namespace SPZLeverkusen this.xrTableCell58.StylePriority.UseFont = false; this.xrTableCell58.StylePriority.UseTextAlignment = false; this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell58.Weight = 0.21685899000901443D; + this.xrTableCell58.Weight = 0.16397404597355769D; // - // lblGpnr + // GroupHeader2 // - this.lblGpnr.BackColor = System.Drawing.Color.Transparent; - this.lblGpnr.CanShrink = true; - this.lblGpnr.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.lblGpnr.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195.4583F); - this.lblGpnr.Name = "lblGpnr"; - this.lblGpnr.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblGpnr.SizeF = new System.Drawing.SizeF(650F, 17F); - this.lblGpnr.StylePriority.UseBackColor = false; - this.lblGpnr.StylePriority.UseFont = false; - this.lblGpnr.Text = "GPNr. 2000086909-01"; - this.lblGpnr.WordWrap = false; + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; + // + // 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(3.178914E-05F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow1}); + this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 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; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.40476190476190466D; + // + // xrTableCell1 + // + this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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 = 3D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // // Spitzabrechnung // @@ -824,9 +906,10 @@ namespace SPZLeverkusen this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -879,8 +962,6 @@ namespace SPZLeverkusen private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow30; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableRow xrTableRow31; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; @@ -899,5 +980,13 @@ namespace SPZLeverkusen private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel lblGpnr; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + 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 xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; } } diff --git a/ReportImp/SPZLeverkusen/SettlementReport2.cs b/ReportImp/SPZLeverkusen/SettlementReport2.cs index 4f107691b..5addb5587 100644 --- a/ReportImp/SPZLeverkusen/SettlementReport2.cs +++ b/ReportImp/SPZLeverkusen/SettlementReport2.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Text.RegularExpressions; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; @@ -28,24 +29,31 @@ namespace SPZLeverkusen } } - if (pRO.InvoiceItems != null) + + decimal rateFactor = 1; + + foreach (var ii in pRO.InvoiceItems) { - foreach (var ii in pRO.InvoiceItems) + if (ii.RateFactor.HasValue) { - 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); + 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; if (!pRO.RecipientOrganisation.Contains("LVR")) lblGpnr.Visible = false; this.bindingSource1.DataSource = pRO; - } - - + } } }