From 9a596a21da4ad500cfb39a384d35c952f41d9ce4 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Jul 2024 12:38:22 +0200 Subject: [PATCH] WegweiserBetreuungsdienstReports/SettlementReport - Typo gefixt --- .../SettlementReport.cs | 2 +- .../SettlementReport2.cs | 138 +++++++++--------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.cs b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.cs index 3d00e8be0..457df9ced 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport.cs @@ -22,7 +22,7 @@ namespace BeWo.WegweiserBetreuungsdienstReports.Alt if ((pRO.RecipientContactPerson != null && pRO.RecipientContactPerson.Contains("Frau Bayer")) || (pRO.RecipientDivision != null && pRO.RecipientDivision.Contains("Frau Bayer"))) { - xrLabel5.Text = "Sehr geeherte Frau Bayer,"; + xrLabel5.Text = "Sehr geehrte Frau Bayer,"; } //xrLabel3.Text = "Abrechnung Betreuungsleistungen / Bewilligungsbescheid vom [ApprovalNoticeDateString]"; diff --git a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.cs b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.cs index 45ca97bcd..d90d9f15f 100644 --- a/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.cs +++ b/ReportImp/WegweiserBetreuungsdienstReports/SettlementReport2.cs @@ -1,76 +1,76 @@ -using System; -using BeWo.Data.Access; -using BeWo.Data.Entities; -using DevExpress.XtraReports.UI; -using BeWo.Report.ReportObjects; -using BeWo.Report; -using System.Text.RegularExpressions; -using BS.Shared.Extensions; - -namespace BeWo.WegweiserBetreuungsdienstReports -{ - public partial class Spitzabrechnung : XtraReport, IBeWoReport - { - public Spitzabrechnung() - { - InitializeComponent(); - } - - public void SetReportDataSource(Settlement2RO pRO) - { - if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) - { - pRO.RecipientPostCodeAndTown = pRO.RecipientPostCodeAndTown.Replace(" ", " "); - } - - if ((pRO.RecipientContactPerson != null && pRO.RecipientContactPerson.Contains("Frau Bayer")) || +using System; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using DevExpress.XtraReports.UI; +using BeWo.Report.ReportObjects; +using BeWo.Report; +using System.Text.RegularExpressions; +using BS.Shared.Extensions; + +namespace BeWo.WegweiserBetreuungsdienstReports +{ + public partial class Spitzabrechnung : XtraReport, IBeWoReport + { + public Spitzabrechnung() + { + InitializeComponent(); + } + + public void SetReportDataSource(Settlement2RO pRO) + { + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + pRO.RecipientPostCodeAndTown = pRO.RecipientPostCodeAndTown.Replace(" ", " "); + } + + if ((pRO.RecipientContactPerson != null && pRO.RecipientContactPerson.Contains("Frau Bayer")) || (pRO.RecipientDivision != null && pRO.RecipientDivision.Contains("Frau Bayer"))) { - xrLabel5.Text = "Sehr geeherte Frau Bayer,"; - } - - decimal rateFactor = 1; - - foreach (var ii in pRO.InvoiceItems) - { - if (ii.RateFactor.HasValue) - { - rateFactor = (100 + ii.RateFactor.Value) / 100; - } - - if (pRO.FehlkontakteString != null && ii.RateFactor == 0) - { - Zwischensumme.Visible = true; - if (!ii.ItemDescription.IsNullOrEmpty()) + xrLabel5.Text = "Sehr geehrte Frau Bayer,"; + } + + decimal rateFactor = 1; + + foreach (var ii in pRO.InvoiceItems) + { + if (ii.RateFactor.HasValue) + { + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + + if (pRO.FehlkontakteString != null && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (!ii.ItemDescription.IsNullOrEmpty()) { ii.AbrechnungsText = ii.AbrechnungsText.Replace("FLS", "Std."); } - ii.ItemDescription = "Fehlkontakte"; + ii.ItemDescription = "Fehlkontakte"; } else if (ii.ItemDescription.IsNullOrEmpty()) { ii.ItemDescription = "Fachleistungsstunden"; } } - pRO.RateFactor = (double)rateFactor; - - cellFactorText.Text = String.Format("- zzgl. Faktor {0:0.00}:", pRO.RateFactor); - - cellApprovedFlsFactor.Text = pRO.ApprovedFLSWithFactor; - - xrLabel3.Text = "Abrechnung Betreuungsleistungen"; - if (pRO.InvoiceBaseOid.HasValue) - { - var ib = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBaseOid.Value); - if (ib.SupportConceptOid.HasValue) - { - var sc = DAOFactory.GenericDAO.LoadByID(ib.SupportConceptOid.Value); - - if (sc.ApprovalDate.HasValue) - { - xrLabel3.Text = String.Format("Abrechnung Betreuungsleistungen / Bewilligungsbescheid vom {0:dd.MM.yyyy}", sc.ApprovalDate); - } - } + pRO.RateFactor = (double)rateFactor; + + cellFactorText.Text = String.Format("- zzgl. Faktor {0:0.00}:", pRO.RateFactor); + + cellApprovedFlsFactor.Text = pRO.ApprovedFLSWithFactor; + + xrLabel3.Text = "Abrechnung Betreuungsleistungen"; + if (pRO.InvoiceBaseOid.HasValue) + { + var ib = DAOFactory.GenericDAO.LoadByID(pRO.InvoiceBaseOid.Value); + if (ib.SupportConceptOid.HasValue) + { + var sc = DAOFactory.GenericDAO.LoadByID(ib.SupportConceptOid.Value); + + if (sc.ApprovalDate.HasValue) + { + xrLabel3.Text = String.Format("Abrechnung Betreuungsleistungen / Bewilligungsbescheid vom {0:dd.MM.yyyy}", sc.ApprovalDate); + } + } } if (pRO.AmountBillableTotal - (pRO.Claim + pRO.AmountAdvancedPayments) != 0) @@ -79,10 +79,10 @@ namespace BeWo.WegweiserBetreuungsdienstReports lblDifferenzrechnungText.Text = "Höhe der bereits gestellten Rechnung vor Stundensatzanpassung:"; lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountAdvancedPayments + pRO.Claim)); - } - - - this.bindingSource1.DataSource = pRO; - } - } -} + } + + + this.bindingSource1.DataSource = pRO; + } + } +}