Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

moved the calculation of the completed result to XMLDeclarationReportCompletedVehicle and pass it to MRF & CIF with a Func<>

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

# Conflicts:
#	VectoCore/VectoCoreTest/Integration/Declaration/PrimaryBus/PrimaryBusSimulation.cs

PEV Completed bus, calculate AuxHeater Fuel consumption in moddatapost processing, and write fuel consumption in MRF

do not calculate electric energy consumption factor in Primary ElectricEnergyConsumption is null or 0

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

Harald Martini authored 1 year ago and Markus Quaritsch committed 1 year ago

Merge in VECTO/mq_vecto-dev from VECTO/hm_vecto-dev:feature/VECTO-1724-multistep-ui-1731-declaration-mode to feature/VECTO-1731-declaration-mode-xev-primary-bus

* commit 'eec32afe': (38 commits)
  show xEV specific parameters in auxiliary view
  updated writing of airdrag component from airdragviewmodel
  renamed show in file explorer to reveal in file explorer
  changed label of Airdrag Area
  updated mock data, updated binding for iepc vehicle writer
  updated primary vehicle checks in create vif viewmodel
  moved completedbusarchitecture out of Interimstage viewmodel, Added property to manufacturing stage viewmodel
  updated component input factory, updated airdrag viewmodel v10
  updated multistage auxiliary viewmodels
  added airdrag writer 1.0 and 2.4
  update writing of stepinput
  hide architecture combobox if property is missing
  updated views after architecture change, restore selected component
  added tests for different step input types
  started splitting viewmodel bindings into different resource dictionaries, added different completed bus view models
  created VehicleViewModelFactory, refactored InterimstageVehicleViewModel
  added test with mock input data for documentviewmodel factory
  refactored componentviewmodelfactory, added tests for airdrag viewmodels
  added IXMLComponentInputReader to multistage dependencies, updated loading airdrag data
  cleaned up viewmodel factories
  ...

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

refacotring data adapter: use separate vehicle data adapter for exempted vehicles, PEV Buses and HEV buses (neccessary for generic bus curb mass calculation

Update Reading VIF: do not read internal resistance of supercap from VIF
Update Writing VIF: do not write internal resistance of supercap to VIF

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus

adding serialization methods for battery parameters (necessary for exporting JSON data to validate factor method params)