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

fixed small bug for the dimmer on/off function

This commit is contained in:
Squandor 2017-01-18 09:20:43 +01:00
parent a1936f33eb
commit 5c80eb2c98
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/domoboard.js
View File

@ -39,6 +39,7 @@ function setDimmerState(id, idx) {
var url = "/api?type=devices&rid=" + idx; var url = "/api?type=devices&rid=" + idx;
requestAPI(flask_server + url, function(d) { requestAPI(flask_server + url, function(d) {
_json = JSON.parse(d); _json = JSON.parse(d);
console.log(id);
if (_json['result'][0]['Data'] != 'Off') { if (_json['result'][0]['Data'] != 'Off') {
$('#' + id).css({'background-image': '-webkit-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': '-o-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': 'linear-gradient(to bottom, #f9f9f9 0%, green 100%)'}); $('#' + id).css({'background-image': '-webkit-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': '-o-linear-gradient(top, #f9f9f9 0%, green 100%)', 'background-image': 'linear-gradient(to bottom, #f9f9f9 0%, green 100%)'});
} else { } else {

6
templates/switches.html
View File

@ -18,7 +18,7 @@
{% for k, v in blockArray[count]["switches"].iteritems() %} {% for k, v in blockArray[count]["switches"].iteritems() %}
<tr> <tr>
{% if "dimmer" in v[2] or "rgb" in v[2] %} {% if "dimmer" in v[2] or "rgb" in v[2] %}
<td style="border-top: none; vertical-align: middle;"><a id="dim_{{count}}" style="cursor: pointer;"><label style="cursor: pointer;" class=""> &nbsp;{{k}}</label></a></td> <td style="border-top: none; vertical-align: middle;"><a id="Adim_{{v[1]}}_block_{{count}}" style="cursor: pointer;"><label style="cursor: pointer;" class=""> &nbsp;{{k}}</label></a></td>
{% else %} {% else %}
<td style="border-top: none; vertical-align: middle;"><label class=""> &nbsp;{{k}}</label></td> <td style="border-top: none; vertical-align: middle;"><label class=""> &nbsp;{{k}}</label></td>
{% endif %} {% endif %}
@ -44,7 +44,7 @@
</div> </div>
</div> </div>
{% elif "setpoint_slider" in v[2] %} {% elif "setpoint_slider" in v[2] %}
<input id="setpoint_slider{{v[1]}}_block_{{count}}" data-slider-id='stpnt_{{v[1]}}_block_{{count}}' type="text" state="on" data-slider-min="{{v[3]}}" data-slider-max="{{v[4]}}" data-slider-step="0.5" data-slider-value="" /> <input id="setpoint_slider{{v[1]}}_block_{{count}}" data-slider-id='stpnt_{{v[1]}}_block_{{count}}' type="text" state="on" data-slider-min="{{v[3]}}" data-slider-max="{{v[4]}}" data-slider-step="0.5" />
{% elif "rgb" in v[2] %} {% elif "rgb" in v[2] %}
&nbsp;<input id="dimmer_{{v[1]}}_block_{{count}}" data-slider-id='dim_{{v[1]}}_block_{{count}}' type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="14" /> &nbsp;<input id="dimmer_{{v[1]}}_block_{{count}}" data-slider-id='dim_{{v[1]}}_block_{{count}}' type="text" data-slider-min="0" data-slider-max="100" data-slider-step="1" data-slider-value="14" />
<br><br> <br><br>
@ -137,7 +137,7 @@ $(document).ready(function() {
{% elif (v[2] == "setpoint_slider") %} {% elif (v[2] == "setpoint_slider") %}
updateSetpoint_sliders_block_{{count}}.push(["{{v[1]}}", "{{v[3]}}", "{{v[4]}}"]); updateSetpoint_sliders_block_{{count}}.push(["{{v[1]}}", "{{v[3]}}", "{{v[4]}}"]);
{% elif (v[2] == "dimmer" or v[2] == "rgb") %} {% elif (v[2] == "dimmer" or v[2] == "rgb") %}
$('#dim_{{count}}').click(function(e) { $('#Adim_{{v[1]}}_block_{{count}}').click(function(e) {
e.preventDefault(); e.preventDefault();
changeDimmer('dim_{{v[1]}}_block_{{count}}_track', {{v[1]}}); changeDimmer('dim_{{v[1]}}_block_{{count}}_track', {{v[1]}});
}); });