Fix missing values resulting in data being rendered in wrong columns.

This commit is contained in:
Purwa Shrivastava
2019-12-10 12:29:28 +01:00
parent 96f09f9323
commit eac9fd2a5f
2 changed files with 25 additions and 66 deletions

View File

@@ -43,20 +43,42 @@ class DataTable extends React.PureComponent {
return injectSeparatorsArray;
}
let measurementDataRow = [],
index = 0;
const measurementDataRow = [];
let index = 0,
match;
dimension2.forEach((dim2) => {
measurements.forEach((measure) => {
measurements.forEach((measure, mesInd) => {
for (index = 0; index < injectSeparatorsArray.length; index++) {
match = false;
if (injectSeparatorsArray[index].parents && dimension1[dimIndex].displayValue === injectSeparatorsArray[index].parents.dimension1.header) {
if (dim2.displayValue === injectSeparatorsArray[index].parents.dimension2.header) {
if (measure.name === injectSeparatorsArray[index].parents.measurement.header) {
measurementDataRow.push(injectSeparatorsArray[index]);
match = true;
break;
}
}
}
}
if (!match) {
measurementDataRow.push({
displayValue: '',
parents: {
dimension1: {
elementNumber: dimension1[dimIndex].elementNumber,
header: dimension1[dimIndex].displayValue
},
dimension2: {
elementNumber: dim2.elementNumber,
header: dim2.displayValue
},
measurement: {
header: measure.name,
index: mesInd
}
}
});
}
});
});
return measurementDataRow;