diff --git a/src/DCC.ts b/src/DCC.ts index 9f18e2f24e5bb72afb7647f13ebe10633aeff717..06c1e4b218b7e9f587ced5d106dd75c45e292d1b 100644 --- a/src/DCC.ts +++ b/src/DCC.ts @@ -160,6 +160,7 @@ export class CoreDataType extends DCCXMLElement { beginPerformanceDate: DCCXMLDate; endPerformanceDate: DCCXMLDate; performanceLocation: PerformanceLocationType; + issueDate: DCCXMLDate; previousReport?: HashType; constructor(el: Partial<CoreDataType> = {}) { @@ -173,6 +174,7 @@ export class CoreDataType extends DCCXMLElement { this.beginPerformanceDate = new DCCXMLDate(el.beginPerformanceDate); this.endPerformanceDate = new DCCXMLDate(el.endPerformanceDate); this.performanceLocation = new PerformanceLocationType(el.performanceLocation); + if (el.issueDate) this.issueDate = new DCCXMLDate(el.issueDate); if (el.previousReport) this.previousReport = new HashType(el.previousReport); } } @@ -232,7 +234,7 @@ export class ContactType extends DCCXMLElement { _attr: IIdAttributes; name: TextType; - eMail: DCCXMLElement; + eMail?: DCCXMLElement; phone?: DCCXMLElement; fax?: DCCXMLElement; location: LocationType; @@ -241,7 +243,7 @@ export class ContactType extends DCCXMLElement { constructor(el: Partial<ContactType> = {}) { super(el); this.name = new TextType(el.name); - this.eMail = new DCCXMLElement(el.eMail); + if (el.eMail) this.eMail = new DCCXMLElement(el.eMail); if (el.phone) this.phone = new DCCXMLElement(el.phone); if (el.fax) this.fax = new DCCXMLElement(el.fax); this.location = new LocationType(el.location); @@ -949,6 +951,7 @@ export class QuantityType extends DCCXMLElement { // region choice noQuantity?: RichContentType; + charsXMLList?: DCCXMLList; /** Metadata element definition for a real measurement quantity. * * The following statements of a real quantity are possible. @@ -1105,6 +1108,7 @@ export class QuantityType extends DCCXMLElement { // choice if (el.noQuantity) this.noQuantity = new RichContentType(el.noQuantity); + else if (el.charsXMLList) this.charsXMLList = new DCCXMLList(el.charsXMLList); else if (el.real) this.real = new si.RealQuantityType(el.real); else if (el.list) this.list = new si.SIListType(el.list); else if (el.hybrid) this.hybrid = new si.HybridType(el.hybrid);