diff --git a/ReportImp/BloemelingUndTeckhaus/Invoicing/CustomInvoiceFactory.cs b/ReportImp/BloemelingUndTeckhaus/Invoicing/CustomInvoiceFactory.cs index 19915a205..aa9220c12 100644 --- a/ReportImp/BloemelingUndTeckhaus/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/BloemelingUndTeckhaus/Invoicing/CustomInvoiceFactory.cs @@ -11,23 +11,16 @@ namespace BloemelingUndTeckhaus.Invoicing { public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) { - foreach (var list in supportConcepts2ServiceRecords) - { - var os = new BeWo.Service.ServiceImplementations.OperationsServiceImp(); - var keyScOid = new List() { list.Key.SupportConceptOid }; - var supportConcept = os.GetSupportConceptsById(keyScOid); - if (supportConcept[0].CostBearerRelations[0].ApprovalPeriodList.Count > 0) - { - var serviceCategory = supportConcept[0].CostBearerRelations[0].ApprovalPeriodList[0].ServiceCategory; - if (serviceCategory != null && serviceCategory.Name.ToLower().Contains("soziotherapie")) - return new SoziotherapieInvoiceCreation(); - } - foreach (var sr in list.Value) + foreach (var list in supportConcepts2ServiceRecords.Values) + { + foreach (var sr in list) { var sd = sr.ServiceDescription.Category; var ic = GetInvoiceCreatorForCategory(sd); if (ic != null) + { return ic; + } } } return new StandardInvoiceCreation(); @@ -42,7 +35,10 @@ namespace BloemelingUndTeckhaus.Invoicing { return new CustomAssistenzInvoiceCreation(); } - + if (cat.IndexOf("soziotherapie") >= 0) + { + return new SoziotherapieInvoiceCreation(); + } } return null; } diff --git a/ReportImp/BloemelingUndTeckhaus/SoziotherapieRechnung.Designer.cs b/ReportImp/BloemelingUndTeckhaus/SoziotherapieRechnung.Designer.cs index d6ec999d6..0c982a2b4 100644 --- a/ReportImp/BloemelingUndTeckhaus/SoziotherapieRechnung.Designer.cs +++ b/ReportImp/BloemelingUndTeckhaus/SoziotherapieRechnung.Designer.cs @@ -239,6 +239,7 @@ namespace BloemelingUndTeckhaus this.xrTableCell138 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -2027,6 +2028,7 @@ namespace BloemelingUndTeckhaus // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel12, this.xrTable4, this.xrLabel14, this.xrLabel9, @@ -2036,13 +2038,13 @@ namespace BloemelingUndTeckhaus this.xrTable6, this.xrLabel3}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.GroupFooter1.HeightF = 326.6849F; + this.GroupFooter1.HeightF = 454.8099F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrTable4 // - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(360F, 217.6666F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(359.8331F, 354.1249F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow30, @@ -2125,7 +2127,7 @@ namespace BloemelingUndTeckhaus // this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(430.6946F, 300.6251F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(430.5277F, 437.0834F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(246.4723F, 17.72656F); @@ -2137,7 +2139,7 @@ namespace BloemelingUndTeckhaus // this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(127.6944F, 300.6251F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(127.5276F, 437.0834F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(283.4724F, 17.72656F); @@ -2149,7 +2151,7 @@ namespace BloemelingUndTeckhaus // this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.1668135F, 300.6251F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 437.0834F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(107F, 17.72656F); @@ -2159,7 +2161,7 @@ namespace BloemelingUndTeckhaus // // xrTable7 // - this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0.1668135F, 201.6666F); + this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 338.1248F); this.xrTable7.Name = "xrTable7"; this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow8, @@ -2266,7 +2268,7 @@ namespace BloemelingUndTeckhaus // xrLabel4 // this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.1668135F, 161.25F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.7083F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -2503,6 +2505,17 @@ namespace BloemelingUndTeckhaus // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel12 + // + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 177.875F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(487F, 29.99998F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Bitte beachten Sie die zweite Seite."; + // // SoziotherapieRechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -2749,5 +2762,6 @@ namespace BloemelingUndTeckhaus private DevExpress.XtraReports.UI.XRTableCell xrTableCell127; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; } }