Skip to content

Commit

Permalink
Fix various issues with default overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdavis90 committed Jun 4, 2024
1 parent 28a2f32 commit 461af7d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
25 changes: 20 additions & 5 deletions tado.html
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@
<div class="form-row" id="tadoDefaultTerminationType">
<label for="node-input-defaultTerminationType"><i class="fa fa-ban"></i> <span data-i18n="tado.label.termination-type"></span></label>
<select id="node-input-defaultTerminationType" style="width:60%; margin-right:5px;">
<option value="manual" data-i18n="tado.option.manual"></option>
<option value="auto" data-i18n="tado.option.auto"></option>
<option value="timer" data-i18n="tado.option.timer"></option>
<option value="MANUAL" data-i18n="tado.option.manual"></option>
<option value="TADO_MODE" data-i18n="tado.option.auto"></option>
<option value="TIMER" data-i18n="tado.option.timer"></option>
</select>
</div>
<div class="form-row" id="tadoDefaultTerminationTimeout">
<label for="node-input-defaultTerminationTimeout"><i class="fa fa-history"></i> <span data-i18n="tado.label.termination-timeout"></span></label>
<input type="text" id="node-input-defaultTerminationTimeout" data-i18n="[placeholder]tado.label.temperature-timeout">
<input type="text" id="node-input-defaultTerminationTimeout" data-i18n="[placeholder]tado.label.termination-timeout">
</div>
</div>
<div id="tadoOverlayForm">
Expand All @@ -171,7 +171,7 @@
</div>
<div class="form-row" id="tadoTerminationTimeout">
<label for="node-input-terminationTimeout"><i class="fa fa-history"></i> <span data-i18n="tado.label.termination-timeout"></span></label>
<input type="text" id="node-input-terminationTimeout" data-i18n="[placeholder]tado.label.temperature-timeout">
<input type="text" id="node-input-terminationTimeout" data-i18n="[placeholder]tado.label.termination-timeout">
</div>
<div class="form-row" id="tadoFanSpeed">
<label for="node-input-fanSpeed"><i class="fa fa-tachometer"></i> <span data-i18n="tado.label.fan-speed"></span></label>
Expand Down Expand Up @@ -383,6 +383,8 @@ <h3>References</h3>
apiCall: { value: "getMe" },
childlock: { value: false },
configName: { type: "tado-config", required: true },
defaultTerminationTimeout: { value: 900 },
defaultTerminationType: { value: "manual" },
deviceId: { value: "" },
endDate: { value: "" },
fanSpeed: { value: "AUTO" },
Expand Down Expand Up @@ -629,6 +631,19 @@ <h3>References</h3>
break;
}
});

$('#node-input-defaultTerminationType').change(function () {
const terminationType = $('#node-input-defaultTerminationType').val();
switch (terminationType) {
case "MANUAL":
case "TADO_MODE":
$('#tadoDefaultTerminationTimeout').hide();
break;
case "TIMER":
$('#tadoDefaultTerminationTimeout').show();
break;
}
});
}
});
</script>
2 changes: 1 addition & 1 deletion tado.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ module.exports = function(RED) {

case "setZoneDefaultOverlay": {
const type = arg("defaultTerminationType");
let termination = {
const termination = {
terminationCondition: {
type,
durationInSeconds: type == "TIMER" ? arg("defaultTerminationTimeout") : undefined,
Expand Down

0 comments on commit 461af7d

Please sign in to comment.