From 734eb0cc8a67c033ce11dae65ca0b1ac25f2453a Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 1 Feb 2023 09:26:07 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20Anzeige=20der=20Betreuer=20angepasst=20Au?= =?UTF-8?q?tismusK=C3=B6lnBonn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeistungsnachweisJugendamt.Designer.cs | 4 +-- .../LeistungsnachweisJugendamt.cs | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.Designer.cs b/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.Designer.cs index e9a44261f..69901f960 100644 --- a/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.Designer.cs +++ b/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.Designer.cs @@ -347,7 +347,7 @@ namespace AutismusKoelnBonn // xrTableCell16 // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice", "{0:0.##}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:0.##}")}); this.xrTableCell16.Font = new System.Drawing.Font("Arial", 8F); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -779,8 +779,6 @@ namespace AutismusKoelnBonn // // cellBerater1 // - this.cellBerater1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")}); this.cellBerater1.Name = "cellBerater1"; this.cellBerater1.Weight = 0.43894654911611386D; // diff --git a/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.cs b/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.cs index b5c9d22a0..db2a7092b 100644 --- a/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.cs +++ b/ReportImp/AutismusKoelnBonn/LeistungsnachweisJugendamt.cs @@ -82,9 +82,34 @@ namespace AutismusKoelnBonn //BetreutesWohnen Stelzel } } + pRO.Services = servicesBillable; } + // Betreuuernamen setzen + foreach (var cb2sc in pRO.CostBearer2SupportConceptList) + { + if (cb2sc.CostBearer.Organisation.Name == pRO.Costbearer) + { + foreach (var scap in cb2sc.ApprovalPeriodList) + { + if (pRO.StartDate.Date >= scap.StartDate.Value.Date && pRO.EndDate.Date <= scap.EndDate.Value.Date) + { + if (scap.SupportConceptApprovalPeriod2Employee != null && scap.SupportConceptApprovalPeriod2Employee.Count > 0) + { + if (scap.SupportConceptApprovalPeriod2Employee.Count == 1) + cellBerater1.Text = scap.SupportConceptApprovalPeriod2Employee[0].Employee.Person.FirstNameLastName; + else + { + cellBerater1.Text = scap.SupportConceptApprovalPeriod2Employee[0].Employee.Person.FirstNameLastName; + cellBerater2.Text = scap.SupportConceptApprovalPeriod2Employee[1].Employee.Person.FirstNameLastName; + } + } + } + } + } + } + cellSummeFls.Text = String.Format("{0:0.00}", summeFls / 60); cellSummeAusfall.Text = String.Format("{0:0.00}", summeAusfall / 60); cellSummeWegezeit.Text = String.Format("{0:0.00}", summeWege / 60);