added data validation
This commit is contained in:
@@ -91,10 +91,10 @@ export class HomeComponent implements OnInit, OnDestroy {
|
|||||||
|
|
||||||
subscribeWS() {
|
subscribeWS() {
|
||||||
this.socket$.subscribe((message) => {
|
this.socket$.subscribe((message) => {
|
||||||
// console.log(message);
|
console.log(message);
|
||||||
if (message instanceof Array) {
|
if (message instanceof Array) {
|
||||||
message.forEach(element => {
|
message.forEach(element => {
|
||||||
this.updateList(element.message);
|
this.updateList(element);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.updateList(message);
|
this.updateList(message);
|
||||||
@@ -112,22 +112,53 @@ export class HomeComponent implements OnInit, OnDestroy {
|
|||||||
// console.log(this.serverMessages);
|
// console.log(this.serverMessages);
|
||||||
// console.log(obj);
|
// console.log(obj);
|
||||||
const index = this.serverMessages.findIndex((e) => e.location === obj.location);
|
const index = this.serverMessages.findIndex((e) => e.location === obj.location);
|
||||||
obj.volumeflow = Number(obj.volumeflow.toFixed(2));
|
try {
|
||||||
obj.current = Number(obj.current.toFixed(2));
|
obj.volumeflow = Number(obj.volumeflow.toFixed(2));
|
||||||
obj.intakepressure = Number(obj.intakepressure.toFixed(2));
|
} catch {
|
||||||
obj.frequency = Number(obj.frequency.toFixed(2));
|
console.log('can transform to fixed decimal data missing or not a number');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
obj.current = Number(obj.current.toFixed(2));
|
||||||
|
} catch {
|
||||||
|
console.log('can transform to fixed decimal data missing or not a number');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
obj.intakepressure = Number(obj.intakepressure.toFixed(2));
|
||||||
|
} catch {
|
||||||
|
console.log('can transform to fixed decimal data missing or not a number');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
obj.frequency = Number(obj.frequency.toFixed(2));
|
||||||
|
} catch {
|
||||||
|
console.log('can transform to fixed decimal data missing or not a number');
|
||||||
|
}
|
||||||
|
|
||||||
if (index === -1) {
|
if (index === -1) {
|
||||||
this.serverMessages.push(obj);
|
this.serverMessages.push(obj);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.serverMessages[index] = obj;
|
if (! obj.volumeflow) {
|
||||||
|
obj.volumeflow = this.serverMessages[index].volumeflow;
|
||||||
|
}
|
||||||
|
if (! obj.current) {
|
||||||
|
obj.current = this.serverMessages[index].current;
|
||||||
|
}
|
||||||
|
if (! obj.frequency) {
|
||||||
|
obj.frequency = this.serverMessages[index].frequency;
|
||||||
|
}
|
||||||
|
if (! obj.intakepressure) {
|
||||||
|
obj.intakepressure = this.serverMessages[index].intakepressure;
|
||||||
|
}
|
||||||
|
this.serverMessages[index] = obj;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
totalFlowRates() {
|
totalFlowRates() {
|
||||||
let temp = 0;
|
let temp = 0;
|
||||||
this.serverMessages.forEach(element => {
|
this.serverMessages.forEach(element => {
|
||||||
temp += element.volumeflow;
|
if (element.volumeflow) {
|
||||||
|
temp += element.volumeflow;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return Number(temp.toFixed(2));
|
return Number(temp.toFixed(2));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user