From 05eb7fa1719214a88b6b0eed9c2fa99670cccd15 Mon Sep 17 00:00:00 2001
From: csba1652 <Bilal.Hassan@student.uibk.ac.at>
Date: Tue, 23 May 2023 19:44:17 +0100
Subject: [PATCH] working in Marking Errors in Pro View
---
projects/generated-api/src/model/sensor.ts | 6 +++---
src/app/app.component.html | 2 +-
.../charts/Cjs-timeline-multiple/light-chart.component.ts | 6 ++++--
src/app/module/components/pro-view/pro-view.component.ts | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/projects/generated-api/src/model/sensor.ts b/projects/generated-api/src/model/sensor.ts
index a3a2146..a2a6b2b 100644
--- a/projects/generated-api/src/model/sensor.ts
+++ b/projects/generated-api/src/model/sensor.ts
@@ -3,7 +3,7 @@
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
*
* OpenAPI spec version: v0
- *
+ *
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
@@ -11,7 +11,7 @@
*/
import { Measurement } from './measurement';
-export interface Sensor {
+export interface Sensor {
id?: string;
name?: string;
protocol?: string;
@@ -20,4 +20,4 @@ export interface Sensor {
uniqueHardwareName?: string;
description?: string;
measurements?: Array<Measurement>;
-}
\ No newline at end of file
+}
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 8f1fd9f..70e3b6e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,2 +1,2 @@
-<router-outlet name="main"></router-outlet>
+<app-pro-view></app-pro-view>
diff --git a/src/app/module/components/charts/Cjs-timeline-multiple/light-chart.component.ts b/src/app/module/components/charts/Cjs-timeline-multiple/light-chart.component.ts
index 4b7571f..882c956 100644
--- a/src/app/module/components/charts/Cjs-timeline-multiple/light-chart.component.ts
+++ b/src/app/module/components/charts/Cjs-timeline-multiple/light-chart.component.ts
@@ -4,6 +4,7 @@ import {Chart} from "chart.js/auto";
import {DatePipe} from "@angular/common";
import {LogLevel, MyLoggerServiceService} from "../../../../shared/service/my-logger-service.service";
import {SensorData} from "../../pro-view/pro-view.component";
+import {ReadingPayload} from "../../../../../../projects/generated-api/src";
@Component({
@@ -29,7 +30,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
@Input() sensorDataArray!:[SensorData[]]
dataParentArray:[Number[]]=[[]]
- dataParentArrayOptions:[Number[]]=[[]]
+ dataParentArrayOptions:[ReadingPayload.SensorErrorEnum[]]=[[]]
timeStampsAsHour:any
@@ -108,10 +109,11 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
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.dataParentArrayOptions.push(sensDat.map(x=>x.errorStatus))
}
)
this.logger.info("SensorData got from Server",this.dataParentArray)
+ this.logger.info("SensorDataError got from Server",this.dataParentArrayOptions)
this.logger.info("Finished Mapping data")
}
}
diff --git a/src/app/module/components/pro-view/pro-view.component.ts b/src/app/module/components/pro-view/pro-view.component.ts
index cec400d..e7bca9f 100644
--- a/src/app/module/components/pro-view/pro-view.component.ts
+++ b/src/app/module/components/pro-view/pro-view.component.ts
@@ -254,5 +254,6 @@ export interface SensorData {
sensorName: string;
timestamp: string;
uniqueHardwareName: string;
+ errorStatus: ReadingPayload.SensorErrorEnum;
}
--
GitLab