Fix sensor--card error

app/controllers/account/sensor.js

@@ -14,18 +14,24 @@ export default class extends Controller {
     },
   ];
 
-  @computed('model.values.@each')
+  @computed('model.values.@each', 'field')
   get sensorData() {
     let mapFunc;
     if (this.get('field')) {
-      mapFunc = (reading) => [Math.round(reading.get('date').getTime()), reading.get(`value.${this.get('field')}`)];
+      mapFunc = (reading) => [
+        Math.round(reading.get('date').getTime()),
+        Number.parseInt(reading.get(`value.${this.get('field')}`)),
+      ];
     } else {
-      mapFunc = (reading) => [Math.round(reading.get('date').getTime()), reading.get('value')];
+      mapFunc = (reading) => [
+        Math.round(reading.get('date').getTime()),
+        Number.parseInt(reading.get('value')),
+      ];
     }
     return this.get('model.values').map(mapFunc).sort((a, b) => a[0] - b[0]);
   }
 
-  @computed('model.name', 'model.unitName')
+  @computed('model.name', 'model.unitName', 'field')
   get chartOptions() {
     const name = this.get('field') ? this.intl.t(`obd.${this.get('field')}`) : this.get('model.name');
     const unitName = this.get('model.unitName');

app/models/sensor-value.js

@@ -5,7 +5,7 @@ const {
 } = DS;
 
 export default class extends DS.Model {
-  @attr('raw') value;
+  @attr('json') value;
   @attr('date') date;
   @attr('string') hash;
   @belongsTo('sensor', {async: false}) sensor;

app/models/sensor.js

@@ -29,7 +29,7 @@ export default class extends DS.Model {
   @attr('number') charge;
   @attr('number') forPayment;
 
-  @attr('raw') lastValue;
+  @attr('json') lastValue;
 
   @attr('string') valueMonth;
   @attr('string') valuePrevYear;

app/serializers/sensor-value.js

@@ -13,7 +13,7 @@ const serializeDate = function(dateString) {
 };
 
 const generateId = function(data) {
-  return `${data['hash']}${data['date']}${data['sensor_id']}`;
+  return `${data['hash']}${data['date'] || data['time_stamp']}${data['sensor_id']}`;
 };
 
 const DefaultSensorValueSerializer = class extends ApplicationSerializer {
@@ -29,7 +29,7 @@ const DefaultSensorValueSerializer = class extends ApplicationSerializer {
       id: generateId(data),
       type: 'sensor-value',
       attributes: {
-        value: JSON.parse(data['value']),
+        value: data['value'],
         date: serializeDate(data['date']),
         hash: data['hash'],
       },
@@ -52,8 +52,8 @@ const LiteSensorValueSerializer = class extends ApplicationSerializer {
       id: generateId(data),
       type: 'sensor-value',
       attributes: {
-        value: typeof data['value'] === 'string' ? JSON.parse(data['value']) : data['value'],
-        date: serializeDate(data['date']),
+        value: data['value'],
+        date: serializeDate(data['time_stamp']),
         hash: data['hash'],
       },
       relationships: {

app/serializers/sensor.js

@@ -15,7 +15,7 @@ export default class extends ApplicationSerializer.extend(DS.EmbeddedRecordsMixi
   };
 
   normalize(modelClass, resourceHash) {
-    const type = get(resourceHash, 'characteristics.sensor_type');
+    const type = get(resourceHash, 'characteristics.sensor_type') || get(resourceHash, 'type');
 
     const rawLastValue = get(resourceHash, 'last_value');
     const additional = {

app/templates/account/subject.hbs

@@ -17,7 +17,7 @@
 </div>
 
 <div class="row havings">
-  {{#each (sort-by "typeName" model.sensors) as |sensor|}}
+  {{#each (sort-by "typeName" (filter-by 'typeName' model.sensors)) as |sensor|}}
     {{sensor-card sensor=sensor}}
   {{/each}}
 </div>

app/transforms/json.js

@@ -0,0 +1,19 @@
+import DS from 'ember-data';
+
+export default class extends DS.Transform {
+  deserialize(serialized) {
+    if (typeof serialized === 'object') {
+      return serialized;
+    } else {
+      try {
+        return JSON.parse(serialized);
+      } catch (e) {
+        return serialized;
+      }
+    }
+  }
+
+  serialize(deserialized) {
+    return deserialized;
+  }
+}

ember-cli-build.js

@@ -24,8 +24,8 @@ module.exports = function(defaults) {
     },
 
     'ember-composable-helpers': {
-      only: ['sort-by']
-    }
+      only: ['sort-by', 'filter-by'],
+    },
   });
 
   // Use `app.import` to add additional libraries to the generated

server/mocks/lite/objects.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const carPosition = {lat: 55.751244, lon: 37.618423};
+
+const movePoint = function(point) {
+  const maxDelta = 0.005;
+  point.lat += (Math.random() - 0.5) * maxDelta;
+  point.lon += (Math.random() - 0.5) * maxDelta;
+};
+
+module.exports = function(app) {
+  const express = require('express');
+  const apiRouter = express.Router();
+
+  apiRouter.get('/objects', function(req, res) {
+    // imitate car driving
+    movePoint(carPosition);
+
+    res.send({
+      'objects': [{'name': 'Mercedes', 'id': 1}],
+      'sensors': [
+        {
+          'controller': 1,
+          'name': 'OBD',
+          'id': 6,
+          'last_value': {'speed': 1, 'engine_load': 2},
+          'status': null,
+          'type': 5,
+        },
+        {
+          'controller': 1,
+          'name': 'GPS',
+          'id': 7,
+          'last_value': carPosition,
+          'status': null,
+          'type': 6,
+        }],
+      'controllers': [
+        {
+          'name': 'Car controller',
+          'id': 1,
+          'activation_date': '2019-07-20',
+          'mac': '00:25:96:FF:FE:12:34:56',
+          'status': 0,
+          'deactivation_date': '2019-07-20',
+          'object': 1,
+          'controller_type': 0,
+          'meta': '',
+        }],
+    });
+  });
+
+  app.use('/api', apiRouter);
+};

server/mocks/lite/sensor.js

@@ -10,7 +10,10 @@ module.exports = function(app) {
     const date = new Date();
     for (let i = 0; i < 1000; ++i) {
       date.setMinutes(date.getMinutes() + 1);
-      data.push({'time_stamp': date.toISOString(), 'value': {[req.query['field']]: Math.sin(i / 50) * (Math.random() - 0.5) * maxDelta}});
+      data.push({
+        'time_stamp': date.toISOString(),
+        'value': {[req.query['field']]: Math.sin(i / 50) * (Math.random() - 0.5) * maxDelta},
+      });
     }
     res.send(data);
   });