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

fix(dcc document): add namespace when dcc is created without xml

parent faa1c194
Branches
No related tags found
No related merge requests found
import { DigitalCalibrationCertificate } from "./DigitalCalibrationCertificate"; import { DigitalCalibrationCertificate } from "./DigitalCalibrationCertificate";
import { js2xml, xml2js } from "xml-js"; import { js2xml, xml2js } from "xml-js";
import { XMLElement } from "./XMLElement";
export class DCCDocument extends XMLElement { export class DCCDocument {
_declaration: any; _declaration: any;
digitalCalibrationCertificate: DigitalCalibrationCertificate; digitalCalibrationCertificate: DigitalCalibrationCertificate;
constructor(xml?: string) { constructor(xml?: string) {
super();
if (xml) { if (xml) {
let parsed: any = xml2js(xml, { let parsed: any = xml2js(xml, {
compact: true, compact: true,
...@@ -27,12 +24,6 @@ export class DCCDocument extends XMLElement { ...@@ -27,12 +24,6 @@ export class DCCDocument extends XMLElement {
this.digitalCalibrationCertificate = new DigitalCalibrationCertificate(parsed.digitalCalibrationCertificate); this.digitalCalibrationCertificate = new DigitalCalibrationCertificate(parsed.digitalCalibrationCertificate);
} else { } else {
this._declaration = { _attr: { version: "1.0", encoding: "UTF-8" } }; this._declaration = { _attr: { version: "1.0", encoding: "UTF-8" } };
this._attr = {
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:schemaLocation": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/DCC dcc.xsd",
"xmlns:dcc": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/DCC",
"xmlns:si": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/SI",
};
this.digitalCalibrationCertificate = new DigitalCalibrationCertificate(); this.digitalCalibrationCertificate = new DigitalCalibrationCertificate();
} }
} }
......
...@@ -8,6 +8,14 @@ export class DigitalCalibrationCertificate extends XMLElement { ...@@ -8,6 +8,14 @@ export class DigitalCalibrationCertificate extends XMLElement {
constructor(options: Partial<DigitalCalibrationCertificate> = {}) { constructor(options: Partial<DigitalCalibrationCertificate> = {}) {
super(options); super(options);
this._attr = {
"xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"xsi:schemaLocation": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/DCC dcc.xsd",
"xmlns:dcc": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/DCC",
"xmlns:si": "https://intranet.ptb.de/fileadmin/dokumente/intranet/abteilungen/abteilung_1/Digitaler_Kalibrierschein/SI",
...options._attr,
};
this.administrativeData = new AdministrativeData(options.administrativeData); this.administrativeData = new AdministrativeData(options.administrativeData);
this.measurementResults = options.measurementResults; this.measurementResults = options.measurementResults;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment