Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
3 files
+ 83
7
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -30,11 +30,25 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
@Input() sensorDataArray!:[SensorData[]]
dataParentArray:[Number[]]=[[]]
dataParentArrayOptions:[ReadingPayload.SensorErrorEnum[]]=[[]]
dataParentArrayError:ReadingPayload.SensorErrorEnum[][]=[]
dataChartJsSymbol:String[][]=[]
//fill some data in
testData: Number[][] = [[]]
timeStampsAsHour:any
//*************************lineChart-Trio*****************************
footer = (tooltipItems:any) => {
let i = 0;
let j= 0;
tooltipItems.forEach(function(tooltipItem:any) {
i = tooltipItem.datasetIndex;
j = tooltipItem.dataIndex
});
if(this.dataParentArrayError[i+2][j]=='NO_ERROR')
return ;
return this.dataParentArrayError[i+2][j];
};
linConfig:any={
type:'line',
data:{datasets: [{},]},
@@ -50,11 +64,19 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
plugins:{
legend: {
display: false
},
tooltip: {
callbacks: {
footer: this.footer,
}
}
}
}
}
linechart: any;
ngAfterViewInit() {
this.linConfig.data.labels=this.timeStampsAsHour
@@ -83,7 +105,10 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
borderColor:(rgb+'0.8)'),
tension:0.2,
data:this.dataParentArray.at(i+2),
pointStyle: 'circle',
pointStyle: this.dataParentArrayError.at(i+2)?.map(error=>error=="NO_ERROR"?"circle":"triangle"),
pointRadius: this.dataParentArrayError.at(i+2)?.map(error=>error=="NO_ERROR"?5:20),
pointBackgroundColor: this.dataParentArrayError.at(i+2)?.map(error=>error=="NO_ERROR"?"rgba(0,0,0,0)":"rgba(255,0,0,0.5)"),
}));
this.linConfig.data.datasets=dataSet
@@ -105,15 +130,16 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
//Map the SensorData
this.dataParentArray=[[]]
this.dataParentArrayOptions=[[]]
this.dataParentArrayError=[[]]
this.sensorDataArray.forEach(
sensDat=>{
this.dataParentArray.push(sensDat.map(x=>x.readings.map(y=>y.value)).flat())
this.dataParentArrayOptions.push(sensDat.map(x=>x.errorStatus))
this.dataParentArrayError.push(sensDat.map(x=>x.errorStatus))
}
)
this.testData= [[1,2,3,4],[5,6,7,8],[9,10,11,12]];
this.logger.info("SensorData got from Server",this.dataParentArray)
this.logger.info("SensorDataError got from Server",this.dataParentArrayOptions)
this.logger.info("SensorDataError got from Server",this.dataParentArrayError)
this.logger.info("Finished Mapping data")
}
}
@@ -123,3 +149,5 @@ function getRandomColor(): string {
const b = Math.floor(Math.random() * 256);
return `rgba(${r}, ${g}, ${b}, `;
}
Loading