diff --git a/src/pages/configuration/configuration.html b/src/pages/configuration/configuration.html index e9e7070..41520b1 100644 --- a/src/pages/configuration/configuration.html +++ b/src/pages/configuration/configuration.html @@ -22,7 +22,7 @@ - Password + {{'Password'|translate}} @@ -37,41 +37,19 @@ - senseBoxID - + {{box._id}} - - - - Add a sensor - - - - - - - + + - {{sensor.typ}} {{sensor.id}} + {{sensor.sensorType}} {{sensor._id}} - - - - - - - Enable debug + {{'CONFIG.DEBUG' | translate}} diff --git a/src/pages/configuration/configuration.ts b/src/pages/configuration/configuration.ts index d1de3fa..4528c41 100644 --- a/src/pages/configuration/configuration.ts +++ b/src/pages/configuration/configuration.ts @@ -22,6 +22,8 @@ export class ConfigurationPage { pw:string; DEBUG_ENABLED:boolean; senseboxid: string; + + public box:Object = this.navParams.data constructor(public navCtrl: NavController, public navParams: NavParams, private http: HttpClient, public modalCtrl: ModalController) { } @@ -121,6 +123,7 @@ export class ConfigurationPage { } ionViewDidLoad() { + console.log(this.navParams) this.sensors = [ { typ: "HDC1080", id: "5ca1e336cbf9ae001a6f1d88" }, ] diff --git a/src/pages/my-sense-box/my-sense-box.html b/src/pages/my-sense-box/my-sense-box.html index 289d982..6eb3f1d 100644 --- a/src/pages/my-sense-box/my-sense-box.html +++ b/src/pages/my-sense-box/my-sense-box.html @@ -22,7 +22,7 @@ - Exposure: {{box.exposure}} + {{'MYSENSEBOX.EXPOSURE' | translate}}: {{box.exposure}} Model: {{box.model}} @@ -32,10 +32,10 @@ - + - + diff --git a/src/pages/sensors/sensors.html b/src/pages/sensors/sensors.html index 5cd9f0f..0a75ed9 100644 --- a/src/pages/sensors/sensors.html +++ b/src/pages/sensors/sensors.html @@ -24,10 +24,10 @@ - Typ:{{sensor.sensorType}} + {{'SENSORS.TYP'|translate}}:{{sensor.sensorType}} - Last measurement: {{sensor.lastMeasurement.value}}{{sensor.unit}} at {{sensor.lastMeasurement.createdAt}} + {{'SENSORS.MEASUREMENT' | translate}}: {{sensor.lastMeasurement.value}}{{sensor.unit}} at {{sensor.lastMeasurement.createdAt}} ID: {{sensor._id}}