From fb4e52983f7a0cf079d645d079338e6f08c3e412 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 14 Nov 2022 16:40:53 +0100 Subject: [PATCH] KetteReports und ReportCreator DiakonieKKKleve --- .../Reporting/DkkkReportCreator.cs | 22 ++++++++----- .../ServiceInvoiceReport.Designer.cs | 32 +++++++++---------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs index a888c747d..077456aa5 100644 --- a/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs +++ b/ReportImp/DiakonieKKKleve/Reporting/DkkkReportCreator.cs @@ -51,13 +51,20 @@ namespace DiakonieKKKleve.Reporting if (lROs.Count > 0) { - - var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); + XtraReport rootReport; + XtraReport lNext; + if (serviceCategoryOid == null && empOid == 0 && orgaOid == 0) + rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid, true); + else + rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); rootReport.CreateDocument(); for (int i = 1; i < lROs.Count; i++) { - var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); + if (serviceCategoryOid == null && empOid == 0 && orgaOid == 0) + lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid, true); + else + lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); lNext.CreateDocument(); rootReport.Pages.AddRange(lNext.Pages); } @@ -80,11 +87,11 @@ namespace DiakonieKKKleve.Reporting } - private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) + private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid, bool noSozio = false) { XtraReport report = null; - if (ro.CustomerLastName.StartsWith("Aengen")) + if (ro.CustomerLastName.StartsWith("Berger")) { int test = 0; } @@ -95,8 +102,6 @@ namespace DiakonieKKKleve.Reporting // return report as XtraReport; // } - - ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro); ServicesOverviewRO soziRo = ServicesOverviewRO.CopyFromRO(ro); @@ -125,7 +130,8 @@ namespace DiakonieKKKleve.Reporting } - report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisSoziotherapie(), soziRo); + if (noSozio == false) + report = AddSubServicesOverviewReportToReport(report, new LeistungsnachweisSoziotherapie(), soziRo); report = AddSubServicesOverviewReportToReport(report, new Stundenzettel(), bewoRo); //report = AddSubServicesOverviewReportToReport(report, new QuittierungsbelegDienstleistung(), dienstRo); diff --git a/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs b/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs index 6459f96b0..7915e7dc5 100644 --- a/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/KetteReports/ServiceInvoiceReport.Designer.cs @@ -39,6 +39,7 @@ namespace KetteReports this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblAdresszeileJA = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbsenderJA = new DevExpress.XtraReports.UI.XRRichText(); this.lblKundennr = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresszeile = new DevExpress.XtraReports.UI.XRLabel(); @@ -83,7 +84,6 @@ namespace KetteReports this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.lblAdresszeileJA = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsenderJA)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblAbsender)).BeginInit(); @@ -173,6 +173,21 @@ namespace KetteReports this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // + // lblAdresszeileJA + // + this.lblAdresszeileJA.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblAdresszeileJA.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblAdresszeileJA.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblAdresszeileJA.Name = "lblAdresszeileJA"; + this.lblAdresszeileJA.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresszeileJA.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F); + this.lblAdresszeileJA.StylePriority.UseBorders = false; + this.lblAdresszeileJA.StylePriority.UseFont = false; + this.lblAdresszeileJA.StylePriority.UseTextAlignment = false; + this.lblAdresszeileJA.Text = "Die Kette e. V. · Hauptstr. 164 B · 51465 Bergisch Gladbach"; + this.lblAdresszeileJA.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblAdresszeileJA.Visible = false; + // // lblAbsenderJA // this.lblAbsenderJA.Font = new System.Drawing.Font("Arial", 8F); @@ -725,21 +740,6 @@ namespace KetteReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // lblAdresszeileJA - // - this.lblAdresszeileJA.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblAdresszeileJA.Font = new System.Drawing.Font("Arial", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAdresszeileJA.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.lblAdresszeileJA.Name = "lblAdresszeileJA"; - this.lblAdresszeileJA.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAdresszeileJA.SizeF = new System.Drawing.SizeF(329.5F, 17.00003F); - this.lblAdresszeileJA.StylePriority.UseBorders = false; - this.lblAdresszeileJA.StylePriority.UseFont = false; - this.lblAdresszeileJA.StylePriority.UseTextAlignment = false; - this.lblAdresszeileJA.Text = "Die Kette e. V. · Hauptstr. 164 B · 51465 Bergisch Gladbach"; - this.lblAdresszeileJA.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.lblAdresszeileJA.Visible = false; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {