Skip to content
Snippets Groups Projects
Commit 23c6d2bc authored by Bilal Hassan's avatar Bilal Hassan
Browse files

refactoring finished

-tested the functionality after finished refactoring
parent 8ef7b46b
No related branches found
No related tags found
4 merge requests!25Draft: Resolve #78,!7fixUrlPath,!4merge dev into main,!1after meeting with zoe
......@@ -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)
......
......@@ -7,10 +7,14 @@ import {DatePipe} from "@angular/common";
import {LogLevel, MyLoggerServiceService} from "../../../shared/service/my-logger-service.service";
import {HttpClient} from "@angular/common/http";
import {ClientControllerService,HostControllerService, SensorControllerService,
import {
ClientControllerService, HostControllerService, ReadingPayload, SensorControllerService,
Station,
StationControllerService,ThreePhaseDendrometer} from "../../../../../projects/generated-api/src";
StationControllerService, ThreePhaseDendrometer
} from "../../../../../projects/generated-api/src";
import {UnsubscribeOnDestroy} from "../../../shared/unsubscribeOnDestroy.class";
import {MapperService} from "../../../shared/service/mapper.service";
import SensorErrorEnum = ReadingPayload.SensorErrorEnum;
@Component({
selector: 'app-pro-view',
......@@ -44,6 +48,8 @@ export class ProViewComponent extends UnsubscribeOnDestroy implements OnInit,OnD
sensorDataArray:[SensorData[]]=[[]]
station!: Observable<Array<Station>>;
sensorErrorEnum:SensorErrorEnum=SensorErrorEnum.NOERROR
constructor(private stationControllerService: StationControllerService,private hostControllerService:HostControllerService,
private clientControllerService:ClientControllerService,
private sensorControllerService:SensorControllerService,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment