From a0845de1b5618029f2cc5c87f31241b20ba6a15b Mon Sep 17 00:00:00 2001 From: Alexandra Date: Wed, 22 Jun 2022 16:11:16 +0200 Subject: [PATCH] AlzeyTeilhabe neuer StundenzettelBi, Wegweiser neue Unterschrift, BeWoWalzPaiva --- ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj | 1 + .../AlzeyTeilhabe/CustomReportCreator.cs | 75 +++++++++++++++++ ReportImp/AlzeyTeilhabe/StundenzettelBi.cs | 3 +- .../InvoiceCustomerReport.Designer.cs | 18 ----- .../ServiceInvoiceReport.Designer.cs | 69 ++++++++-------- .../BeWoWalzPaiva/ServiceInvoiceReport.cs | 3 + .../SettlementReport.Designer.cs | 26 +----- .../SettlementReport2.Designer.cs | 26 +----- .../InvoiceCustomerReport.Designer.cs | 81 ++++++++++--------- .../RechnungKrankenkasse.Designer.cs | 55 ++++++------- .../ServiceInvoiceReport.Designer.cs | 9 ++- .../SettlementReport.Designer.cs | 55 ++++++------- .../SettlementReport2.Designer.cs | 55 ++++++------- 13 files changed, 254 insertions(+), 222 deletions(-) create mode 100644 ReportImp/AlzeyTeilhabe/CustomReportCreator.cs diff --git a/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj b/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj index 9eb528edd..dd55ffea2 100644 --- a/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj +++ b/ReportImp/AlzeyTeilhabe/AlzeyTeilhabe.csproj @@ -69,6 +69,7 @@ StundenzettelWo.cs + diff --git a/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs new file mode 100644 index 000000000..dd4014ec3 --- /dev/null +++ b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Report; +using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using DevExpress.XtraReports.Design; +using DevExpress.XtraReports.UI; + +namespace AlzeyTeilhabe +{ + public class CustomReportCreator : DefaultReportCreator + { + public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + List lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay); + + if (lROs.Count > 0) + { + + var rootReport = CreateServicesOverviewReportForRo(lROs[0], serviceCategoryOid); + rootReport.CreateDocument(); + + for (int i = 1; i < lROs.Count; i++) + { + var lNext = CreateServicesOverviewReportForRo(lROs[i], serviceCategoryOid); + lNext.CreateDocument(); + rootReport.Pages.AddRange(lNext.Pages); + } + + return rootReport; + } + return new XtraReport(); + } + + public override XtraReport CreateServiceOverviewSingleCustomerReport(long customerOid, int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay) + { + var ro = ServicesOverviewRO.Create(customerOid, month, year, false, orgaOid, empOid, startDay, endDay, serviceCategoryOid); + return CreateServicesOverviewReportForRo(ro, serviceCategoryOid); + } + + private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) + { + IBeWoReport report = null; + String kt = ""; + if (!String.IsNullOrWhiteSpace(ro.Costbearer)) + kt = ro.Costbearer.Trim(); + + String function = ""; + if (ro.CostBearer2SupportConceptList != null) + { + foreach (var c2s in ro.CostBearer2SupportConceptList) + { + if (c2s.CostBearer.Organisation.Function != null && !String.IsNullOrWhiteSpace(ro.Costbearer) && c2s.CostBearer.Organisation.Name == ro.Costbearer) + function = c2s.CostBearer.Organisation.Function.Value; + } + } + + if (kt == "Kreisverwaltung Mainz-Bingen") + report = new AlzeyTeilhabe.StundenzettelBi(); + + if (report == null) + report = new AlzeyTeilhabe.StundenzettelWo(); + report.SetReportDataSource(ro); + + return report as XtraReport; + } + } +} diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelBi.cs b/ReportImp/AlzeyTeilhabe/StundenzettelBi.cs index 39d7676c1..14e17f658 100644 --- a/ReportImp/AlzeyTeilhabe/StundenzettelBi.cs +++ b/ReportImp/AlzeyTeilhabe/StundenzettelBi.cs @@ -8,8 +8,9 @@ using System.Collections.Generic; namespace AlzeyTeilhabe { - public partial class StundenzettelBi : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport + public partial class StundenzettelBi : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { + // NUR für Kostenträger Kreisverwaltung Mainz-Bingen public StundenzettelBi() { InitializeComponent(); diff --git a/ReportImp/BeWoWalzPaiva/InvoiceCustomerReport.Designer.cs b/ReportImp/BeWoWalzPaiva/InvoiceCustomerReport.Designer.cs index dfd89a34b..be00ebe1c 100644 --- a/ReportImp/BeWoWalzPaiva/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/BeWoWalzPaiva/InvoiceCustomerReport.Designer.cs @@ -76,7 +76,6 @@ namespace BeWoWalzPaiva this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); @@ -548,7 +547,6 @@ namespace BeWoWalzPaiva // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel13, this.xrLabel7, this.xrLabel9, this.xrLabel11, @@ -593,21 +591,6 @@ namespace BeWoWalzPaiva this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.Text = "Bewo Walz&Paiva\r\nMorlaixplatz 13\r\n52146 Würselen\r\nTel.: 02405/4067133"; // - // xrLabel13 - // - this.xrLabel13.BackColor = System.Drawing.Color.Transparent; - this.xrLabel13.CanShrink = true; - this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel13.StylePriority.UseBackColor = false; - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "IK-Nummer: 490 5040 21"; - this.xrLabel13.WordWrap = false; - // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -684,6 +667,5 @@ namespace BeWoWalzPaiva private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRRichText rtAnschrift1; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; } } diff --git a/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.Designer.cs b/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.Designer.cs index 7fedbe58b..99b6cf4e4 100644 --- a/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.Designer.cs @@ -39,12 +39,12 @@ namespace BeWoWalzPaiva this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.rtAnschrift1 = new DevExpress.XtraReports.UI.XRRichText(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblIKNummer = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBetreff = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); @@ -150,35 +150,36 @@ namespace BeWoWalzPaiva // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel4, + this.lblIKNummer, this.xrLabel11, this.xrLabel10, this.xrLabel6, this.xrLabel7, - this.xrLabel3, + this.lblBetreff, this.xrLabel2, this.xrLabel5, this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new System.Drawing.Font("Verdana", 10F); - this.Page1.HeightF = 327F; + this.Page1.HeightF = 349.9167F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // - // xrLabel4 + // lblIKNummer // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 235F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "IK-Nummer: 490 5040 21"; - this.xrLabel4.WordWrap = false; + this.lblIKNummer.BackColor = System.Drawing.Color.Transparent; + this.lblIKNummer.CanShrink = true; + this.lblIKNummer.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblIKNummer.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 235F); + this.lblIKNummer.Multiline = true; + this.lblIKNummer.Name = "lblIKNummer"; + this.lblIKNummer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblIKNummer.SizeF = new System.Drawing.SizeF(650F, 20F); + this.lblIKNummer.StylePriority.UseBackColor = false; + this.lblIKNummer.StylePriority.UseFont = false; + this.lblIKNummer.Text = "IK-Nummer: 490 5040 21"; + this.lblIKNummer.Visible = false; + this.lblIKNummer.WordWrap = false; // // xrLabel11 // @@ -222,19 +223,19 @@ namespace BeWoWalzPaiva this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + "tStreet]\r\n[RecipientPostCodeAndTown]"; // - // xrLabel3 + // lblBetreff // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Soziotherapieleistungen für [CustomerSalutation] [CustomerName]"; - this.xrLabel3.WordWrap = false; + this.lblBetreff.BackColor = System.Drawing.Color.Transparent; + this.lblBetreff.CanShrink = true; + this.lblBetreff.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); + this.lblBetreff.Name = "lblBetreff"; + this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBetreff.SizeF = new System.Drawing.SizeF(650F, 20F); + this.lblBetreff.StylePriority.UseBackColor = false; + this.lblBetreff.StylePriority.UseFont = false; + this.lblBetreff.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]"; + this.lblBetreff.WordWrap = false; // // xrLabel2 // @@ -252,7 +253,7 @@ namespace BeWoWalzPaiva // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 270.4166F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 293.3333F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -273,7 +274,7 @@ namespace BeWoWalzPaiva // // lblAbrechnungszeitraum // - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 295.4166F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 318.3333F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -739,7 +740,7 @@ namespace BeWoWalzPaiva private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.GroupHeaderBand Page1; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblBetreff; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel8; @@ -783,6 +784,6 @@ namespace BeWoWalzPaiva private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRRichText rtAnschrift1; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblIKNummer; } } diff --git a/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.cs b/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.cs index 1f25e27e5..4b19fa848 100644 --- a/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.cs +++ b/ReportImp/BeWoWalzPaiva/ServiceInvoiceReport.cs @@ -17,6 +17,7 @@ namespace BeWoWalzPaiva public void SetReportDataSource(ServiceInvoiceRO pRO) { + // Achtung! 2 Rechnungen in einer - anderes Logo, Betreff und IKNr. bei Soziotherapie logoSoziotherapie.Location = logoBeWo.Location; logoSoziotherapie.Visible = false; @@ -28,6 +29,8 @@ namespace BeWoWalzPaiva { logoBeWo.Visible = false; logoSoziotherapie.Visible = true; + lblIKNummer.Visible = true; + lblBetreff.Text = String.Format("Abrechnung Soziotherapieleistungen für {0} {1}", pRO.CustomerSalutation, pRO.CustomerName); } } diff --git a/ReportImp/BeWoWalzPaiva/SettlementReport.Designer.cs b/ReportImp/BeWoWalzPaiva/SettlementReport.Designer.cs index a65395e39..067eaaa14 100644 --- a/ReportImp/BeWoWalzPaiva/SettlementReport.Designer.cs +++ b/ReportImp/BeWoWalzPaiva/SettlementReport.Designer.cs @@ -106,7 +106,6 @@ namespace BeWoWalzPaiva.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit(); @@ -154,7 +153,7 @@ namespace BeWoWalzPaiva.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 398.6666F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 382F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -285,7 +284,7 @@ namespace BeWoWalzPaiva.Alt // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 323.6666F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 307F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -295,7 +294,7 @@ namespace BeWoWalzPaiva.Alt // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 290.6667F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 274F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -572,7 +571,6 @@ namespace BeWoWalzPaiva.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel14, this.xrLabel7, this.xrLabel9, this.xrLabel13, @@ -589,7 +587,7 @@ namespace BeWoWalzPaiva.Alt this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 476.6667F; + this.GroupHeader1.HeightF = 450F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -912,21 +910,6 @@ namespace BeWoWalzPaiva.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Transparent; - this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0.0001430511F, 242F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "IK-Nummer: 490 5040 21"; - this.xrLabel14.WordWrap = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1035,6 +1018,5 @@ namespace BeWoWalzPaiva.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel13; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs b/ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs index 5cbf27ae2..a9a8a5527 100644 --- a/ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs +++ b/ReportImp/BeWoWalzPaiva/SettlementReport2.Designer.cs @@ -106,7 +106,6 @@ namespace BeWoWalzPaiva this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit(); @@ -153,7 +152,7 @@ namespace BeWoWalzPaiva // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 395.5416F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.75F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -284,7 +283,7 @@ namespace BeWoWalzPaiva // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 320.5416F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.75F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -294,7 +293,7 @@ namespace BeWoWalzPaiva // // xrLabel5 // - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 287.5417F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.75F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -571,7 +570,6 @@ namespace BeWoWalzPaiva // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel14, this.xrLabel7, this.xrLabel9, this.xrLabel13, @@ -588,7 +586,7 @@ namespace BeWoWalzPaiva this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 473.5417F; + this.GroupHeader1.HeightF = 443.75F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -912,21 +910,6 @@ namespace BeWoWalzPaiva this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Transparent; - this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 242F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 20F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "IK-Nummer: 490 5040 21"; - this.xrLabel14.WordWrap = false; - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1035,6 +1018,5 @@ namespace BeWoWalzPaiva private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel13; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/WegweiserBetreuungsdienstReports/InvoiceCustomerReport.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/InvoiceCustomerReport.Designer.cs index 48dc50831..654ebed85 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/InvoiceCustomerReport.Designer.cs @@ -45,6 +45,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLine1 = new DevExpress.XtraReports.UI.XRLine(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -60,13 +61,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.tableTotalClaim = new DevExpress.XtraReports.UI.XRTable(); @@ -81,6 +79,8 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -255,6 +255,18 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrPictureBox1.SizeF = new System.Drawing.SizeF(250F, 50F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 6F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(115F, 152.79F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(317F, 17F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.Text = "Kurfürstenstr.8, 47906 Kempen"; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrLabel1 // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -448,18 +460,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]"; this.xrLabel2.WordWrap = false; // - // xrLabel18 - // - this.xrLabel18.Font = new System.Drawing.Font("Arial", 6F); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(115F, 152.79F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(317F, 17F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.Text = "Kurfürstenstr.8, 47906 Kempen"; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // ruleRateFactorNull // this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; @@ -473,29 +473,18 @@ namespace BeWo.WegweiserBetreuungsdienstReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel11, + this.xrLabel14, + this.xrLabel9, this.xrLabel10, - this.xrLabel12, this.xrLabel8, this.xrLabel7, this.tableTotalClaim}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ReportFooter.HeightF = 230F; + this.ReportFooter.HeightF = 242.2916F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 195.2083F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 34.79167F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Dipl. Sozialarbeiter\r\nGesundheitswissenschaftler"; - // // xrLabel10 // this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 111.4583F); @@ -505,15 +494,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrLabel12 - // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 178.2084F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(227.0833F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Schürmann; MPH"; - // // xrLabel8 // this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.41667F); @@ -649,6 +629,27 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.PageHeader.Name = "PageHeader"; this.PageHeader.StylePriority.UseFont = false; // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.25F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" + + "larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)"; + // + // xrLabel9 + // + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.25F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.Text = "D. Schürmann; MPH"; + // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -721,14 +722,14 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLine xrLine2; private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.PageHeaderBand PageHeader; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; } } diff --git a/ReportImp/WegweiserBetreuungsdienstReports/RechnungKrankenkasse.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/RechnungKrankenkasse.Designer.cs index 306b1cd87..5fdaa8ae9 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/RechnungKrankenkasse.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/RechnungKrankenkasse.Designer.cs @@ -71,8 +71,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); @@ -82,6 +80,8 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRechnungsbetrag = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -496,13 +496,13 @@ namespace BeWo.WegweiserBetreuungsdienstReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel3, + this.xrLabel5, this.xrLabel1, - this.xrLabel12, - this.xrLabel14, this.xrLabel15, this.xrTable4}); this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F); - this.GroupFooter1.HeightF = 170.5834F; + this.GroupFooter1.HeightF = 186.6251F; this.GroupFooter1.Level = 1; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -516,26 +516,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.Text = "Wir dürfen um Überweisung innerhalb von zwei Wochen bitten. "; // - // xrLabel12 - // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.5834F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Schürmann; MPH"; - // - // xrLabel14 - // - this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.5834F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 30F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Dipl. Sozialarbeiter\r\nGesundheitswissenschaftler"; - // // xrLabel15 // this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75.66656F); @@ -620,6 +600,27 @@ namespace BeWo.WegweiserBetreuungsdienstReports // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 140.5834F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" + + "larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)"; + // + // xrLabel5 + // + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 123.5834F); + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.Text = "D. Schürmann; MPH"; + // // RechnungKrankenkasse // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -683,8 +684,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLine xrLine2; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; @@ -704,5 +703,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; } } diff --git a/ReportImp/WegweiserBetreuungsdienstReports/ServiceInvoiceReport.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/ServiceInvoiceReport.Designer.cs index 84e4c65a6..b58c32927 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/ServiceInvoiceReport.Designer.cs @@ -579,7 +579,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel15, this.xrTable4}); this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F); - this.GroupFooter1.HeightF = 170.5834F; + this.GroupFooter1.HeightF = 186.6251F; this.GroupFooter1.Level = 1; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; @@ -600,7 +600,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Schürmann; MPH"; + this.xrLabel12.Text = "D. Schürmann; MPH"; // // xrLabel14 // @@ -609,9 +609,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 30F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F); this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Dipl. Sozialarbeiter\r\nGesundheitswissenschaftler"; + this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" + + "larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)"; // // xrLabel15 // diff --git a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.Designer.cs index d646dc4b0..8d53edbb4 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.Designer.cs @@ -89,7 +89,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -102,7 +101,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -112,6 +110,8 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt this.xrLine2 = new DevExpress.XtraReports.UI.XRLine(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); @@ -779,28 +779,17 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel11, + this.xrLabel14, + this.xrLabel7, this.xrLabel10, this.xrTable3, - this.xrLabel12, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F); - this.ReportFooter.HeightF = 230F; + this.ReportFooter.HeightF = 244.6249F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195.4583F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 34F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Dipl. Sozialarbeiter\r\nGesundheitswissenschaftler"; - // // xrLabel10 // this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); @@ -902,15 +891,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify; this.xrTableCell31.Weight = 3D; // - // xrLabel12 - // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.4584F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Schürmann; MPH"; - // // lblNotice // this.lblNotice.CanShrink = true; @@ -993,6 +973,27 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 198.5832F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" + + "larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)"; + // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 181.5833F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "D. Schürmann; MPH"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1037,7 +1038,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; @@ -1093,7 +1093,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel13; @@ -1103,5 +1102,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRRichText xrRichText2; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } } diff --git a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.Designer.cs b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.Designer.cs index 3a30a41b4..74a2d5009 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.Designer.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.Designer.cs @@ -62,7 +62,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -75,7 +74,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -111,6 +109,8 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableRow43 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); @@ -456,28 +456,17 @@ namespace BeWo.WegweiserBetreuungsdienstReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel11, + this.xrLabel14, + this.xrLabel7, this.xrLabel10, this.xrTable3, - this.xrLabel12, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F); - this.ReportFooter.HeightF = 230F; + this.ReportFooter.HeightF = 241.5F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel11 - // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195.4583F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(225F, 34F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Dipl. Sozialarbeiter\r\nGesundheitswissenschaftler"; - // // xrLabel10 // this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); @@ -579,15 +568,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify; this.xrTableCell31.Weight = 3D; // - // xrLabel12 - // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.4584F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Schürmann; MPH"; - // // lblNotice // this.lblNotice.CanShrink = true; @@ -950,6 +930,27 @@ namespace BeWo.WegweiserBetreuungsdienstReports this.xrTableCell74.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell74.Weight = 0.21685899000901443D; // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195.4583F); + this.xrLabel14.Multiline = true; + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(357.2917F, 46.04167F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Soziotherapeut (Mitglied im Berufsverband der Soziotherapeuten e.V.)\r\nDipl. Sozia" + + "larbeiter (FH)\r\nGesundheitswissenschaftler (Uni)"; + // + // xrLabel7 + // + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 178.4585F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(225F, 17F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.Text = "D. Schürmann; MPH"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -997,7 +998,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.XRLabel lblNotice; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; @@ -1026,7 +1026,6 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel13; @@ -1062,5 +1061,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRRichText xrRichText2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; } }