museum-digital/csvxml
museum-digital/csvxml
33
0
Fork 0
Code Issues 3 Pull Requests Releases Activity

Improve warnings in case of missing dependent column contents

Browse Source
This commit is contained in:
Joshua Ramon Enslin 2022-11-28 14:25:11 +01:00
parent f81089ac79
commit f5ea1f850a
Signed by: jrenslin
GPG Key ID: 46016F84501B70AE
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
public/assets/js/csvxmlV2.js
View File

@ -102,6 +102,24 @@ class CsvxmlValidator {
} }
} }
let lineCounter = 1;
for (let line of this.toValidate) {
for (let fieldName in line) {
if (line[fieldName] === '') continue;
const dependencies = this.fieldList[fieldName].dependsOn;
if (dependencies === undefined) continue;
for (let dependency of dependencies) {
if (line[dependency] === '') {
this.errors.dependentColumns.push("Dependency issue at column " + fieldName + ": Corresponding column " + dependency + " is empty");
}
}
}
lineCounter++;
}
} }
checkControlledLists() { checkControlledLists() {
@ -115,7 +133,7 @@ class CsvxmlValidator {
continue; continue;
} }
let allowedValues = this.fieldList[fieldName].allowedValues; const allowedValues = this.fieldList[fieldName].allowedValues;
// No error if the field doesn't have a controlled list // No error if the field doesn't have a controlled list
if (allowedValues === undefined || allowedValues === null) continue; if (allowedValues === undefined || allowedValues === null) continue;
@ -124,6 +142,7 @@ class CsvxmlValidator {
continue; continue;
} }
if (line[fieldName] === '') continue;
this.errors.controlledLists.push("Disallowed value used for column " + fieldName + " at line " + lineCounter + " (Allowed values are: " + Object.values(allowedValues).join(", ") + "; current value is " + line[fieldName] + ")"); this.errors.controlledLists.push("Disallowed value used for column " + fieldName + " at line " + lineCounter + " (Allowed values are: " + Object.values(allowedValues).join(", ") + "; current value is " + line[fieldName] + ")");
} }
lineCounter++; lineCounter++;
@ -385,7 +404,9 @@ class CsvxmlPage {
if (field.allowedValues !== undefined) { if (field.allowedValues !== undefined) {
// Join for object // Join for object
let values = []; let values = [];
for (let key in field.allowedValues) values.push(field.allowedValues[key]); for (let key in field.allowedValues) {
values.push(field.allowedValues[key]);
}
line3.push(values.join(",")); line3.push(values.join(","));
} }
else line3.push(""); else line3.push("");