popov/iot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added EspEasy (garden) handlers.

Browse Source 
Added garden chart;
GetDevice messages has days filter;
Fixed charts & newchart data added.
This commit is contained in:
d-popov
2020-05-12 20:43:28 +03:00
parent d8a37e4b44
commit 8a68a07112
8 changed files with 348 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
views/chart.ejs
View File

@@ -8,6 +8,7 @@
window.onload = function () {
var dataPoints1 = [];
var dataPoints2 = [];
var dataPoints3 = [];
/*{ x: new Date(2017, 0, 3), y: 650 },
{ x: new Date(2017, 0, 4), y: 700 },
*/
@@ -25,6 +26,16 @@
text: "X Axis scale is Logarithmic",
fontSize: 14
}],*/
toolTip:{
shared:true
},
legend:{
cursor:"pointer",
verticalAlign: "bottom",
horizontalAlign: "left",
dockInsidePlotArea: true,
itemclick: toogleDataSeries
},
axisX:{
valueFormatString: "HH:mm DD MMM",
crosshair: {
@@ -39,13 +50,25 @@
labelFontColor: "#C24642",
crosshair: {
enabled: true
}
},
minimum:0,
maximum: 50,
},
axisY2: [
{
title: "Relative hum %",
title: "Air RH %",
titleFontColor: "#51CDA0",
labelFontColor: "#51CDA0"
labelFontColor: "#51CDA0",
minimum:0,
maximum: 100,
},
{
title: "Soil RH %",
lineColor: "#99D9EA",
titleFontColor: "#99D9EA",
labelFontColor: "#99D9EA",
minimum:0,
maximum: 100,
}
],
//{title: "Temperature",
@@ -53,19 +76,9 @@
//titleFontColor: "#C0504E",
//labelFontColor: "#C0504E"
//},
toolTip:{
shared:true
},
legend:{
cursor:"pointer",
verticalAlign: "bottom",
horizontalAlign: "left",
dockInsidePlotArea: true,
itemclick: toogleDataSeries
},
data: [{
name: "Temperature",
type: "spline",//line
type: "line",//line
showInLegend: true,
markerType: "square",
xValueFormatString: "HH:mm on DD MMM, YYYY",
@@ -73,13 +86,23 @@
dataPoints: dataPoints2
},
{
name: "Humidiry",
axisYType: "secondary",//at right
//axisYIndex: 1,
name: "RH Air",
type: "spline",
axisYType: "secondary",
axisYIndex: 1,
showInLegend: true,
lineDashType: "dash",
dataPoints: dataPoints1
},
{
axisYType: "secondary",
//axisYIndex: 1,
name: "RH Soil",
type: "spline",
showInLegend: true,
lineDashType: "dash",
color: "#99D9EA",
dataPoints: dataPoints3
}]
});
@@ -95,9 +118,10 @@
function addData(data) {
for (var i = 0; i < data.length; i++) {
var date = new Date(data[i]["timestamp"]);
if(data[i].field_name == "A23_DHT"){
//console.log("Got DHT:" + date);
var dht = JSON.parse(data[i].field_value).dht;
var date = new Date(data[i]["timestamp"]);
if(dht && dht.hum <= 100){
dataPoints1.push({
x: date,
@@ -109,6 +133,15 @@
});
}
}
if(data[i].field_name === "A23_Garden_Humidity")
{
//console.log("Got Soil:" + date);
var soil = parseFloat( data[i].field_value);
dataPoints3.push({
x: date,
y: soil
});
}
}
chart.render();
@@ -120,8 +153,9 @@
}
});
}
$.getJSON("/n/device/A23_DHT", addData);
$.getJSON("/n/device/A23_DHT/7", addData);
$.getJSON("/n/device/A23_Garden_Humidity/7", addData);
}
</script>