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

testing loading screen for graphs

Browse Source
This commit is contained in:
mgerb42
2015-12-21 09:24:51 -06:00
parent 529a4a5d20
commit 6a97a69e76
5 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
public/javascripts/sensor_information.js
View File

@@ -56,54 +56,68 @@ function displayChart(chart_id, chart_legend_id, year, month){
console.log("api 2");
}
$.get(api_url, function(request){
var json = request;
var data = {labels : [], datasets : []};
console.log(json);
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)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(220,220,220,1)",
data: []
$.ajax(
{
type: 'GET',
url: api_url,
data: {},
beforeSend: function(){
$('body').addClass("loading");
},
{
label: "Min Temperature",
fillColor: "rgba(151,187,205,0.2)",
strokeColor: "rgba(151,187,205,1)",
pointColor: "rgba(151,187,205,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(151,187,205,1)",
data: []
});
success: function(data){
for (var i in json){
$('body').removeClass("loading");
if (month == null){
data.labels.push(json[i]._id.month + "/" + json[i]._id.day);
}
else {
data.labels.push(json[i]._id.day);
}
var request = data;
data.datasets[0].data.push(json[i].max);
data.datasets[1].data.push(json[i].min);
}
var json = request;
var data = {labels : [], datasets : []};
console.log(json);
// Get context with jQuery - using jQuery's .get() method.
var ctx = $("#" + chart_id).get(0).getContext("2d");
// This will get the first returned node in the jQuery collection.
var myLineChart = new Chart(ctx).Line(data);
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)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(220,220,220,1)",
data: []
},
{
label: "Min Temperature",
fillColor: "rgba(151,187,205,0.2)",
strokeColor: "rgba(151,187,205,1)",
pointColor: "rgba(151,187,205,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(151,187,205,1)",
data: []
});
$("#" + chart_legend_id).html(myLineChart.generateLegend());
for (var i in json){
});
if (month == null){
data.labels.push(json[i]._id.month + "/" + json[i]._id.day);
}
else {
data.labels.push(json[i]._id.day);
}
data.datasets[0].data.push(json[i].max);
data.datasets[1].data.push(json[i].min);
}
// Get context with jQuery - using jQuery's .get() method.
var ctx = $("#" + chart_id).get(0).getContext("2d");
// This will get the first returned node in the jQuery collection.
var myLineChart = new Chart(ctx).Line(data);
$("#" + chart_legend_id).html(myLineChart.generateLegend());
}
});
}