modified api and methods

This commit is contained in:
Senad Uka
2016-11-16 14:03:03 +01:00
parent cb32e1a9f7
commit cbeaf566b7
3 changed files with 33 additions and 9 deletions

View File

@@ -44,13 +44,19 @@ Api.addRoute('alarm/:id/phonePing', {
}
});
var state = stateOrDefault(this.urlParams.id).state;
return {
'alarmTriggered': state['alarmTriggered'],
'tooHot': state['alarmReasons']['tooHot'],
'tooCold': state['alarmReasons']['tooCold'],
'phoneSilent': state['alarmReasons']['phoneSilent'],
'boxSilent': state['alarmReasons']['boxSilent']
if(state.alarmTriggered) {
return {
'alarmTriggered': state.alarmTriggered,
'tooHot': state.alarmReasons.tooHot,
'tooCold': state.alarmReasons.tooCold,
'phoneSilent': state.alarmReasons.phoneSilent,
'boxSilent': state.alarmReasons.boxSilent
};
} else {
return {};
}
}
});
@@ -178,7 +184,14 @@ function stateOrDefault(id) {
controller_id: id,
state: {
out_valve: 'closed',
in_valve: 'closed'
in_valve: 'closed',
alarmTriggered: false,
alarmReasons: {
tooHot: false,
tooCold: false,
boxSilent: false,
phoneSilent: false
}
},
time: new Date(),
config: {