diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs index 1ef41b05e93d8d4873cd60c5f61b4dac220f9e89..24db8643b30c0468a5303b004934d7d915526674 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CIFWriter/VehicleGroups.cs @@ -432,7 +432,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation new XElement(_cif + XMLNames.Component_Model, consolidatedVehicle.Model), new XElement(_cif + XMLNames.CorrectedActualMass, consolidatedVehicle.CurbMassChassis.ValueAsUnit("kg", 0)), new XElement(_cif + XMLNames.Vehicle_ZeroEmissionVehicle, consolidatedVehicle.ZeroEmissionVehicle), - new XElement(_cif + XMLNames.Vehicle_HybridElectricHDV, consolidatedVehicle.HybridElectricHDV), new XElement(_cif + XMLNames.Vehicle_RegisteredClass, consolidatedVehicle.RegisteredClass.ToXMLFormat()), new XElement(_cif + "TotalNumberOfPassengers", consolidatedVehicle.NumberPassengerSeatsLowerDeck + consolidatedVehicle.NumberPassengerSeatsUpperDeck diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs index f6fc065453568da1a659b5e7ecf92b36e4d2abef..1c3e72be725fa33daf57cb5b32df62da5adcecc5 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/MRFVehicleWriter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Linq; using TUGraz.VectoCommon.InputData; +using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Resources; using TUGraz.VectoCore.Utils; @@ -501,7 +502,22 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport. stepCount: manufacturingStageInputData.StepCount)); } result.Add(_mrfFactory.GetGeneralVehicleOutputGroup().GetElements(multistageInputdata.JobInputData.ConsolidateManufacturingStage.Vehicle)); - result.Add(_mrfFactory.GetCompletedBusSequenceGroup().GetElements(consolidatedVehicleData)); + result.Add( + new XElement(_mrf + XMLNames.CorrectedActualMass, + consolidatedVehicleData.CurbMassChassis.ToXMLFormat(0)), + new XElement(_mrf + XMLNames.Vehicle_ZeroEmissionVehicle, consolidatedVehicleData.ZeroEmissionVehicle), + new XElement(_mrf + XMLNames.Vehicle_RegisteredClass, + consolidatedVehicleData.RegisteredClass.ToXMLFormat()), + new XElement(_mrf + XMLNames.Bus_NumberPassengersUpperDeck, + consolidatedVehicleData.NumberPassengerSeatsUpperDeck + + consolidatedVehicleData.NumberPassengersStandingUpperDeck), + new XElement(_mrf + XMLNames.Bus_NumberPassengersLowerDeck, + consolidatedVehicleData.NumberPassengerSeatsLowerDeck + + consolidatedVehicleData.NumberPassengersStandingLowerDeck), + new XElement(_mrf + XMLNames.Vehicle_BodyworkCode, consolidatedVehicleData.VehicleCode.ToXMLFormat()), + new XElement(_mrf + XMLNames.Bus_LowEntry, consolidatedVehicleData.LowEntry) + ); + //result.Add(_mrfFactory.GetCompletedBusSequenceGroup().GetElements(consolidatedVehicleData)); return result; //return new XElement(_mrf + XMLNames.Component_Vehicle,