Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 3e8c2685 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

do not write fuel consumption if the fuelconsumptionwriter is null

parent 4286fd3e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment