From d85001feed22514caa072cba374c71073c73257c Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Mon, 16 May 2022 13:11:31 +0200
Subject: [PATCH] added OutputDataType Property to MRF and CIF writers
---
.../AbstractCustomerReport.cs | 32 +++++++++++++--
.../CustomerInformationFile.cs | 35 ++++++++--------
.../AbstractManufacturerReport.cs | 6 +--
.../CompletedBusManufacturerReport.cs | 6 +--
.../LorryManufacturerReports.cs | 40 +++++++++----------
.../PrimaryBusManufacturerReports.cs | 24 +++++------
.../XML/XMLDeclarationReport_0_9.cs | 1 +
7 files changed, 86 insertions(+), 58 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
index 8f4d27b73d..c8989250e9 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/AbstractCustomerReport.cs
@@ -8,14 +8,21 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9
{
- public abstract class AbstractCustomerReport : IXMLCustomerReport
+ public abstract class AbstractCustomerReport : IXMLCustomerReport, IXMLMockupReport
{
protected readonly ICustomerInformationFileFactory _cifFactory;
protected XNamespace xsi = XNamespace.Get("http://www.w3.org/2001/XMLSchema-instance");
+ public static XNamespace Cif => XNamespace.Get("urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9");
protected XElement Vehicle { get; set; }
+ protected XElement Results { get; set; }
+
+ protected abstract string OutputDataType { get; }
protected AbstractCustomerReport(ICustomerInformationFileFactory cifFactory)
{
@@ -30,17 +37,36 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public void Initialize(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
InitializeVehicleData(modelData.InputData);
+ Results = new XElement(Cif + "Results");
}
public XDocument Report { get; protected set; }
+
+ private List<XMLDeclarationReport.ResultEntry> results = new List<XMLDeclarationReport.ResultEntry>();
public void WriteResult(XMLDeclarationReport.ResultEntry resultValue)
{
- throw new NotImplementedException();
+ results.Add(resultValue);
+
}
public void GenerateReport(XElement resultSignature)
{
- throw new NotImplementedException();
+ Report = new XDocument(new XElement(Cif + "VectoOutput",
+ new XAttribute("xmlns", Cif),
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi),
+ new XAttribute(XNamespace.Xmlns + "mrf", LorryManufacturerReportBase.Mrf),
+ new XAttribute(xsi + "type", $"{OutputDataType}"),
+ Vehicle,
+ Results));
+ }
+
+ #endregion
+
+ #region Implementation of IXMLMockupReport
+
+ public void WriteMockupResult(XMLDeclarationReport.ResultEntry resultValue)
+ {
+ Results.Add(MockupResultReader.GetCIFMockupResult(OutputDataType, resultValue, Cif + "Result"));
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
index 5595d6b315..8aa2511c59 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/CustomerInformationFile/CustomerInformationFile.cs
@@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport;
@@ -32,6 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#region LorryCIF
public class ConventionalLorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => XMLNames.CIF_OutputDataType_ConventionalLorryOutputType;
public ConventionalLorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -39,7 +41,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetConventionalLorryVehicleType().GetElement(inputData);
- GenerateReport("ConventionalLorryOutputType");
}
#endregion
@@ -47,6 +48,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class HEV_PxLorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_Px_LorryOutputType";
public HEV_PxLorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -55,13 +57,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
{
var vehicle = _cifFactory.GetHEV_PxLorryVehicleType();
Vehicle = _cifFactory.GetHEV_PxLorryVehicleType().GetElement(inputData);
- GenerateReport("HEV_Px_LorryOutputType");
}
#endregion
}
public class HEV_S2_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_S2_LorryOutputType";
public HEV_S2_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -69,7 +71,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetHEV_S2_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV_S2_LorryOutputType");
}
#endregion
@@ -77,6 +78,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class HEV_S3_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_S3_LorryOutputType";
public HEV_S3_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -84,7 +86,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetHEV_S3_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV_S3_LorryOutputType");
}
#endregion
@@ -92,6 +93,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class HEV_S4_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_S4_LorryOutputType";
public HEV_S4_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -99,7 +101,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetHEV_S4_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV_S4_LorryOutputType");
}
#endregion
@@ -107,6 +108,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class HEV_IEPC_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_IEPC_S_LorryOutputType";
public HEV_IEPC_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -114,7 +116,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetHEV_IEPC_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV_IEPC_S_LorryOutputType");
}
#endregion
@@ -122,6 +123,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class PEV_E2_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "PEV_E2_LorryOutputType";
public PEV_E2_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -129,7 +131,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetPEV_E2_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV_E2_LorryOutputType");
}
#endregion
@@ -137,6 +138,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class PEV_E3_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "PEV_E3_LorryOutputType";
public PEV_E3_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -144,7 +146,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetPEV_E3_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV_E3_LorryOutputType");
}
#endregion
@@ -152,6 +153,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class PEV_E4_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "PEV_E4_LorryOutputType";
public PEV_E4_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -159,7 +161,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetPEV_E4_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV_E4_LorryOutputType");
+
}
#endregion
@@ -167,6 +169,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public class PEV_IEPC_Lorry_CIF : CustomerInformationFile
{
+ protected override string OutputDataType => "PEV_IEPC_LorryOutputType";
public PEV_IEPC_Lorry_CIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory) { }
#region Overrides of AbstractCustomerReport
@@ -174,7 +177,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetPEV_IEPC_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV_IEPC_LorryOutputType");
}
#endregion
@@ -192,21 +194,23 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
#region CompletedBus
public class Conventional_CompletedBusCIF : CustomerInformationFile
- {
- public Conventional_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
+ {
+ protected override string OutputDataType => "Conventional_CompletedBusOutputType";
+
+ public Conventional_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
{
}
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetConventional_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport("Conventional_CompletedBusOutputType");
- }
+ }
}
public class HEV_CompletedBusCIF : CustomerInformationFile
{
+ protected override string OutputDataType => "HEV_CompletedBusOutputType";
public HEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
{
}
@@ -214,12 +218,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetHEV_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport("HEV_CompletedBusOutputType");
}
}
public class PEV_CompletedBusCIF : CustomerInformationFile
{
+ protected override string OutputDataType => "PEV_CompletedBusOutputType";
public PEV_CompletedBusCIF(ICustomerInformationFileFactory cifFactory) : base(cifFactory)
{
}
@@ -227,7 +231,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _cifFactory.GetPEV_CompletedBusVehicleType().GetElement(inputData);
- GenerateReport("PEV_CompltedBusOutputType");
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
index 1fa197c789..fb4804f5fc 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/AbstractManufacturerReport.cs
@@ -30,7 +30,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
protected XElement Results { get; set; }
protected XElement Vehicle { get; set; }
- public abstract string XmlOutputType { get; } //also used as name for the mockup result element
+ public abstract string OutputDataType { get; } //also used as name for the mockup result element
protected AbstractManufacturerReport(IManufacturerReportFactory MRFReportFactory)
{
@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public void WriteMockupResult(XMLDeclarationReport.ResultEntry resultValue)
{
- Results.Add(MockupResultReader.GetMockupResult(XmlOutputType, resultValue, Mrf + "Result"));
+ Results.Add(MockupResultReader.GetMRFMockupResult(OutputDataType, resultValue, Mrf + "Result"));
@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
Report = new XDocument(new XElement(Mrf + "VectoOutput",
new XAttribute("xmlns", Mrf),
new XAttribute(XNamespace.Xmlns + "xsi", xsi),
- new XAttribute(xsi + "type", $"{XmlOutputType}"),
+ new XAttribute(xsi + "type", $"{OutputDataType}"),
Vehicle,
Results));
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
index 3e0b902f93..034bfe8a5f 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/CompletedBusManufacturerReport.cs
@@ -31,7 +31,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -66,7 +66,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
index 0565626a97..af9f14df1d 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/LorryManufacturerReports.cs
@@ -1,5 +1,6 @@
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport
@@ -36,13 +37,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType => "ConventionalLorryManufacturerOutputDataType";
+
+ public override string OutputDataType =>
+ XMLNames.MRF_OutputDataType_ConventionalLorryManufacturerOutputDataType;
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetConventionalLorryVehicleType().GetElement(inputData);
-
- GenerateReport(XmlOutputType);
+
}
@@ -57,13 +59,13 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType => "HEV-Px_IHPCLorryManufacturerOutputDataType";
+ public override string OutputDataType => "HEV-Px_IHPCLorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetHEV_Px_IHCP_LorryVehicleType().GetElement(inputData);
- GenerateReport(XmlOutputType);
+ GenerateReport(OutputDataType);
}
@@ -77,12 +79,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType => "HEV-S2_LorryManufacturerOutputDataType";
+ public override string OutputDataType => "HEV-S2_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetHEV_S2_LorryVehicleType().GetElement(inputData);
- GenerateReport(XmlOutputType);
+ GenerateReport(OutputDataType);
}
#endregion
@@ -90,7 +92,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
internal class HEV_S3_LorryManufacturerReport : LorryManufacturerReportBase
{
- public override string XmlOutputType => "HEV-S3_LorryManufacturerOutputDataType";
+ public override string OutputDataType => "HEV-S3_LorryManufacturerOutputDataType";
public HEV_S3_LorryManufacturerReport(IManufacturerReportFactory MRFReportFactory) : base(MRFReportFactory)
{
@@ -102,7 +104,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetHEV_S3_LorryVehicleType().GetElement(inputData);
- GenerateReport(XmlOutputType);
+ GenerateReport(OutputDataType);
}
#endregion
@@ -114,12 +116,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "HEV-S4_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetHEV_S4_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV-S4_LorryManufacturerOutputDataType");
}
#endregion
@@ -131,12 +132,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "HEV-IEPC-S_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetHEV_IEPC_S_LorryVehicleType().GetElement(inputData);
- GenerateReport("HEV-IEPC-S_LorryManufacturerOutputDataType");
+
}
#endregion
@@ -148,12 +149,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "PEV-E2_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetPEV_E2_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV-E2_LorryManufacturerOutputDataType");
+
}
#endregion
@@ -165,12 +166,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "PEV-E3_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetPEV_E3_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV-E3_LorryManufacturerOutputDataType");
}
#endregion
@@ -182,12 +182,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "PEV-E4_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetPEV_E4_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV-E4_LorryManufacturerOutputDataType");
}
#endregion
@@ -199,12 +198,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => "PEV-IEPC_LorryManufacturerOutputDataType";
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetPEV_IEPC_LorryVehicleType().GetElement(inputData);
- GenerateReport("PEV-IEPC_LorryManufacturerOutputDataType");
}
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
index aa39121711..ca988f79c0 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReport/PrimaryBusManufacturerReports.cs
@@ -1,6 +1,7 @@
using System;
using System.Xml.Linq;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Resources;
using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReport
@@ -27,13 +28,12 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType => XMLNames.MRF_OutputDataType_ConventionalPrimaryBusManufacturerOutputDataType;
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
Vehicle = _mRFReportFactory.GetConventional_PrimaryBusVehicleType().GetElement(inputData);
-
- GenerateReport("ConventionalPrimaryBusManufacturerOutputDataType");
+
}
#endregion
@@ -45,7 +45,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -65,7 +65,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -100,7 +100,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
@@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
#region Overrides of AbstractManufacturerReport
- public override string XmlOutputType { get; }
+ public override string OutputDataType { get; }
public override void InitializeVehicleData(IDeclarationInputDataProvider inputData)
{
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
index 4715493659..70d68bdf86 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs
@@ -76,6 +76,7 @@ namespace TUGraz.VectoCore.OutputData.XML
if (Mockup) {
(ManufacturerRpt as IXMLMockupReport).WriteMockupResult(result);
+ (CustomerRpt as IXMLMockupReport).WriteMockupResult(result);
} else {
ManufacturerRpt.WriteResult(result);
CustomerRpt.WriteResult(result);
--
GitLab