diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs index aff066ceb4ec251e63c6f71d83c66eb26ffcf077..fb1e35a525791ecc9fc3e59a4756bd5caab7160f 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs @@ -15,16 +15,19 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common #region Overrides of AbstractResultWriter public override XElement GetElement(IResultEntry entry) - { - return new XElement(TNS + XMLNames.Report_ResultEntry_Total, - VehiclePerformanceWriter.GetElement(entry), - entry.FuelData.Select(f => - FuelConsumptionWriter?.GetElement(entry, entry.FuelConsumptionFinal(f.FuelType))), - ElectricEnergyConsumptionWriter?.GetElement(entry), - CO2Writer?.GetElements(entry), - ElectricRangeWriter?.GetElements(entry) - ); - } + { + var fcWrtier = FuelConsumptionWriter; + return new XElement(TNS + XMLNames.Report_ResultEntry_Total, + VehiclePerformanceWriter.GetElement(entry), + fcWrtier != null + ? entry.FuelData.Select(f => + fcWrtier.GetElement(entry, entry.FuelConsumptionFinal(f.FuelType))) + : null, + ElectricEnergyConsumptionWriter?.GetElement(entry), + CO2Writer?.GetElements(entry), + ElectricRangeWriter?.GetElements(entry) + ); + } #endregion diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs index e629f871b1711264e98350a2973d7300f2767b67..815789131323d145ea53db99d24a94a04eee2c68 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs @@ -32,11 +32,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation if (weighted == null) { return null; } + + var fcWriter = FuelConsumptionWriter; return new XElement(TNS + XMLNames.Report_Results_Summary, new XAttribute(xsi + XMLNames.XSIType, ResultSummaryXMLType), GetSummary(weighted), - weighted.FuelConsumption.Select(x => - FuelConsumptionWriter?.GetElement(weighted, x.Key, x.Value)).ToArray(), + fcWriter != null + ? weighted.FuelConsumption.Select(x => + fcWriter.GetElement(weighted, x.Key, x.Value)).ToArray() + : null, ElectricEnergyConsumptionWriter?.GetElement(weighted), CO2Writer?.GetElements(weighted), ElectricRangeWriter?.GetElements(weighted)