From f2fc841c9e02a2d474b344ea222ba76c35bccf27 Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Tue, 7 Feb 2023 16:57:19 +0100 Subject: [PATCH] use NonEMS values for EMS missions --- .../Models/Declaration/VehicleOperation/MileageLookup.cs | 4 ++-- .../Declaration/VehicleOperation/StationaryChargingLookup.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VectoCore/VectoCore/Models/Declaration/VehicleOperation/MileageLookup.cs b/VectoCore/VectoCore/Models/Declaration/VehicleOperation/MileageLookup.cs index 40c72e64b6..bbe74eae04 100644 --- a/VectoCore/VectoCore/Models/Declaration/VehicleOperation/MileageLookup.cs +++ b/VectoCore/VectoCore/Models/Declaration/VehicleOperation/MileageLookup.cs @@ -15,7 +15,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation { #region Overrides of LookupData protected override string ResourceId => "TUGraz.VectoCore.Resources.Declaration.VehicleOperation.AnnualMileage.csv"; - protected override string ErrorMessage => "Error looking up mileage"; + protected override string ErrorMessage => "Error looking up mileage {0}"; protected override void ParseData(DataTable table) { @@ -41,7 +41,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation public MileageEntry Lookup(VehicleClass hdvClass, MissionType mission) { - return Lookup(hdvClass.GetClassNumber(), mission); + return Lookup(hdvClass.GetClassNumber(), mission.GetNonEMSMissionType()); } diff --git a/VectoCore/VectoCore/Models/Declaration/VehicleOperation/StationaryChargingLookup.cs b/VectoCore/VectoCore/Models/Declaration/VehicleOperation/StationaryChargingLookup.cs index 7b713c32a4..6d84b2d5b5 100644 --- a/VectoCore/VectoCore/Models/Declaration/VehicleOperation/StationaryChargingLookup.cs +++ b/VectoCore/VectoCore/Models/Declaration/VehicleOperation/StationaryChargingLookup.cs @@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.Models.Declaration.VehicleOperation public T Lookup(VehicleClass hdvClass, MissionType mission) { - return ConvertValue(Lookup(hdvClass.GetClassNumber(), mission)); + return ConvertValue(Lookup(hdvClass.GetClassNumber(), mission.GetNonEMSMissionType())); } protected abstract T ConvertValue(double val); -- GitLab