From aeedebdd90c2b0fd6a210b504aebed76bcab85fc Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 10 Jul 2023 16:06:10 +0200 Subject: [PATCH] MH: Alzey Sozio --- .../AlzeyTeilhabe/StundenzettelSoziotherapie.Designer.cs | 2 +- ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.Designer.cs b/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.Designer.cs index 1dca919e7..625c2b64b 100644 --- a/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.Designer.cs +++ b/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.Designer.cs @@ -307,7 +307,7 @@ namespace AlzeyTeilhabe // xrTableCell12 // this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice3")}); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F); this.xrTableCell12.StylePriority.UsePadding = false; diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.cs b/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.cs index d99f986ce..29206a7ae 100644 --- a/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.cs +++ b/ReportImp/AlzeyTeilhabe/StundenzettelSoziotherapie.cs @@ -55,9 +55,12 @@ namespace AlzeyTeilhabe ServicesOverviewRO.CreateSignatureString(s); //s.Notice4 = string.Format("{0:00}", (s.EndDate - s.StartDate).TotalHours) + ":"+ string.Format("{0:00}", (s.EndDate - s.StartDate).TotalMinutes % 60); - s.Notice4 = string.Format("{0:00}:{1:00}", (s.EndDate - s.StartDate).TotalHours < 1 ? 0 : (s.EndDate - s.StartDate).TotalHours, (s.EndDate - s.StartDate).TotalMinutes % 60); - if (s.ServiceDescription.ToLower().Contains("fahrzeit")) + s.Notice4 = string.Format("{0:00}:{1:00}", (s.EndDate - s.StartDate).TotalHours < 1 ? 0 : ((int)(s.EndDate - s.StartDate).TotalHours), (s.EndDate - s.StartDate).TotalMinutes % 60); + if (s.ServiceDescription.ToLower().Contains("fahrtkosten")) + { + s.Notice = s.ServiceDescription; s.Notice5 = string.Format("{0:c}", stundensatz); + } else s.Notice5 = string.Format("{0:c}", stundensatz * Convert.ToDecimal(s.Minutes / 60)); servicesBillable.Add(s); @@ -65,7 +68,7 @@ namespace AlzeyTeilhabe } pRO.Services = servicesBillable; - var gesamtstundenFormatiert = string.Format("{0:00}:{1:00}", pRO.TotalFLMBillable / 60, pRO.TotalFLMBillable % 60); + var gesamtstundenFormatiert = string.Format("{0:00}:{1:00}", (int)(pRO.TotalFLMBillable / 60), pRO.TotalFLMBillable % 60); lblGesamtstunden.Text = gesamtstundenFormatiert; }