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

Fix for setpoints can use float numbers now #65

This commit is contained in:
Squandor 2017-01-16 14:44:59 +01:00
parent a98d3b5b6a
commit 3eddfd5ba8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/domoboard.js
View File

@ -178,9 +178,9 @@ function setpointSlider(updateSetpoints, block) {
$.each(updateSetpoints, function(i, setpoint) {
url = "/api?type=devices&rid=" + setpoint[0];
requestAPI(url, function(d) {
var percentage = parseInt(JSON.parse(d).result[0].Data);
$('#setpoint_slider' + setpoint[0] + "_block_" + block).slider({min:parseInt(setpoint[1]), max:parseInt(setpoint[2]), value: percentage}).on('slideStop', function(ev) {
changeSetpoint(setpoint[0], ev.value);
var percentage = parseFloat(JSON.parse(d).result[0].Data);
$('#setpoint_slider' + setpoint[0] + "_block_" + block).slider({min:parseInt(setpoint[1]), max:parseInt(setpoint[2]), value: parseFloat(percentage)}).on('slideStop', function(ev) {
changeSetpoint(setpoint[0], parseFloat(ev.value));
} ).data('slider');
$('#stpnt_' + setpoint[0] + "_block_" + block + '_track').css({'background-image': '-webkit-linear-gradient(top, #f9f9f9 0%, red 100%)', 'background-image': '-o-linear-gradient(top, #f9f9f9 0%, red 100%)', 'background-image': 'linear-gradient(to bottom, #f9f9f9 0%, red 100%)'});
});

2
templates/switches.html
View File

@ -44,7 +44,7 @@
</div>
</div>
{% 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="1" 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" data-slider-value="" />
{% 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" />
<br><br>