Changed paths in Primary & Interim to relative paths

VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs

@@ -293,8 +293,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 					FileVersion = JSONJobHeader.PrimaryAndInterimVersion
 				},
 				Body = new JSONJobBody() {
-					PrimaryVehicle = PrimaryInputPath,
-					InterimStage = StageInputPath
+					PrimaryVehicle = PathHelper.GetRelativePath(path, PrimaryInputPath),
+					InterimStage = PathHelper.GetRelativePath(path, StageInputPath)
 				}
 			};
 

Vecto3GUI2020Test/TestData/newVifCompletedDiesel.json

 {
   "Header": {
     "CreatedBy": "Harry",
-    "Date": "2021-08-02T00:00:00+02:00",
+    "Date": "2021-08-03T00:00:00+02:00",
     "AppVersion": "Vecto3GUI2020",
     "FileVersion": 10
   },
   "Body": {
-    "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml",
-    "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final_noNG.xml",
+    "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml",
+    "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final_noNG.xml",
     "Completed": false
   }
 }
\ No newline at end of file

Vecto3GUI2020Test/TestData/newVifCompletedStage.json

 {
   "Header": {
     "CreatedBy": "Harry",
-    "Date": "2021-08-02T00:00:00+02:00",
+    "Date": "2021-08-03T00:00:00+02:00",
     "AppVersion": "Vecto3GUI2020",
     "FileVersion": 10
   },
   "Body": {
-    "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml",
-    "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final.xml",
+    "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml",
+    "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample_final.xml",
     "Completed": false
   }
 }
\ No newline at end of file

Vecto3GUI2020Test/TestData/newVifExempted.json

 {
   "Header": {
     "CreatedBy": "Harry",
-    "Date": "2021-07-28T00:00:00+02:00",
+    "Date": "2021-08-03T00:00:00+02:00",
     "AppVersion": "Vecto3GUI2020",
     "FileVersion": 10
   },
   "Body": {
-    "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\exempted_primary_heavyBus.xml",
-    "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-exempted_input_full-sample.xml",
+    "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\exempted_primary_heavyBus.xml",
+    "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-exempted_input_full-sample.xml",
     "Completed": false
   }
 }
\ No newline at end of file

Vecto3GUI2020Test/TestData/newVifInterimStage.json

 {
   "Header": {
     "CreatedBy": "Harry",
-    "Date": "2021-07-15T00:00:00+02:00",
+    "Date": "2021-08-03T00:00:00+02:00",
     "AppVersion": "Vecto3GUI2020",
     "FileVersion": 10
   },
   "Body": {
-    "PrimaryVehicle": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample.xml",
-    "InterimStage": "C:\\Users\\Harry\\source\\repos\\vecto-dev\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample.xml",
+    "PrimaryVehicle": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.6_Buses\\vecto_vehicle-primary_heavyBus-sample_Diesel.xml",
+    "InterimStage": "..\\..\\VectoCore\\VectoCoreTest\\TestData\\XML\\XMLReaderDeclaration\\SchemaVersion2.8\\vecto_vehicle-stage_input_full-sample.xml",
     "Completed": false
   }
 }
\ No newline at end of file

VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -1164,7 +1164,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 
 			_primaryVehicleInputDataPath = Body.GetEx<string>(JsonKeys.PrimaryVehicle);
+			_primaryVehicleInputDataPath = PathHelper.GetAbsolutePath(filename, _primaryVehicleInputDataPath);
 			_stageInputDataPath = Body.GetEx<string>(JsonKeys.InterimStage);
+			_stageInputDataPath = PathHelper.GetAbsolutePath(filename, _stageInputDataPath);
 			_completed = Body.GetValueOrDefault<bool>(JsonKeys.Completed);
 
 		}