From f9b1ffbb0eaa5cda4c287fc278ace6e382328c6b Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 19 May 2026 08:58:24 +0200 Subject: [PATCH] FeidPartnerReports/CustomSupportConceptAnalysisCreator und CustomServiceRecordStatisticFactory - Fehler bei Buchhungen Anfang der Woche SupportOID=163175 --- .../CustomSupportConceptAnalysisCreator.cs | 2 +- .../Statistics/CustomServiceRecordStatisticFactory.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReportImp/FeidPartnerReports/CustomSupportConceptAnalysisCreator.cs b/ReportImp/FeidPartnerReports/CustomSupportConceptAnalysisCreator.cs index 80808f7ca..4e0898652 100644 --- a/ReportImp/FeidPartnerReports/CustomSupportConceptAnalysisCreator.cs +++ b/ReportImp/FeidPartnerReports/CustomSupportConceptAnalysisCreator.cs @@ -130,7 +130,7 @@ namespace FeidPartnerReports bool vorhandeneEintraege = false; if (serviceRecords != null && serviceRecords.Count > 0) { - vorhandeneEintraege = serviceRecords.Any(s => s.Start.Value.Date >= start.Date && s.Start.Value.Date <= end.Date && s.RoundedDuration > 0 && s.ServiceDescription.Category.IsBillable); + vorhandeneEintraege = serviceRecords.Any(s => s.Start.Value.Date >= start.Date && s.Start.Value.Date < end.Date && s.RoundedDuration > 0 && s.ServiceDescription.Category.IsBillable); } return vorhandeneEintraege; } diff --git a/ReportImp/FeidPartnerReports/Statistics/CustomServiceRecordStatisticFactory.cs b/ReportImp/FeidPartnerReports/Statistics/CustomServiceRecordStatisticFactory.cs index ef6a1f04c..1cb6d5de0 100644 --- a/ReportImp/FeidPartnerReports/Statistics/CustomServiceRecordStatisticFactory.cs +++ b/ReportImp/FeidPartnerReports/Statistics/CustomServiceRecordStatisticFactory.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using BeWo.Data.Access; @@ -21,7 +21,7 @@ namespace FeidPartnerReports.Statistics try { - // Fahrtzeiten nicht in Ministatistik nur für Abrechnung + // Fahrtzeiten nicht in Ministatistik nur für Abrechnung stat.PeriodStatistics = stat.PeriodStatistics.Where(p => p.SupportConceptApprovalPeriod.ServiceCategory == null || String.IsNullOrEmpty(p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation) || !p.SupportConceptApprovalPeriod.ServiceCategory.Abbreviation.Contains("FZQA")).ToList(); @@ -135,7 +135,7 @@ namespace FeidPartnerReports.Statistics catch (Exception) { - //Mach nichts. Das ist für den alten Mok bei dem die Felder MinutesFreePerWeekStatisticDate noch nicht in der alten Shared.dll existieren + //Mach nichts. Das ist für den alten Mok bei dem die Felder MinutesFreePerWeekStatisticDate noch nicht in der alten Shared.dll existieren } } @@ -156,7 +156,7 @@ namespace FeidPartnerReports.Statistics bool vorhandeneEintraege = false; if (serviceRecords != null && serviceRecords.Count > 0) { - vorhandeneEintraege = serviceRecords.Any(s => s.Start.Value.Date >= start.Date && s.Start.Value.Date <= end.Date && s.RoundedDuration > 0 && s.ServiceDescription.Category.IsBillable); + vorhandeneEintraege = serviceRecords.Any(s => s.Start.Value.Date >= start.Date && s.Start.Value.Date < end.Date && s.RoundedDuration > 0 && s.ServiceDescription.Category.IsBillable); } return vorhandeneEintraege; }