senaduka/old-tfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

saving sensor state works

Browse Source
This commit is contained in:
Senad Uka
2017-01-07 12:51:28 +01:00
parent d1e216b0fd
commit 38a9bd83b9
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/alarm_settings.html
View File

@@ -83,7 +83,7 @@
</td> </td>
<td> <td>
<label class="switch"> <label class="switch">
<input type="checkbox" checked={{sensor.on}} /> <input type="checkbox" checked={{sensor.on}} class="sensor_switch" />
<div class="slider round"></div> <div class="slider round"></div>
</label> </label>
</td> </td>

13
app/client/alarm_settings.js
View File

@@ -35,7 +35,7 @@ Template.alarm_settings.helpers({
sensors: function() { sensors: function() {
var temperatures = Meteor.zoblak.client.last_sensor_reading().temperatures; var temperatures = Meteor.zoblak.client.last_sensor_reading().temperatures;
var enabled = config()['enabled'] || {}; var enabled = config()['sensorsEnabled'] || {};
var sensors = []; var sensors = [];
for (var index in temperatures) { for (var index in temperatures) {
var is_on = (index in enabled) ? enabled[index] : true; // on by default var is_on = (index in enabled) ? enabled[index] : true; // on by default
@@ -63,6 +63,15 @@ Template.alarm_settings.events({
var sms3 = instance.$('#sms3').val(); var sms3 = instance.$('#sms3').val();
var sms4 = instance.$('#sms4').val(); var sms4 = instance.$('#sms4').val();
Meteor.call('saveAlarmSettings', controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, [sms1, sms2, sms3, sms4]); var sensorSwitches = instance.$('.sensor_switch');
var enabled = {};
sensorSwitches.each( function(index,element) {
enabled[index] = instance.$(element).is(':checked');
} );
console.log("Enabled: ", enabled);
Meteor.call('saveAlarmSettings', controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, [sms1, sms2, sms3, sms4] ,enabled);
} }
}); });

5
app/server/methods.js
View File

@@ -143,7 +143,7 @@ function saveControllerConfig(controller_id, time, days, manualInflow) {
}); });
} }
function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, smsNumbers) { function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeoutBox, timeoutPhone, smsNumbers, sensorsEnabled) {
var state = Meteor.zoblak.server.controller_state(controller_id); var state = Meteor.zoblak.server.controller_state(controller_id);
ControllerState.update(state._id, { ControllerState.update(state._id, {
'$set': { '$set': {
@@ -155,7 +155,8 @@ function saveAlarmSettings(controller_id, minTemperature, maxTemperature, timeou
'config.sms1': smsNumbers[0], 'config.sms1': smsNumbers[0],
'config.sms2': smsNumbers[1], 'config.sms2': smsNumbers[1],
'config.sms3': smsNumbers[2], 'config.sms3': smsNumbers[2],
'config.sms4': smsNumbers[3] 'config.sms4': smsNumbers[3],
'config.sensorsEnabled': sensorsEnabled
} }
}); });