Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 5a457d1c authored by Harald Martini's avatar Harald Martini
Browse files

write empty string in ManufacturerReport if digestvalue is null

parent edaa4362
No related branches found
No related tags found
No related merge requests found
Showing
with 13 additions and 13 deletions
......@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
? null
: new XElement(_mrf + XMLNames.Component_CertificationNumber, inputData.CertificationNumber),
new XElement(_mrf + "CdxA", inputData.AirDragArea.ToXMLFormat(2)),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, inputData.DigestValue.DigestValue));
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, inputData.DigestValue?.DigestValue ?? ""));
}
#endregion
......
......@@ -23,7 +23,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
return new XElement(_mrf + XMLNames.Component_Angledrive,
new XElement(_mrf + XMLNames.Component_Model, angleDriveData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, angleDriveData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, angleDriveData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, angleDriveData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Component_CertificationMethod, angleDriveData.CertificationMethod.ToXMLFormat()),
new XElement(_mrf + "AngledriveRatio", angleDriveData.Ratio.ToXMLFormat(3)));
}
......
......@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_Model, axleGearInputData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, axleGearInputData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue,
axleGearInputData.DigestValue.DigestValue),
axleGearInputData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Component_CertificationMethod,
axleGearInputData.CertificationMethod.ToXMLFormat()),
new XElement(_mrf + "AxleType", axleGearInputData.LineType.ToXMLFormat()),
......
......@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Report_Tyre_TyreDimension, axleDeclaration.Tyre.Dimension),
new XElement(_mrf + XMLNames.Component_CertificationNumber, axleDeclaration.Tyre.CertificationNumber),
new XElement(_mrf + "SpecificRRC", axleDeclaration.Tyre.RollResistanceCoefficient.ToXMLFormat(4)),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, axleDeclaration.Tyre.DigestValue.DigestValue)));
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, axleDeclaration.Tyre.DigestValue?.DigestValue ?? "")));
result.Add(axle);
}
......
......@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
electricMachineSystem.Add(new XElement(_mrf + XMLNames.Component_Model, electricMachine.ElectricMachine.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, electricMachine.ElectricMachine.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, electricMachine.ElectricMachine.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, electricMachine.ElectricMachine.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.ElectricMachine_ElectricMachineType, electricMachine.ElectricMachine.ElectricMachineType),
new XElement(_mrf + XMLNames.Component_CertificationMethod, electricMachine.ElectricMachine.CertificationMethod),
new XElement(_mrf + "RatedPower", electricMachine.ElectricMachine.R85RatedPower.ToXMLFormat(0)));
......@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
result.Add(new XElement(_mrf + XMLNames.Component_ADC,
new XElement(_mrf + XMLNames.Component_Model, adc.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, adc.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, adc.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, adc.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Component_CertificationMethod, adc.CertificationMethod.ToXMLFormat()),
new XElement(_mrf + XMLNames.AngleDrive_Ratio, adc.Ratio.ToXMLFormat(3)))
);
......
......@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
var result = new XElement(_mrf + XMLNames.Component_Engine,
new XElement(_mrf + XMLNames.Component_Model, engineData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, engineData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, engineData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, engineData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Engine_RatedPower, engineData.RatedPowerDeclared.ToXMLFormat(0)),
new XElement(_mrf + XMLNames.Engine_IdlingSpeed, inputData.JobInputData.Vehicle.EngineIdleSpeed.AsRPM.ToXMLFormat(0)),
new XElement(_mrf + XMLNames.Engine_RatedSpeed, inputData.JobInputData.Vehicle.Components.EngineInputData.RatedSpeedDeclared.AsRPM.ToXMLFormat(0)),
......
......@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
var iepcXElement = new XElement(_mrf + "IEPCSpecifications",
new XElement(_mrf + XMLNames.Component_Model, iepcData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, iepcData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, iepcData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Engine_RatedPower, iepcData.R85RatedPower.ToXMLFormat()));
//new XElement(_mrf + "MaxContinuousPower",(iepcData.ContinuousTorque*iepcData.ContinuousTorqueSpeed).ToXMLFormat()),
......
......@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XAttribute("stringId", electricStorage.StringId),
new XElement(_mrf + XMLNames.Component_Model, battery.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, battery.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, battery.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, battery.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.BusAux_ElectricSystem_NominalVoltage, BatterySOCReader.Create(battery.VoltageCurve).Lookup(0.5).ToXMLFormat(0)),
new XElement(_mrf + "TotalStorageCapacity", battery.Capacity.AsAmpHour.ToXMLFormat(0)),
new XElement(_mrf + "TotalUsableCapacityInSimulation", battery.TotalUsableCapacityInSimulation().AsAmpHour),
......@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Capacitor_Capacitance, superCap.Capacity.ToXMLFormat()),
new XElement(_mrf + XMLNames.Capacitor_MinVoltage, superCap.MinVoltage),
new XElement(_mrf + XMLNames.Capacitor_MaxVoltage, superCap.MinVoltage),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, superCap.DigestValue.DigestValue)
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, superCap.DigestValue?.DigestValue ?? "")
);
} else {
throw new VectoException("Invalid REESS type");
......
......@@ -23,7 +23,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_Model,
inputData.JobInputData.Vehicle.Components.RetarderInputData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber, retarderData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, retarderData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, retarderData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Component_CertificationMethod,
retarderData.CertificationMethod.ToXMLFormat()));
return result;
......
......@@ -23,7 +23,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_Model, torqueConverterInputData.Model),
new XElement(_mrf + XMLNames.Component_CertificationNumber,
torqueConverterInputData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, torqueConverterInputData.DigestValue.DigestValue),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue, torqueConverterInputData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + XMLNames.Component_CertificationMethod,
torqueConverterInputData.CertificationMethod.ToXMLFormat()));
}
......
......@@ -25,7 +25,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
new XElement(_mrf + XMLNames.Component_CertificationNumber,
vehicleComponents.GearboxInputData.CertificationNumber),
new XElement(_mrf + XMLNames.DI_Signature_Reference_DigestValue,
vehicleComponents.GearboxInputData.DigestValue.DigestValue),
vehicleComponents.GearboxInputData.DigestValue?.DigestValue ?? ""),
new XElement(_mrf + "Type",
vehicleComponents.GearboxInputData.Type.ToXMLFormat()),
new XElement(_mrf + "NrOfGears", vehicleComponents.GearboxInputData.Gears.Count),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment