mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-12 02:42:48 +00:00
Code Issues Releases Wiki Activity

changed colors and added humidity

Browse Source
This commit is contained in:
mgerb42
2015-12-21 09:55:08 -06:00
parent 372eb01b48
commit 5433a0efa4
4 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
public/javascripts/sensor_information.js
View File

@@ -76,12 +76,12 @@ function displayChart(chart_id, chart_legend_id, year, month){
data.datasets.push({
label: "Max Temperature",
fillColor: "rgba(220,220,220,0.2)",
strokeColor: "rgba(220,220,220,1)",
pointColor: "rgba(220,220,220,1)",
fillColor: "rgba(255,100,100,0.2)",
strokeColor: "rgba(255,100,100,1)",
pointColor: "rgba(255,100,100,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(220,220,220,1)",
pointHighlightStroke: "rgba(255,50,50,1)",
data: []
},
{
@@ -93,6 +93,16 @@ function displayChart(chart_id, chart_legend_id, year, month){
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(151,187,205,1)",
data: []
},
{
label: "Average Humidity",
fillColor: "rgba(200,200,200,0.2)",
strokeColor: "rgba(200,200,200,1)",
pointColor: "rgba(200,200,200,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(200,200,200,1)",
data: []
});
for (var i in json){
@@ -106,6 +116,7 @@ function displayChart(chart_id, chart_legend_id, year, month){
data.datasets[0].data.push(json[i].max);
data.datasets[1].data.push(json[i].min);
data.datasets[2].data.push(json[i].humidity);
}
// Get context with jQuery - using jQuery's .get() method.
@@ -121,28 +132,6 @@ function displayChart(chart_id, chart_legend_id, year, month){
}
Chart.defaults.global = {
// Boolean - Whether to animate the chart
animation: true,