Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
2 files
+ 12
2
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -29,6 +29,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
@Input() sensorDataArray!:[SensorData[]]
dataParentArray:[Number[]]=[[]]
dataParentArrayOptions:[Number[]]=[[]]
timeStampsAsHour:any
@@ -81,6 +82,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
borderColor:(rgb+'0.8)'),
tension:0.2,
data:this.dataParentArray.at(i+2),
pointStyle: 'circle',
}));
this.linConfig.data.datasets=dataSet
@@ -102,9 +104,11 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
//Map the SensorData
this.dataParentArray=[[]]
this.dataParentArrayOptions=[[]]
this.sensorDataArray.forEach(
sensDat=>{
this.dataParentArray.push(sensDat.map(x=>x.readings.map(y=>y.value)).flat())
//this.dataParentArrayOptions.push(sensDat.map(x=>x.readings.map(y=>y.)).flat())
}
)
this.logger.info("SensorData got from Server",this.dataParentArray)
Loading