Skip to content
Snippets Groups Projects
Verified Commit 6a7e66d5 authored by Jan Loewe's avatar Jan Loewe :speech_balloon:
Browse files

fix(listType): fix element order

parent 318d3cf8
No related branches found
No related tags found
No related merge requests found
import * as si from "./DSI"; import * as si from "./DSI";
import { XMLDate, XMLElement, XMLNumber, XMLBoolean, XMLList, INamespaced, ISchemaInformation, IAttributes } from "./BaseTypes"; import {
XMLDate,
XMLElement,
XMLNumber,
XMLBoolean,
XMLList,
INamespaced,
ISchemaInformation,
IAttributes,
} from "./BaseTypes";
import { ensureArray } from "./Util"; import { ensureArray } from "./Util";
const schemaVersion = "3.1.2"; const schemaVersion = "3.1.2";
...@@ -1152,11 +1161,6 @@ export class ListType extends DCCXMLElement { ...@@ -1152,11 +1161,6 @@ export class ListType extends DCCXMLElement {
if (el.name) this.name = new TextType(el.name); if (el.name) this.name = new TextType(el.name);
if (el.description) this.description = new RichContentType(el.description); if (el.description) this.description = new RichContentType(el.description);
if (el.usedMethods) this.usedMethods = new UsedMethodListType(el.usedMethods);
if (el.usedSoftware) this.usedSoftware = new SoftwareListType(el.usedSoftware);
if (el.measuringEquipments) this.measuringEquipments = new MeasuringEquipmentListType(el.measuringEquipments);
if (el.influenceConditions) this.influenceConditions = new InfluenceConditionListType(el.influenceConditions);
if (el.measurementMetaData) this.measurementMetaData = new MeasurementMetaDataListType(el.measurementMetaData);
// choice // choice
if (el.dateTime) this.dateTime = new DCCXMLDate(el.dateTime); if (el.dateTime) this.dateTime = new DCCXMLDate(el.dateTime);
...@@ -1165,6 +1169,12 @@ export class ListType extends DCCXMLElement { ...@@ -1165,6 +1169,12 @@ export class ListType extends DCCXMLElement {
// choice // choice
if (el.list) this.list = ensureArray(el.list).map((x) => new ListType(x)); if (el.list) this.list = ensureArray(el.list).map((x) => new ListType(x));
else if (el.quantity) this.quantity = ensureArray(el.quantity).map((x) => new QuantityType(x)); else if (el.quantity) this.quantity = ensureArray(el.quantity).map((x) => new QuantityType(x));
if (el.usedMethods) this.usedMethods = new UsedMethodListType(el.usedMethods);
if (el.usedSoftware) this.usedSoftware = new SoftwareListType(el.usedSoftware);
if (el.measuringEquipments) this.measuringEquipments = new MeasuringEquipmentListType(el.measuringEquipments);
if (el.influenceConditions) this.influenceConditions = new InfluenceConditionListType(el.influenceConditions);
if (el.measurementMetaData) this.measurementMetaData = new MeasurementMetaDataListType(el.measurementMetaData);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment