From 457a3b7711ef5f6416156991336eb214b561c3f8 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Thu, 20 Feb 2020 15:51:14 +0100 Subject: [PATCH] added sensor list --- src/app/app.module.ts | 7 ++++-- src/app/app.scss | 6 +++++ src/pages/configuration/configuration.scss | 5 ----- src/pages/my-sense-box/my-sense-box.html | 15 ++++++++++--- src/pages/my-sense-box/my-sense-box.scss | 10 +++++++++ src/pages/my-sense-box/my-sense-box.ts | 12 ++++++++++ src/pages/sensors/sensors.html | 26 ++++++++++++++++++++-- src/pages/sensors/sensors.ts | 2 +- 8 files changed, 70 insertions(+), 13 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c50c4e7..bf8201b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,6 +16,7 @@ import { AddItemPage } from '../pages/add-item/add-item'; import { SensorDetailPage } from '../pages/sensor-detail/sensor-detail'; import { MySenseBoxPage } from '../pages/my-sense-box/my-sense-box'; import { LoginProvider } from '../providers/LoginProvider/LoginProvider'; +import { SensorsPage } from '../pages/sensors/sensors'; // For AoT compilation (production builds) we need to have a factory for the loader of translation files. // @TODO: we possibly could optimize this by using a static loader in combination with webpack: @@ -29,7 +30,8 @@ export function createTranslateLoader(http: HttpClient) { openSenseApp, AddItemPage, SensorDetailPage, - MySenseBoxPage + MySenseBoxPage, + SensorsPage ], imports: [ HttpClientModule, @@ -50,7 +52,8 @@ export function createTranslateLoader(http: HttpClient) { openSenseApp, AddItemPage, SensorDetailPage, - MySenseBoxPage + MySenseBoxPage, + SensorsPage ], providers: [ diff --git a/src/app/app.scss b/src/app/app.scss index 62699ea..ef26831 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -52,3 +52,9 @@ $breakpoints-values: map-values($grid-breakpoints); } } } + +code { + color:#c7254e; + background-color: #f9f2f4; + border-radius: 4px; +} \ No newline at end of file diff --git a/src/pages/configuration/configuration.scss b/src/pages/configuration/configuration.scss index 36d2ef1..201c659 100644 --- a/src/pages/configuration/configuration.scss +++ b/src/pages/configuration/configuration.scss @@ -1,8 +1,3 @@ .hint { text-align: center; } -code { - color:#c7254e; - background-color: #f9f2f4; - border-radius: 4px; -} \ No newline at end of file diff --git a/src/pages/my-sense-box/my-sense-box.html b/src/pages/my-sense-box/my-sense-box.html index 3986f69..80d3b91 100644 --- a/src/pages/my-sense-box/my-sense-box.html +++ b/src/pages/my-sense-box/my-sense-box.html @@ -21,15 +21,24 @@ + + Exposure: {{box.exposure}} + + + Model: {{box.model}} + + + ID: {{box._id}} + - + - + - + diff --git a/src/pages/my-sense-box/my-sense-box.scss b/src/pages/my-sense-box/my-sense-box.scss index f2fbe41..3349549 100644 --- a/src/pages/my-sense-box/my-sense-box.scss +++ b/src/pages/my-sense-box/my-sense-box.scss @@ -3,4 +3,14 @@ page-my-sense-box { } .actionButton{ width:100% +} + +code { + color:#c7254e; + background-color: #f9f2f4; + border-radius: 4px; + } + +.senseBox { + background: rgb(114, 176, 38) none repeat scroll 0% 0% } \ No newline at end of file diff --git a/src/pages/my-sense-box/my-sense-box.ts b/src/pages/my-sense-box/my-sense-box.ts index 9340db7..4fa3ee6 100644 --- a/src/pages/my-sense-box/my-sense-box.ts +++ b/src/pages/my-sense-box/my-sense-box.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { IonicPage, NavController, NavParams } from 'ionic-angular'; import {LoginProvider} from "../../providers/LoginProvider/LoginProvider"; +import { SensorsPage } from '../sensors/sensors'; /** * Generated class for the MySenseBoxPage page. * @@ -22,6 +23,17 @@ export class MySenseBoxPage { ) { } + forwardShow(box){ + this.navCtrl.push(SensorsPage,box) + } + + forwardEdit(box){ + + } + + forwardSketch(box){ + } + ionViewDidLoad() { console.log('ionViewDidLoad MySenseBoxPage'); this.boxes = this.navParams.data.data.boxes diff --git a/src/pages/sensors/sensors.html b/src/pages/sensors/sensors.html index 925d605..5cd9f0f 100644 --- a/src/pages/sensors/sensors.html +++ b/src/pages/sensors/sensors.html @@ -7,12 +7,34 @@ - sensors + Sensors + + + + + + {{sensor.title}} + + + + + Typ:{{sensor.sensorType}} + + + Last measurement: {{sensor.lastMeasurement.value}}{{sensor.unit}} at {{sensor.lastMeasurement.createdAt}} + + + ID: {{sensor._id}} + + + + - + + \ No newline at end of file diff --git a/src/pages/sensors/sensors.ts b/src/pages/sensors/sensors.ts index f3d5b16..545bdc3 100644 --- a/src/pages/sensors/sensors.ts +++ b/src/pages/sensors/sensors.ts @@ -14,7 +14,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; templateUrl: 'sensors.html', }) export class SensorsPage { - + public box:Object = this.navParams.data constructor(public navCtrl: NavController, public navParams: NavParams) { }