simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #32 from wez3/develop 

Develop -> Master
This commit is contained in:
wez3 2017-01-02 22:45:10 +01:00 committed by GitHub
parent de2e8df7a6 1008c10be1
commit 3ec0440e2d
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/domoboard.js
View File

@ -22,6 +22,16 @@ function changeSwitch(checkboxElem, idx) {
} }
} }
// Switch functions
function changePush(idx, action) {
if (action == 'on') {
requestAPI(flask_server + "/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=On" );
} else {
requestAPI(flask_server + "/api?type=command&param=switchlight&idx=" + idx + "&switchcmd=Off" );
}
}
function refreshSwitches(updateSwitches, block) { function refreshSwitches(updateSwitches, block) {
$.each(updateSwitches, function (i, switchID) { $.each(updateSwitches, function (i, switchID) {
var url = flask_server + "/api?type=devices&rid=" + switchID; var url = flask_server + "/api?type=devices&rid=" + switchID;

12
templates/switches.html
View File

@ -95,9 +95,15 @@ $(document).ready(function() {
changeSwitch(this, {{v[0]}}); changeSwitch(this, {{v[0]}});
}); });
updateSwitches_block_{{count}}.push("{{v[0]}}"); updateSwitches_block_{{count}}.push("{{v[0]}}");
{% elif (v[1] == "pushon") or (v[1] == "pushoff") %} {% elif (v[1] == "pushon") %}
$('button[id="push_{{v[0]}}_block_{{count}}"]').click(function() { $('button[id="push_{{v[0]}}_block_{{count}}"]').click(function(e) {
changeSwitch(this, {{v[0]}}); e.preventDefault();
changePush({{v[0]}}, 'on');
});
{% elif (v[1] == "pushoff") %}
$('button[id="push_{{v[0]}}_block_{{count}}"]').click(function(e) {
e.preventDefault();
changePush({{v[0]}}, 'off');
}); });
{% elif (v[1] == "setpoint") %} {% elif (v[1] == "setpoint") %}
updateSetpoints_block_{{count}}.push("{{v[0]}}"); updateSetpoints_block_{{count}}.push("{{v[0]}}");