From 7f147a6aa52bcfca35e03ca703bd2e43d34f2172 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 28 Apr 2023 15:27:42 +0200 Subject: [PATCH] SynpraxReports/SettlementReport Fehlkontakte --- .../SettlementReport.Designer.cs | 181 ++++++++++++++---- ReportImp/SynpraxReports/SettlementReport.cs | 11 +- .../SettlementReportOld.Designer.cs | 2 +- .../SynpraxReports/SettlementReportOld.cs | 4 +- 4 files changed, 159 insertions(+), 39 deletions(-) diff --git a/ReportImp/SynpraxReports/SettlementReport.Designer.cs b/ReportImp/SynpraxReports/SettlementReport.Designer.cs index 02e5301e6..704a379d4 100644 --- a/ReportImp/SynpraxReports/SettlementReport.Designer.cs +++ b/ReportImp/SynpraxReports/SettlementReport.Designer.cs @@ -1,4 +1,4 @@ -namespace AbwMuenster +namespace SynpraxReports { partial class Spitzabrechnung { @@ -30,6 +30,7 @@ { 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.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPanel1 = new DevExpress.XtraReports.UI.XRPanel(); @@ -72,7 +73,6 @@ this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = 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.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel(); @@ -89,6 +89,8 @@ this.xrLabel69 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel86 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel43 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPanel2 = new DevExpress.XtraReports.UI.XRPanel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); @@ -110,8 +112,16 @@ this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel43 = 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.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -698,16 +708,14 @@ this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Ort, Datum"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, this.ReportFooter1, - this.ReportHeader}); + this.ReportHeader, + this.GroupHeader2, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -903,6 +911,36 @@ this.ReportHeader.HeightF = 436.4534F; this.ReportHeader.Name = "ReportHeader"; // + // xrLabel43 + // + this.xrLabel43.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); + this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel43.Multiline = true; + this.xrLabel43.Name = "xrLabel43"; + this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel43.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel43.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F); + this.xrLabel43.StylePriority.UseFont = false; + this.xrLabel43.StylePriority.UseTextAlignment = false; + this.xrLabel43.Text = "DIESE SEITE ENTHÄLT NUR DIE ABRECHNUNGSDATEN FÜR INTERNE ZWECKE\r\nNICHT AN DEN LWL" + + " SENDEN!!!"; + this.xrLabel43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrLabel39 + // + this.xrLabel39.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); + this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.4167F); + this.xrLabel39.Multiline = true; + this.xrLabel39.Name = "xrLabel39"; + this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel39.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel39.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F); + this.xrLabel39.StylePriority.UseFont = false; + this.xrLabel39.StylePriority.UseTextAlignment = false; + this.xrLabel39.Text = "Budgetnachweis an den LWL -\r\nüber die Abrechnung von Fachleistungsstunden im Rahm" + + "en der Eingliederungshilfe"; + this.xrLabel39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // // xrPanel2 // this.xrPanel2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -1239,35 +1277,99 @@ this.xrLabel38.Text = "Leistungsberechtigte/r:"; this.xrLabel38.WordWrap = false; // - // xrLabel39 + // GroupHeader2 // - this.xrLabel39.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); - this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110.4167F); - this.xrLabel39.Multiline = true; - this.xrLabel39.Name = "xrLabel39"; - this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel39.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel39.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F); - this.xrLabel39.StylePriority.UseFont = false; - this.xrLabel39.StylePriority.UseTextAlignment = false; - this.xrLabel39.Text = "Budgetnachweis an den LWL -\r\nüber die Abrechnung von Fachleistungsstunden im Rahm" + - "en der Eingliederungshilfe"; - this.xrLabel39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + 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"; // - // xrLabel43 + // Zwischensumme // - this.xrLabel43.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold); - this.xrLabel43.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel43.Multiline = true; - this.xrLabel43.Name = "xrLabel43"; - this.xrLabel43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel43.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel43.SizeF = new System.Drawing.SizeF(673.319F, 40.00003F); - this.xrLabel43.StylePriority.UseFont = false; - this.xrLabel43.StylePriority.UseTextAlignment = false; - this.xrLabel43.Text = "DIESE SEITE ENTHÄLT NUR DIE ABRECHNUNGSDATEN FÜR INTERNE ZWECKE\r\nNICHT AN DEN LWL" + - " SENDEN!!!"; - this.xrLabel43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.StylePriority.UseFont = false; + this.Zwischensumme.Visible = false; + // + // xrTable6 + // + this.xrTable6.Font = new System.Drawing.Font("Verdana", 10F); + 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.xrTableRow10}); + this.xrTable6.SizeF = new System.Drawing.SizeF(682.0001F, 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.None; + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11.25F, 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 [UnitDescription]:"; + this.xrTableCell9.Weight = 2.4853370513029556D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.None; + 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("Calibri", 11.25F); + 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.51466294869704443D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.40476190476190466D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.UsePadding = false; + this.xrTableCell7.Weight = 3D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // // Spitzabrechnung // @@ -1286,6 +1388,7 @@ this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1375,5 +1478,13 @@ private DevExpress.XtraReports.UI.XRLabel xrLabel37; private DevExpress.XtraReports.UI.XRLabel xrLabel38; private DevExpress.XtraReports.UI.XRLabel xrLabel43; + 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 xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; } } diff --git a/ReportImp/SynpraxReports/SettlementReport.cs b/ReportImp/SynpraxReports/SettlementReport.cs index 1feef8092..587393550 100644 --- a/ReportImp/SynpraxReports/SettlementReport.cs +++ b/ReportImp/SynpraxReports/SettlementReport.cs @@ -10,7 +10,7 @@ using BS.Shared.DataContracts; using DevExpress.XtraReports.UI; using BS.Shared; -namespace AbwMuenster +namespace SynpraxReports { public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { @@ -97,6 +97,15 @@ namespace AbwMuenster { foreach (var ii in pRO.InvoiceItems) { + if (ii.RateFactor == 0) + { + ii.UnitDescription = "Fehlkontakte"; + Zwischensumme.Visible = true; + } + else + { + ii.UnitDescription = "FLS"; + } ii.ItemDescription = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy} {2:0.00} Std. x {3:c} =", ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit); diff --git a/ReportImp/SynpraxReports/SettlementReportOld.Designer.cs b/ReportImp/SynpraxReports/SettlementReportOld.Designer.cs index 4fcda7954..516baf979 100644 --- a/ReportImp/SynpraxReports/SettlementReportOld.Designer.cs +++ b/ReportImp/SynpraxReports/SettlementReportOld.Designer.cs @@ -1,7 +1,7 @@ using BeWo.Report.ReportObjects; namespace SynpraxReports { - partial class Spitzabrechnung + partial class SpitzabrechnungOld { /// /// Required designer variable. diff --git a/ReportImp/SynpraxReports/SettlementReportOld.cs b/ReportImp/SynpraxReports/SettlementReportOld.cs index 389dbbc74..033a1529f 100644 --- a/ReportImp/SynpraxReports/SettlementReportOld.cs +++ b/ReportImp/SynpraxReports/SettlementReportOld.cs @@ -14,9 +14,9 @@ using BeWo.Report; namespace SynpraxReports { // Stand bis 03.04.2023: vor Fehlkontakten - public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport + public partial class SpitzabrechnungOld : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport { - public Spitzabrechnung() + public SpitzabrechnungOld() { InitializeComponent(); }