From 5ee74740194281d56a4546448bbed697ff5f37c2 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 1 Feb 2024 10:33:54 +0100 Subject: [PATCH] MobileEV/Invoicing/Selbstzahler neu --- .../Invoicing/CustomInvoiceFactory.cs | 20 +- .../Invoicing/SelbstzahlerInvoiceCreation.cs | 65 ++ ReportImp/MobileEV/MobileEV.csproj | 1 + .../MobileEV/ServiceInvoiceReport.Designer.cs | 610 +++++++++--------- ReportImp/MobileEV/ServiceInvoiceReport.cs | 25 + 5 files changed, 412 insertions(+), 309 deletions(-) create mode 100644 ReportImp/MobileEV/Invoicing/SelbstzahlerInvoiceCreation.cs diff --git a/ReportImp/MobileEV/Invoicing/CustomInvoiceFactory.cs b/ReportImp/MobileEV/Invoicing/CustomInvoiceFactory.cs index 77499e672..9180a4e88 100644 --- a/ReportImp/MobileEV/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/MobileEV/Invoicing/CustomInvoiceFactory.cs @@ -16,12 +16,24 @@ namespace MobileEV.Invoicing foreach (var sc2sr in supportConcepts2ServiceRecords) { if (sc2sr.Key.CostBearer.Contains("Stadt Dortmund") || sc2sr.Key.CostBearer.Contains("Stadt Bergkamen")) + { return new CustomInvoiceCreation(); + } } - - return new InvoiceCreation(); + foreach (var list in supportConcepts2ServiceRecords.Values) + { + foreach (var sr in list) + { + if (sr.CostBearer != null) + { + if (sr.CostBearer.Name.Contains("Selbstzahler")) + { + return new SelbstzahlerInvoiceCreation(); + } + } + } + } + return new InvoiceCreation(); } - - } } diff --git a/ReportImp/MobileEV/Invoicing/SelbstzahlerInvoiceCreation.cs b/ReportImp/MobileEV/Invoicing/SelbstzahlerInvoiceCreation.cs new file mode 100644 index 000000000..ac4e5a3d5 --- /dev/null +++ b/ReportImp/MobileEV/Invoicing/SelbstzahlerInvoiceCreation.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.Core; +using BS.Shared.DataContracts.Compact; + + +namespace MobileEV.Invoicing +{ + public class SelbstzahlerInvoiceCreation : InvoiceCreation + { + private DateTime? accountingPeriodStart = null; + private DateTime? accountingPeriodEnd = null; + + public override void SetInvoiceBaseData(int invoiceCounter, ServiceInvoice invoice, CostBearer costBearer, DateTimeSpan invoicePeriod, + IList supportConceptList) + { + if (invoicePeriod != null) + { + accountingPeriodStart = invoicePeriod.StartDate; + accountingPeriodEnd = invoicePeriod.EndDate; + } + base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); + } + + public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer) + { + serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2; + serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid; + serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name; + serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList(); + serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid; + + if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null) + { + var cust = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.SupportConcept.Customer; + + if (cust.Person.InvoiceAddress != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.InvoiceAddress.CopyToNew(); + } + else if (cust.Person.Address != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = cust.Person.Address.CopyToNew(); + } + + serviceInvoice.InvoiceBase.RecipientPersonFirstName = cust.Person.FirstName; + serviceInvoice.InvoiceBase.RecipientPersonLastName = cust.Person.LastName; + + return; + } + if (costBearer.Organisation.InvoiceAddress != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew(); + } + else if (costBearer.Organisation.Address != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew(); + } + } + } +} + diff --git a/ReportImp/MobileEV/MobileEV.csproj b/ReportImp/MobileEV/MobileEV.csproj index f174e6c30..a204daece 100644 --- a/ReportImp/MobileEV/MobileEV.csproj +++ b/ReportImp/MobileEV/MobileEV.csproj @@ -52,6 +52,7 @@ + Component diff --git a/ReportImp/MobileEV/ServiceInvoiceReport.Designer.cs b/ReportImp/MobileEV/ServiceInvoiceReport.Designer.cs index 254086ef3..cc81b6dc1 100644 --- a/ReportImp/MobileEV/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/MobileEV/ServiceInvoiceReport.Designer.cs @@ -32,11 +32,39 @@ namespace MobileEV System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServiceInvoiceReport)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); @@ -75,40 +103,12 @@ namespace MobileEV this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).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.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -128,6 +128,14 @@ namespace MobileEV this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(345.6462F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(311.3539F, 126.875F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -146,12 +154,20 @@ namespace MobileEV this.bottomMarginBand1.HeightF = 95F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Arial", 11F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(90.56228F, 9.999974F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(494.7921F, 58.58332F); + // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable2, this.xrLabel6, - this.xrLabel7, + this.lblAdresse, this.xrLabel4, this.xrLabel3, this.xrLabel2, @@ -163,15 +179,261 @@ namespace MobileEV this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // - // xrLabel7 + // xrTable2 // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.50001F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + + this.xrTable2.Font = new System.Drawing.Font("Calibri", 10.5F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(374.0001F, 23.00002F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow11, + this.xrTableRow9, + this.xrTableRow2, + this.xrTableRow5, + this.xrTableRow4, + this.xrTableRow3, + this.xrTableRow1, + this.xrTableRow6, + this.xrTableRow8, + this.xrTableRow7, + this.xrTableRow13}); + this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 224F); + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.13245033112582783D; + // + // xrTableCell1 + // + this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, 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.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Geschäftsstelle"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell1.Weight = 1D; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell14}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 0.13245033112582783D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "Tel.: 0231 /58 06 34 79"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell14.Weight = 1D; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.13245033112582783D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell7.Weight = 1D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.13245033112582783D; + // + // xrTableCell4 + // + this.xrTableCell4.CanShrink = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Ansprechpartner/-in:"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell4.Weight = 1D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.13245033112582783D; + // + // xrTableCell13 + // + this.xrTableCell13.CanShrink = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "[SenderContactPerson]"; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell13.Weight = 1D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell11}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.13245033112582783D; + // + // xrTableCell11 + // + this.xrTableCell11.CanShrink = true; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "[SenderContactPersonDivision]"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell11.Weight = 1D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.0794701986754967D; + // + // xrTableCell3 + // + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell3.Weight = 1D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.13245033112582783D; + // + // xrTableCell2 + // + this.xrTableCell2.CanShrink = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "[SenderContactPersonPhone]"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell2.Weight = 1D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 0.13245033112582783D; + // + // xrTableCell5 + // + this.xrTableCell5.CanShrink = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "[SenderContactPersonFax]"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell5.Weight = 1D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.079470198675496678D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell6.Weight = 1D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.13245033112582783D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")}); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell8.Weight = 1D; + // + // xrTableRow13 + // + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 0.13245033112582783D; + // + // xrTableCell10 + // + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Web: www.mobile-dortmund.de"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell10.Weight = 1D; + // + // xrLabel6 + // + this.xrLabel6.CanShrink = true; + this.xrLabel6.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.00002F); + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; + this.xrLabel6.SizeF = new System.Drawing.SizeF(292F, 17F); + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.Text = "MOBILE e.V., Märkische Straße 239a, 44141 Dortmund"; + // + // lblAdresse + // + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.50001F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(317F, 111.5F); + this.lblAdresse.StylePriority.UseFont = false; + this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + "tStreet]\r\n[RecipientPostCodeAndTown]"; // // xrLabel4 @@ -698,272 +960,10 @@ namespace MobileEV this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(345.6462F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(311.3539F, 126.875F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel6 - // - this.xrLabel6.CanShrink = true; - this.xrLabel6.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.00002F); - this.xrLabel6.Name = "xrLabel6"; - this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrLabel6.SizeF = new System.Drawing.SizeF(292F, 17F); - this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "MOBILE e.V., Märkische Straße 239a, 44141 Dortmund"; - // - // xrTable2 - // - this.xrTable2.Font = new System.Drawing.Font("Calibri", 10.5F); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(374.0001F, 23.00002F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow12, - this.xrTableRow11, - this.xrTableRow9, - this.xrTableRow2, - this.xrTableRow5, - this.xrTableRow4, - this.xrTableRow3, - this.xrTableRow1, - this.xrTableRow6, - this.xrTableRow8, - this.xrTableRow7, - this.xrTableRow13}); - this.xrTable2.SizeF = new System.Drawing.SizeF(283F, 224F); - this.xrTable2.StylePriority.UseFont = false; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.13245033112582783D; - // - // xrTableCell1 - // - this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Bold, 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.UseFont = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Geschäftsstelle"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell1.Weight = 1D; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell4}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.13245033112582783D; - // - // xrTableCell4 - // - this.xrTableCell4.CanShrink = true; - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Ansprechpartner/-in:"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell4.Weight = 1D; - // - // xrTableRow5 - // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.13245033112582783D; - // - // xrTableCell13 - // - this.xrTableCell13.CanShrink = true; - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell13.StylePriority.UseFont = false; - this.xrTableCell13.StylePriority.UseTextAlignment = false; - this.xrTableCell13.Text = "[SenderContactPerson]"; - this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell13.Weight = 1D; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell11}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 0.13245033112582783D; - // - // xrTableCell11 - // - this.xrTableCell11.CanShrink = true; - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell11.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "[SenderContactPersonDivision]"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell11.Weight = 1D; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.0794701986754967D; - // - // xrTableCell3 - // - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell3.StylePriority.UsePadding = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell3.Weight = 1D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.13245033112582783D; - // - // xrTableCell2 - // - this.xrTableCell2.CanShrink = true; - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "[SenderContactPersonPhone]"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell2.Weight = 1D; - // - // xrTableRow6 - // - this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5}); - this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 0.13245033112582783D; - // - // xrTableCell5 - // - this.xrTableCell5.CanShrink = true; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell5.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "[SenderContactPersonFax]"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell5.Weight = 1D; - // - // xrTableRow8 - // - this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6}); - this.xrTableRow8.Name = "xrTableRow8"; - this.xrTableRow8.Weight = 0.079470198675496678D; - // - // xrTableCell6 - // - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell6.Weight = 1D; - // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.13245033112582783D; - // - // xrTableCell8 - // - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "SenderContactPersonMail")}); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell8.Weight = 1D; - // - // xrTableRow13 - // - this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10}); - this.xrTableRow13.Name = "xrTableRow13"; - this.xrTableRow13.Weight = 0.13245033112582783D; - // - // xrTableCell10 - // - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "Web: www.mobile-dortmund.de"; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell10.Weight = 1D; - // - // xrRichText1 - // - this.xrRichText1.Font = new System.Drawing.Font("Arial", 11F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(90.56228F, 9.999974F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(494.7921F, 58.58332F); - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrTableRow9 - // - this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7}); - this.xrTableRow9.Name = "xrTableRow9"; - this.xrTableRow9.Weight = 0.13245033112582783D; - // - // xrTableCell7 - // - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell7.Weight = 1D; - // - // xrTableRow11 - // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell14}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 0.13245033112582783D; - // - // xrTableCell14 - // - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "Tel.: 0231 /58 06 34 79"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell14.Weight = 1D; - // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -983,11 +983,11 @@ namespace MobileEV this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).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.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1037,7 +1037,7 @@ namespace MobileEV private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; diff --git a/ReportImp/MobileEV/ServiceInvoiceReport.cs b/ReportImp/MobileEV/ServiceInvoiceReport.cs index f3ce56f5b..c60cfc76e 100644 --- a/ReportImp/MobileEV/ServiceInvoiceReport.cs +++ b/ReportImp/MobileEV/ServiceInvoiceReport.cs @@ -2,6 +2,7 @@ using System; using BeWo.Report.ReportObjects; using BeWo.Report; using DevExpress.XtraReports.UI; +using System.Text; namespace MobileEV { @@ -25,6 +26,30 @@ namespace MobileEV lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); } + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation != "SELBSTZAHLER") + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientOrganisation) && pRO.RecipientOrganisation != "SELBSTZAHLER") + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + this.bindingSource1.DataSource = pRO; } }