diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 3b45ac7055d93b53ac3a3ffb3e44c06fee1d82f5..2e3593452e13e09d39b940e9975f0514b3842b04 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -674,6 +674,12 @@ Public Class DummyVehicle
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
+ Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
+ Get
+ Throw New NotImplementedException
+ End Get
+ End Property
+
Public ReadOnly Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Get
Return Me
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 55b9a11a1040645ff2d484f931365e93972b4292..3a4cb79259122d72d14334482853e8223fb420c9 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -877,6 +877,13 @@ Public Class MockEngineeringVehicle
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
+
+ Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
+ Get
+ Throw New NotImplementedException
+ End Get
+ End Property
+
Public Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Public ReadOnly Property XMLSource As XmlNode Implements IVehicleDeclarationInputData.XMLSource
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index 3b484d4c0486e8f5305b31385f504c001eba1d8c..2c757f820b2a4908b01765dd83824f36ded8e71f 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -56,6 +56,13 @@ Public Class MockVehicleInputData
Public ReadOnly Property EntranceHeight As Meter Implements IVehicleDeclarationInputData.EntranceHeight
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
+
+ Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
+ Get
+ Throw New NotImplementedException
+ End Get
+ End Property
+
Public Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
Public ReadOnly Property XMLSource As XmlNode Implements IVehicleDeclarationInputData.XMLSource
End Class
\ No newline at end of file
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index c261e84768e1a1f185c41fbc19fe5d02cc46822e..1d7a8c0c6b31f5f142e012bfbd6636e4651a5c7d 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -481,6 +481,12 @@ Public Class Vehicle
Public ReadOnly Property DoorDriveTechnology As ConsumerTechnology? Implements IVehicleDeclarationInputData.DoorDriveTechnology
Public ReadOnly Property VehicleDeclarationType As VehicleDeclarationType Implements IVehicleDeclarationInputData.VehicleDeclarationType
+ Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
+ Get
+ Throw New NotImplementedException
+ End Get
+ End Property
+
Public ReadOnly Property IVehicleEngineeringInputData_Components As IVehicleComponentsEngineering Implements IVehicleEngineeringInputData.Components
Get
Return Me
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
index 0ddb13c270bea8d22311ea44e5eb73e0cc1e80e1..793f214e5aabb0b2f04bd09ce30d5088a7127b30 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
@@ -128,6 +128,8 @@ namespace VECTO3GUI.ViewModel.Adapter.Declaration
return GetComponentViewModel<IAirdragViewModel>(Component.Airdrag)?.ModelData;
} }
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public IVehicleComponentsDeclaration Components { get { return this; } }
public XmlNode XMLSource { get; }
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
index 9ffa326e265b11f4f4582c5fde25b96b7ff33559..08f08b6651ca607caf082b8db41a20bd87eb2665 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
@@ -355,6 +355,8 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle
public VehicleDeclarationType VehicleDeclarationType => throw new NotImplementedException();
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public virtual ConsumerTechnology DoorDriveTechnology
{
get => throw new NotImplementedException();
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 8ec5ea2bb0368fc596730f4105041be3037cd85e..109368cf097c4d46ba9f688b876bc1beace6bdb7 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -806,6 +806,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set => SetProperty(ref _vehicleDeclarationType, value);
}
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
#endregion
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 25f5345166f4ca7098313df79ea52286af85254b..32ca994977e16c68c25209357b1cf8708c56eae3 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -198,6 +198,8 @@ namespace TUGraz.VectoCommon.InputData
VehicleDeclarationType VehicleDeclarationType { get; }
+ string VehicleTypeApprovalNumber { get; }
+
// components
IVehicleComponentsDeclaration Components { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index fc5da5301d7ce9b49ee311c8298794836e71828a..a5309cc60e7190133319615cb37de0872e726f42 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -254,7 +254,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public ConsumerTechnology? DoorDriveTechnology => VehicleData.DoorDriveTechnology;
public VehicleDeclarationType VehicleDeclarationType { get; }
-
+
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
XmlNode IVehicleDeclarationInputData.XMLSource => null;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index fbbca0739dbd1ab14e456a02f36d3c3a46aeab2e..8d19b73b0f0fb1e73f4e6f204215b1ddabfbd4b4 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -289,6 +289,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
IVehicleComponentsEngineering IVehicleEngineeringInputData.Components => this;
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index ef0154c263b3a1f6297872dca8219fb1151a9159..e687c5a5fb113a88505c5187217b041ca5f977a0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -237,6 +237,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public virtual IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
@@ -698,6 +700,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public virtual IVehicleComponentsDeclaration Components => _components ?? (_components = ComponentReader.ComponentInputData);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 8c6ba087ab058d11d1c1f6cbdf4c5f5e0c1030cb..c47307e324bc31748bc76e9b309d98be527500c9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -499,6 +499,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
public VehicleDeclarationType VehicleDeclarationType => _manufacturingStages.First().Vehicle.VehicleDeclarationType;
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
#endregion
#region ManufacturingStage optional properties
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 30f573e8ee539531a322e797643f652666c36fe6..b7e5d3a86821c35144eb9f413cb0fc7ba99881de 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -148,6 +148,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public ConsumerTechnology? DoorDriveTechnology => ConsumerTechnology.Unknown;
public virtual VehicleDeclarationType VehicleDeclarationType { get; }
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public TableData MaxPropulsionTorque => null;
IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components => null;
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index b491470cb4459565e2c68edf3daef6ed8429a61a..7a38428e28025f3508b9bad3968c5767f06115dc 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -63,6 +63,9 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Meter EntranceHeight { get; }
public ConsumerTechnology? DoorDriveTechnology { get; }
public VehicleDeclarationType VehicleDeclarationType { get; }
+
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public IVehicleComponentsDeclaration Components => this;
public XmlNode XMLSource { get; }
@@ -120,6 +123,9 @@ namespace TUGraz.VectoCore.Tests.Utils {
public Meter EntranceHeight { get; }
public ConsumerTechnology? DoorDriveTechnology { get; }
public VehicleDeclarationType VehicleDeclarationType { get; }
+
+ public string VehicleTypeApprovalNumber => throw new NotImplementedException();
+
public Watt MaxNetPower2 { get; }
public string ExemptedTechnology { get; }
public RegistrationClass? RegisteredClass { get; set; }