From f65c39ed5e4c0721576bada6494b72e0889e4661 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 24 Feb 2025 15:37:28 +0100 Subject: [PATCH] EmployeeKilometerauswertungsRO - Erweiterung um den Preis pro km --- Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs | 3 +++ Report/ReportObjects/EmployeeKilometerauswertungsRO.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs b/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs index a4ff6fc29..74c499ab8 100644 --- a/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs +++ b/Report/ReportObjects/EmployeeKilometerauswertungsListRO.cs @@ -75,6 +75,8 @@ namespace BeWo.Report.ReportObjects public double TotalKilometerPauschale { get; set; } + public double TotalKmPauschalePreis { get; set; } + public String TotalCustom1 { get; set; } public Employee2EmployeeKilometerauswertungsEntry(CompactEmployeeDC employee, IEnumerable serviceRecords) @@ -91,6 +93,7 @@ namespace BeWo.Report.ReportObjects var distanceRounded = Math.Round(distance, 2); TotalDistanceInMeters += distanceRounded; var pauschVar = GetPreis(preise, "Kilometerpauschale", serviceRecord.Start.Value); + TotalKmPauschalePreis = (double)pauschVar; var e = new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice, serviceRecord); e.KilometerPauschale = Math.Round(distanceRounded * (double)pauschVar, 2, MidpointRounding.AwayFromZero); diff --git a/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs b/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs index 7e2589354..4b6e5af15 100644 --- a/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs +++ b/Report/ReportObjects/EmployeeKilometerauswertungsRO.cs @@ -28,6 +28,8 @@ namespace BeWo.Report.ReportObjects public double TotalKilometerPauschale { get; set; } + public double TotalKmPauschalePreis { get; set; } + public String TotalCustom1 { get; set; } public List LeistungenOids { get; set; } @@ -72,6 +74,7 @@ namespace BeWo.Report.ReportObjects var distanceRounded = Math.Round(distance, 2); TotalDistanceInMeters += distanceRounded; var pauschVar = GetPreis(preise, "Kilometerpauschale", serviceRecord.Start.Value); + TotalKmPauschalePreis = (double)pauschVar; var e = new EmployeeKilometerauswertungsEntry(serviceRecord.Start, serviceRecord.End, distanceRounded, serviceRecord.Customer?.Person?.LastNameFirstName ?? string.Empty, serviceRecord.Notice, serviceRecord); e.KilometerPauschale = Math.Round(distanceRounded * (double)pauschVar, 2, MidpointRounding.AwayFromZero);