From 2bffd4a38d15c08874c36d435e5dc01bb57aaa21 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 11 Oct 2024 12:49:48 +0200 Subject: [PATCH] LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs - Finetuning --- .../Reporting/Leistungsnachweis2024.Designer.cs | 13 +++++++------ .../Reporting/Leistungsnachweis2024.cs | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs index 902d163aa..d0ad24ae9 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.Designer.cs @@ -61,7 +61,6 @@ namespace LebenshilfeWolfsburg.Reporting this.columnWegepauschaleQuali = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -103,6 +102,7 @@ namespace LebenshilfeWolfsburg.Reporting this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -519,10 +519,6 @@ namespace LebenshilfeWolfsburg.Reporting this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell32.Weight = 1.0307263240210649D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -851,7 +847,8 @@ namespace LebenshilfeWolfsburg.Reporting this.xrLabel18.StylePriority.UseFont = false; this.xrLabel18.StylePriority.UseForeColor = false; this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.Text = "[CustomerLastName], [CustomerFirstName]"; + this.xrLabel18.Text = "[CustomerLastName], [CustomerFirstName] ([CostBearer2SupportConceptList.SupportCo" + + "ncept.Customer.CustomerAlias])"; this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrLabel17 @@ -1147,6 +1144,10 @@ namespace LebenshilfeWolfsburg.Reporting this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')"; this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Leistungsnachweis2024 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs index 7a6ff5af1..6b62e1571 100644 --- a/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs +++ b/ReportImp/LebenshilfeWolfsburg/Reporting/Leistungsnachweis2024.cs @@ -83,7 +83,7 @@ namespace LebenshilfeWolfsburg.Reporting lblRestbudget.Text = String.Format("{0:0.00}", pRO.ApprovedFLSTotal - pRO.MinutenGeleistetBisVormonat); //lblHeader je nach Art der Leistung des Hilfeplans - if (pRO.Costbearer.Contains("Helfer")) + if (pRO.Costbearer.Contains("Helfer") || pRO.Costbearer.ToLower().Contains("ka")) { lblHeader.Text = "Kompensatorische Assistenz"; }