Update model when reading out sensor values

implements #11418

webroot/js/dss/dss-setup-interface/dSS/grid/SensorPanel.js

@@ -196,6 +196,35 @@ dSS.grid.SensorPanel = Ext.extend(Ext.grid.GridPanel, {
this.controlToolbar.createDelegate(this, [ false ], false),
this);
},
+    updateModel: function(dsuid, sensors) {
+        var i;
+        var j;
+        var rec = dSS.data.Loader.getDeviceStore().getById(dsuid);
+        if (!rec) {
+            return;
+        }
+
+        var origsensors = rec.get('sensors').splice(0);
+        var dirty = false;
+
+        for (i = 0; i < sensors.length; i++) {
+            var sensor = sensors[i];
+            for (j = 0; j < origsensors.length; j++) {
+                var origsensor = origsensors[j];
+                if (sensor.type == origsensor.type) {
+                    origsensors[j] = sensor;
+                    dirty = true;
+                    // not breaking out, multiple sensors of same type are
+                    // not forbidden
+                }
+            }
+        }
+
+        if (dirty) {
+            rec.set('sensors', origsensors);
+            rec.commit();
+        }
+    },
loadSensorData: function(dsuid) {
if (this.dsuid !== dsuid) {
this.lastSelectedIndex = -1;
@@ -210,7 +239,7 @@ dSS.grid.SensorPanel = Ext.extend(Ext.grid.GridPanel, {
scope: this,
params: {
query: '/apartment/zones/zone0/devices/' + dsuid +
-                       '/sensorInputs/*(type,index,value,timestamp,pollinterval,valid)',
+                       '/sensorInputs/*(type,index,value,valid,timestamp,pollinterval)',
},
success: function(result, request) {
try {
@@ -220,6 +249,7 @@ dSS.grid.SensorPanel = Ext.extend(Ext.grid.GridPanel, {
for (i = 0; i < json.result.sensorInputs.length; i++) {
json.result.sensorInputs[i].dsuid = dsuid;
}
+                        this.updateModel(dsuid, json.result.sensorInputs);
this.getStore().loadData(json.result);
this.getStore().filter({
fn : function(record) {