Skip to content
Snippets Groups Projects

merge dev into main

Merged Zoe Michaela Dietmar Pfister requested to merge develop into main
8 files
+ 177
50
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -21,6 +21,61 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
ngOnInit(): void {
this.mapData();
this.test();
}
test(){
let data = [
{ timestamp: "2022-04-13T23:00:00.000+00:00", uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319", rawValue: 8462.733, sensorName: "Dendrometer_2_µm", readings: [{ name: "CIRCUMFERENCE_INCREMENT", value: 8463.733 }] },
{ timestamp: "2022-04-13T23:30:00.000+00:00", uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319", rawValue: 8465.036, sensorName: "Dendrometer_2_µm", readings: [{ name: "CIRCUMFERENCE_INCREMENT", value: 8466.036 }] },
{ timestamp: "2022-04-14T00:00:00.000+00:00", uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319", rawValue: 8470.066, _id: "647f50ba6b29677f7a535f2a", sensorName: "Dendrometer_2_µm" },
{ timestamp: "2022-04-14T00:30:00.000+00:00", uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319", rawValue: 8470.743, _id: "647f50ba6b29677f7a535f2b", sensorName: "Dendrometer_2_µm" },
{ timestamp: "2022-04-14T01:00:00.000+00:00", uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319" }
];
let datePipe = new DatePipe('en-US');
let startDate: Date;
let endDate: Date;
let newData = [];
let selectedStartDate =datePipe.transform("2022-04-13T23:00:00.000+00:00", 'yyyy-MM-dd');
let selectedEndDate = datePipe.transform("2022-04-16T01:00:00.000+00:00", 'yyyy-MM-dd');
startDate = new Date("2022-04-13T23:00:00.000+00:00");
endDate = new Date("2022-04-16T01:00:00.000+00:00");
const date1 = new Date("2022-04-13T22:00:00.000+00:00");
const date2 = new Date("2022-04-13T23:00:00.000+00:00");
const timeDiff2 = date2.getTime() - date1.getTime();
const date3 = new Date(date2.getTime() + timeDiff2);
console.log("start date",startDate)
console.log("end date",endDate)
console.log("date3",date3.toISOString())
const firstDate = new Date(data[0].timestamp);
const secondDate = new Date(data[1].timestamp);
const timeDiff = Math.abs(secondDate.getTime() - firstDate.getTime()) / (1000 * 60);
console.log("timeDiff date",timeDiff)
let date = startDate;
console.log("date test ",date.toISOString())
console.log("datediff test ",timeDiff2)
date.setTime(date.getTime() + timeDiff2)
console.log("date test ",date.toISOString())
for (let date = startDate; date <= endDate; date.setTime(date.getTime() + timeDiff2)) {
const dateString = datePipe.transform(date, 'yyyy-MM-dd');
const matchingData =data.find(d => datePipe.transform(new Date(d.timestamp), 'yyyy-MM-dd') === dateString);
const newDataObject = {
timestamp: date.toISOString(),
uniqueHardwareName: "74:29:51:46:8e:c4_DR26_I2C_748ca319",
readings: [{name: "CIRCUMFERENCE_INCREMENT", value: null}]
}
newData.push(newDataObject);
}
console.log("newData date",newData)
}
@ViewChild('myCanvas') canvas!: ElementRef;
@@ -119,7 +174,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
let datePipe = new DatePipe('en-US');
if(this.sensorDataArray.at(0)!=undefined)
this.timeStampsAsHour = this.sensorDataArray.at(1)?.map(x => x.timestamp)
?.map(x => datePipe.transform(x, 'HH:mm'))
?.map(x => datePipe.transform(x, 'dd-HH:mm'))
?? [];
this.logger.info("Timeline got from Server #gS",this.timeStampsAsHour)
Loading