Skip to content
Snippets Groups Projects
Commit 05eb7fa1 authored by User expired's avatar User expired
Browse files

working in Marking Errors in Pro View

parent 23c6d2bc
No related branches found
No related tags found
4 merge requests!25Draft: Resolve #78,!7fixUrlPath,!4merge dev into main,!1after meeting with zoe
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
* *
* OpenAPI spec version: v0 * OpenAPI spec version: v0
* *
* *
* NOTE: This class is auto generated by the swagger code generator program. * NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git * https://github.com/swagger-api/swagger-codegen.git
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
*/ */
import { Measurement } from './measurement'; import { Measurement } from './measurement';
export interface Sensor { export interface Sensor {
id?: string; id?: string;
name?: string; name?: string;
protocol?: string; protocol?: string;
...@@ -20,4 +20,4 @@ export interface Sensor { ...@@ -20,4 +20,4 @@ export interface Sensor {
uniqueHardwareName?: string; uniqueHardwareName?: string;
description?: string; description?: string;
measurements?: Array<Measurement>; measurements?: Array<Measurement>;
} }
\ No newline at end of file
<router-outlet name="main"></router-outlet> <app-pro-view></app-pro-view>
...@@ -4,6 +4,7 @@ import {Chart} from "chart.js/auto"; ...@@ -4,6 +4,7 @@ import {Chart} from "chart.js/auto";
import {DatePipe} from "@angular/common"; import {DatePipe} from "@angular/common";
import {LogLevel, MyLoggerServiceService} from "../../../../shared/service/my-logger-service.service"; import {LogLevel, MyLoggerServiceService} from "../../../../shared/service/my-logger-service.service";
import {SensorData} from "../../pro-view/pro-view.component"; import {SensorData} from "../../pro-view/pro-view.component";
import {ReadingPayload} from "../../../../../../projects/generated-api/src";
@Component({ @Component({
...@@ -29,7 +30,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{ ...@@ -29,7 +30,7 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
@Input() sensorDataArray!:[SensorData[]] @Input() sensorDataArray!:[SensorData[]]
dataParentArray:[Number[]]=[[]] dataParentArray:[Number[]]=[[]]
dataParentArrayOptions:[Number[]]=[[]] dataParentArrayOptions:[ReadingPayload.SensorErrorEnum[]]=[[]]
timeStampsAsHour:any timeStampsAsHour:any
...@@ -108,10 +109,11 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{ ...@@ -108,10 +109,11 @@ export class CjsTimelineMultiple implements OnInit,OnChanges{
this.sensorDataArray.forEach( this.sensorDataArray.forEach(
sensDat=>{ sensDat=>{
this.dataParentArray.push(sensDat.map(x=>x.readings.map(y=>y.value)).flat()) 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("SensorData got from Server",this.dataParentArray)
this.logger.info("SensorDataError got from Server",this.dataParentArrayOptions)
this.logger.info("Finished Mapping data") this.logger.info("Finished Mapping data")
} }
} }
......
...@@ -254,5 +254,6 @@ export interface SensorData { ...@@ -254,5 +254,6 @@ export interface SensorData {
sensorName: string; sensorName: string;
timestamp: string; timestamp: string;
uniqueHardwareName: string; uniqueHardwareName: string;
errorStatus: ReadingPayload.SensorErrorEnum;
} }
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