Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
2 files
+ 42
0
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -16,6 +16,9 @@ export class CjsTimelineMultiple implements OnInit, OnChanges {
@Input() chartId: String = 'test'
@Input() sensorData!: SensorData[]
@Input() sensorDataArray!: [SensorData[]]
@Input() from!:Date|null;
@Input() to!:Date|null;
dataParentArray: [Number[]] = [[]]
dataParentArrayError: ReadingPayload.SensorErrorEnum[][] = []
timeStampsAsHour: any
@@ -218,6 +221,44 @@ export class CjsTimelineMultiple implements OnInit, OnChanges {
?.map((x) => x.timestamp)
?.map((x) => datePipe.transform(x, 'dd-HH:mm')) ?? []
//Todo fix Date issue
//**new code Todo refacting from
let checkValidDate=(date:Date|null):boolean=>{
if (date && !isNaN(date.getTime()))
return true;
else
return false;
}
let checkValidEnddate = (lastDate:Date,to:Date|null):boolean=>{
if (checkValidDate(lastDate)&&checkValidDate(to) && lastDate.getDay()==to?.getDay())
return true;
else
return false;
}
let timeDifference=(from:Date,to:Date):number=>{
if (checkValidDate(from)&&checkValidDate(to))
return to?.getTime()-from?.getTime();
else
return 0;
}
let timestamp:string[]=[]
if(this.sensorDataArray.at(0)!=undefined)
timestamp=this.sensorDataArray.at(1)?.map(x=>x.timestamp)??[];
let lastDateUser=new Date(this.to?.toUTCString()??"")
let lastDateData=new Date(timestamp.at(timestamp.length-1)??"")
let bevorelastDateData=new Date(timestamp.at(timestamp.length-2)??"")
let timeDiff=timeDifference(bevorelastDateData,lastDateData)
let missingData:string[]=[]
for (let date:Date = lastDateData; date <= lastDateUser; date.setTime(date.getTime() + timeDiff)) {
missingData.push(date.toUTCString());
}
//**Todo end section
this.logger.info('Timeline got from Server #gS', this.timeStampsAsHour)
//Map the SensorData
Loading