mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-05-11 20:08:15 +05:00
Merge branch 'master' into async
This commit is contained in:
@@ -195,6 +195,10 @@
|
||||
<th scope="row" data-i18n>dashboard.states.mHeatOverheat</th>
|
||||
<td><i class="mHeatOverheat"></i></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row" data-i18n>dashboard.states.mHeatFreezing</th>
|
||||
<td><i class="mHeatFreezing"></i></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row" data-i18n>dashboard.states.sHeatActive</th>
|
||||
<td><i class="sHeatActive"></i></td>
|
||||
@@ -320,7 +324,7 @@
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
let actionTimer = null;
|
||||
let actionLongPress = false;
|
||||
@@ -636,6 +640,11 @@
|
||||
result.master.heating.overheat ? "success" : "error",
|
||||
result.master.heating.overheat ? "red" : "green"
|
||||
);
|
||||
setStatus(
|
||||
'.mHeatFreezing',
|
||||
result.master.heating.freezing ? "success" : "error",
|
||||
result.master.heating.freezing ? "red" : "green"
|
||||
);
|
||||
setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp);
|
||||
setValue('.mHeatTargetTemp', result.master.heating.targetTemp);
|
||||
setValue('.mHeatCurrTemp', result.master.heating.currentTemp);
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
setTimeout(async function onLoadPage() {
|
||||
try {
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
const fillData = (data) => {
|
||||
setInputValue("[name='hostname']", data.hostname);
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
<script>
|
||||
document.addEventListener("DOMContentLoaded", async () => {
|
||||
const lang = new Lang(document.getElementById("lang"));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
const container = document.querySelector("article");
|
||||
const templateNode = container.querySelector("#template");
|
||||
|
||||
@@ -259,13 +259,15 @@
|
||||
|
||||
<div class="grid">
|
||||
<label>
|
||||
<span data-i18n>settings.freezeProtection.lowTemp</span>
|
||||
<input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
|
||||
<span data-i18n>settings.freezeProtection.highTemp.title</span>
|
||||
<input type="number" inputmode="numeric" name="heating[freezeProtection][highTemp]" min="0" max="0" step="1" required>
|
||||
<small data-i18n>settings.freezeProtection.highTemp.note</small>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<span data-i18n>settings.freezeProtection.thresholdTime</span>
|
||||
<input type="number" inputmode="numeric" name="heating[freezeProtection][thresholdTime]" min="30" max="1800" step="1" required>
|
||||
<span data-i18n>settings.freezeProtection.lowTemp.title</span>
|
||||
<input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
|
||||
<small data-i18n>settings.freezeProtection.lowTemp.note</small>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
@@ -919,7 +921,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
let etChart = null;
|
||||
let etChartConfig = {
|
||||
@@ -1177,11 +1179,14 @@
|
||||
"min": 0,
|
||||
"max": data.system.unitSystem == 0 ? 99 : 211
|
||||
});
|
||||
setInputValue("[name='heating[freezeProtection][highTemp]']", data.heating.freezeProtection.highTemp, {
|
||||
"min": data.system.unitSystem == 0 ? 1 : 34,
|
||||
"max": data.system.unitSystem == 0 ? 50 : 122
|
||||
});
|
||||
setInputValue("[name='heating[freezeProtection][lowTemp]']", data.heating.freezeProtection.lowTemp, {
|
||||
"min": data.system.unitSystem == 0 ? 1 : 34,
|
||||
"max": data.system.unitSystem == 0 ? 30 : 86
|
||||
});
|
||||
setInputValue("[name='heating[freezeProtection][thresholdTime]']", data.heating.freezeProtection.thresholdTime);
|
||||
setBusy('#heating-settings-busy', '#heating-settings', false);
|
||||
|
||||
// DHW
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
setupRestoreBackupForm('#restore');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user