1
0
Fork 0
mirror of https://github.com/shouptech/tempgopher.git synced 2026-02-03 08:39:43 +00:00

Move append logic to separate function

Fixes #15
This commit is contained in:
Emma 2018-10-23 21:51:19 -06:00
parent f13c557b38
commit e3ec4803de
2 changed files with 116 additions and 112 deletions

View file

@ -60,6 +60,120 @@ function fahrenheitToCelsius(degree) {
return (degree - 32) * 5 / 9; return (degree - 32) * 5 / 9;
}; };
function appendData(data) {
// Title of thermostat
var titleh = $("<h4></h4>").text(data.alias);
var titlediv = $("<div></div>").addClass("row").append(titleh);
// Thermostat status
var rowdiv = $("<div></div>");
rowdiv.addClass("row");
// Display temperature
if (jsconfig.fahrenheit) {
var temp = celsiusToFahrenheit(parseFloat(data.temp)).toFixed(1) + "°F";
} else {
var temp = parseFloat(data.temp).toFixed(1) + "°C";
}
var temph = $("<h2></h2>").text(temp);
var tempdiv = $("<div></div>").addClass("two columns").append(temph);
rowdiv.append(tempdiv);
// Display status
if (data.cooling) {
var statustext = "Cooling"
} else if (data.heating) {
var statustext = "Heating"
} else {
var statustext = "Idle"
}
var statusp = $("<p></p>").html(statustext);
var statusdiv = $("<div></div>").addClass("two columns").append(statusp);
rowdiv.append(statusdiv);
// Display sensor config
$.ajax({
url: jsconfig.baseurl + "/api/config/sensors/" + data.alias,
beforeSend: authHeaders
}).then(function(configData){
if (jsconfig.fahrenheit) {
var degUnit = "°F";
var hightemp = celsiusToFahrenheit(parseFloat(configData.hightemp)).toFixed(1);
var lowtemp = celsiusToFahrenheit(parseFloat(configData.lowtemp)).toFixed(1);
} else {
var hightemp = parseFloat(configData.hightemp).toFixed(1);
var lowtemp = parseFloat(configData.lowtemp).toFixed(1);
}
rp = '[0-9]+(\.[0-9]+)?'
var cmIn = $("<input>").attr("id", "cm" + configData.alias).val(configData.coolminutes).attr("size", "2").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var htIn = $("<input>").attr("id", "ht" + configData.alias).val(hightemp).attr("size", "4").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var hmIn = $("<input>").attr("id", "hm" + configData.alias).val(configData.heatminutes).attr("size", "2").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var ltIn = $("<input>").attr("id", "lt" + configData.alias).val(lowtemp).attr("size", "4").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var configp = $("<p></p>")
if (!configData.cooldisable) {
configp.append("Chills for ").append(cmIn).append(" minutes when &gt; ").append(htIn).append(degUnit);
}
if (!configData.cooldisable && !configData.heatdisable){
configp.append($("<br>"));
}
if (!configData.heatdisable) {
configp.append("Heats for ").append(hmIn).append(" minutes when &lt; ").append(ltIn).append(degUnit);
}
var configdiv = $("<div></div>").addClass("five columns").append(configp);
rowdiv.append(configdiv);
var yesButton = $("<button></button>").addClass("button button-primary").text("✔").css("margin-right", "5px").click(function() {
if (jsconfig.fahrenheit) {
var newHT = fahrenheitToCelsius(parseFloat(htIn.val()));
var newLT = fahrenheitToCelsius(parseFloat(ltIn.val()));
} else {
var newHT = parseFloat(htIn.val());
var newLT = parseFloat(ltIn.val());
}
$.ajax({
type: "POST",
url: jsconfig.baseurl + "/api/config/sensors",
beforeSend: authHeaders,
data: JSON.stringify([{
"id": configData.id,
"alias": configData.alias,
"hightemp": newHT,
"lowtemp": newLT,
"heatgpio": configData.heatgpio,
"heatinvert": configData.heatInvert,
"heatminutes": parseFloat(hmIn.val()),
"coolgpio": configData.coolgpio,
"coolinvert": configData.coolinvert,
"coolminutes": parseFloat(cmIn.val()),
"verbose": configData.verbose
}])
})
window.setInterval(renderThermostats, 60000);
renderThermostats();
});
var noButton = $("<button></button>").addClass("button").text("✘").click(function() {
window.setInterval(renderThermostats, 60000);
renderThermostats();
});
if (!configData.heatdisable || !configData.cooldisable) {
var buttonDiv = $("<div></div>").addClass("three columns").append(yesButton).append(noButton);
rowdiv.append(buttonDiv);
}
// Add things back to the thermostat list
$("#thermostats").append(titlediv);
$("#thermostats").append(rowdiv);
});
}
function renderThermostats() { function renderThermostats() {
$.ajax({ $.ajax({
url: jsconfig.baseurl + "/api/status/", url: jsconfig.baseurl + "/api/status/",
@ -67,117 +181,7 @@ function renderThermostats() {
}).then(function(data) { }).then(function(data) {
$("#thermostats").empty(); $("#thermostats").empty();
for (var key in data) { for (var key in data) {
// Title of thermostat appendData(data[key])
var titleh = $("<h4></h4>").text(data[key].alias);
var titlediv = $("<div></div>").addClass("row").append(titleh);
// Thermostat status
var rowdiv = $("<div></div>");
rowdiv.addClass("row");
// Display temperature
if (jsconfig.fahrenheit) {
var temp = celsiusToFahrenheit(parseFloat(data[key].temp)).toFixed(1) + "°F";
} else {
var temp = parseFloat(data[key].temp).toFixed(1) + "°C";
}
var temph = $("<h2></h2>").text(temp);
var tempdiv = $("<div></div>").addClass("two columns").append(temph);
rowdiv.append(tempdiv);
// Display status
if (data[key].cooling) {
var statustext = "Cooling"
} else if (data[key].heating) {
var statustext = "Heating"
} else {
var statustext = "Idle"
}
var statusp = $("<p></p>").html(statustext);
var statusdiv = $("<div></div>").addClass("two columns").append(statusp);
rowdiv.append(statusdiv);
// Display sensor config
$.ajax({
url: jsconfig.baseurl + "/api/config/sensors/" + data[key].alias,
beforeSend: authHeaders
}).then(function(configData){
if (jsconfig.fahrenheit) {
var degUnit = "°F";
var hightemp = celsiusToFahrenheit(parseFloat(configData.hightemp)).toFixed(1);
var lowtemp = celsiusToFahrenheit(parseFloat(configData.lowtemp)).toFixed(1);
} else {
var hightemp = parseFloat(configData.hightemp).toFixed(1);
var lowtemp = parseFloat(configData.lowtemp).toFixed(1);
}
rp = '[0-9]+(\.[0-9]+)?'
var cmIn = $("<input>").attr("id", "cm" + configData.alias).val(configData.coolminutes).attr("size", "2").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var htIn = $("<input>").attr("id", "ht" + configData.alias).val(hightemp).attr("size", "4").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var hmIn = $("<input>").attr("id", "hm" + configData.alias).val(configData.heatminutes).attr("size", "2").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var ltIn = $("<input>").attr("id", "lt" + configData.alias).val(lowtemp).attr("size", "4").attr("pattern", rp).on('input', function(){window.clearInterval(rtHandle)});
var configp = $("<p></p>")
if (!configData.cooldisable) {
configp.append("Chills for ").append(cmIn).append(" minutes when &gt; ").append(htIn).append(degUnit);
}
if (!configData.cooldisable && !configData.heatdisable){
configp.append($("<br>"));
}
if (!configData.heatdisable) {
configp.append("Heats for ").append(hmIn).append(" minutes when &lt; ").append(ltIn).append(degUnit);
}
var configdiv = $("<div></div>").addClass("five columns").append(configp);
rowdiv.append(configdiv);
var yesButton = $("<button></button>").addClass("button button-primary").text("✔").css("margin-right", "5px").click(function() {
if (jsconfig.fahrenheit) {
var newHT = fahrenheitToCelsius(parseFloat(htIn.val()));
var newLT = fahrenheitToCelsius(parseFloat(ltIn.val()));
} else {
var newHT = parseFloat(htIn.val());
var newLT = parseFloat(ltIn.val());
}
$.ajax({
type: "POST",
url: jsconfig.baseurl + "/api/config/sensors",
beforeSend: authHeaders,
data: JSON.stringify([{
"id": configData.id,
"alias": configData.alias,
"hightemp": newHT,
"lowtemp": newLT,
"heatgpio": configData.heatgpio,
"heatinvert": configData.heatInvert,
"heatminutes": parseFloat(hmIn.val()),
"coolgpio": configData.coolgpio,
"coolinvert": configData.coolinvert,
"coolminutes": parseFloat(cmIn.val()),
"verbose": configData.verbose
}])
})
window.setInterval(renderThermostats, 60000);
renderThermostats();
});
var noButton = $("<button></button>").addClass("button").text("✘").click(function() {
window.setInterval(renderThermostats, 60000);
renderThermostats();
});
if (!configData.heatdisable || !configData.cooldisable) {
var buttonDiv = $("<div></div>").addClass("three columns").append(yesButton).append(noButton);
rowdiv.append(buttonDiv);
}
// Add things back to the thermostat list
$("#thermostats").append(titlediv);
$("#thermostats").append(rowdiv);
});
}; };
}); });
}; };

View file

@ -8,7 +8,7 @@ import (
) )
// Version is the current code version of tempgopher // Version is the current code version of tempgopher
const Version = "0.3.0" const Version = "0.3.1-dev"
func main() { func main() {
var args struct { var args struct {