From af8f5a4f49b22289ccccc955c069ca3c736c4792 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Tue, 6 Jun 2023 12:31:57 +0200 Subject: [PATCH] MH: Schilling QB --- .../ServicesOverviewReportNeu.Designer.cs | 56 +++++++++---------- .../ServicesOverviewReportNeu.cs | 22 ++++++++ 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.Designer.cs b/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.Designer.cs index 2f72b91a2..dcbc7470b 100644 --- a/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.Designer.cs +++ b/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.Designer.cs @@ -66,9 +66,10 @@ namespace BeWoSchillingReports this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblStundendokumentation = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -86,7 +87,6 @@ namespace BeWoSchillingReports this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblAbsenceTime = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -500,11 +500,24 @@ namespace BeWoSchillingReports this.xrLabel14, this.xrLabel2, this.xrLabel12, - this.xrLabel1, + this.lblStundendokumentation, this.xrLabel9}); this.ReportHeader.HeightF = 145F; this.ReportHeader.Name = "ReportHeader"; // + // xrLabel14 + // + this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108F); + 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, 25F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.StylePriority.UseTextAlignment = false; + this.xrLabel14.Text = "Fallverantwortliche Fachkraft: [MainAttendant]"; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -532,18 +545,18 @@ namespace BeWoSchillingReports this.xrLabel12.StylePriority.UseTextAlignment = false; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel1 + // lblStundendokumentation // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 25F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Stunden-Dokumentation Betreutes Wohnen"; - this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblStundendokumentation.Font = new System.Drawing.Font("Arial", 14F); + this.lblStundendokumentation.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblStundendokumentation.Multiline = true; + this.lblStundendokumentation.Name = "lblStundendokumentation"; + this.lblStundendokumentation.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblStundendokumentation.SizeF = new System.Drawing.SizeF(650F, 25F); + this.lblStundendokumentation.StylePriority.UseFont = false; + this.lblStundendokumentation.StylePriority.UseTextAlignment = false; + this.lblStundendokumentation.Text = "Stunden-Dokumentation "; + this.lblStundendokumentation.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel9 // @@ -711,19 +724,6 @@ namespace BeWoSchillingReports this.lblAbsenceTime.Text = "Es sind keine stationären Aufenthalte bekannt."; this.lblAbsenceTime.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel14 - // - this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108F); - 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, 25F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Fallverantwortliche Fachkraft: [MainAttendant]"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -773,7 +773,7 @@ namespace BeWoSchillingReports private DevExpress.XtraReports.UI.DetailBand Detail3; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel lblStundendokumentation; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; diff --git a/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.cs b/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.cs index dddee39cd..1e0152aa5 100644 --- a/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.cs +++ b/ReportImp/BeWoSchillingReports/ServicesOverviewReportNeu.cs @@ -1,6 +1,9 @@ using System; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; namespace BeWoSchillingReports { @@ -13,6 +16,25 @@ namespace BeWoSchillingReports public void SetReportDataSource(ServicesOverviewRO pRO) { + + var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(pRO.CustomerOid)); + string betreuungsform = ""; + if (customer != null) + { + if (customer.CustomerCareTypes != null) + { + for (int i = 0; i < customer.CustomerCareTypes.Count; i++) + { + var caretype = customer.CustomerCareTypes[i]; + if (i == customer.CustomerCareTypes.Count - 1) + betreuungsform += caretype.DisplayName; + else + betreuungsform += caretype.DisplayName + " & "; + } + } + lblStundendokumentation.Text += betreuungsform; + } + if (!String.IsNullOrWhiteSpace(pRO.AbsenceTimes)) { lblAbsenceTime.Text = "Stationäre Aufenthalte:";