AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-26 15:57:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quick refactor for the JavaScript

Browse source
This commit is contained in:
Paul A 2017-10-22 18:48:54 +02:00
parent 795d8c8f53
commit 4a4a1d478b
1 changed files with 65 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
var/www/static/js/indexjavascript.js
View file

@ -37,11 +37,11 @@ function update_values() {
// Plot and update the number of processed pastes // Plot and update the number of processed pastes
// BEGIN PROCESSED PASTES // BEGIN PROCESSED PASTES
var default_minute = (typeof window.default_minute !== "undefined") ? parseInt(window.default_minute) : 10; var default_minute = (typeof window.default_minute !== "undefined") ? parseInt(window.default_minute) : 10;
var totalPoints = 2*parseInt(default_minute); //60s*minute var totalPoints = 2*parseInt(default_minute); //60s*minute
var curr_max = {"global": 0}; var curr_max = {"global": 0};
function fetch_data(dataset, curr_data, feeder_name) { function fetch_data(dataset, curr_data, feeder_name) {
if (curr_data.length > 0){ if (curr_data.length > 0){
var data_old = curr_data[0]; var data_old = curr_data[0];
curr_data = curr_data.slice(1); curr_data = curr_data.slice(1);
@ -60,9 +60,9 @@ function update_values() {
} }
data_for_processed_paste[dataset] = curr_data; data_for_processed_paste[dataset] = curr_data;
return { label: feeder_name, data: res }; return { label: feeder_name, data: res };
} }
function getData(dataset_group, graph_type) { function getData(dataset_group, graph_type) {
var curr_data; var curr_data;
var all_res = []; var all_res = [];
@ -73,7 +73,6 @@ function update_values() {
curr_data = data_for_processed_paste["global"]; curr_data = data_for_processed_paste["global"];
all_res.push(fetch_data("global", curr_data, "global")); all_res.push(fetch_data("global", curr_data, "global"));
} else { } else {
for(d_i in list_feeder) { for(d_i in list_feeder) {
if(list_feeder[d_i] == "global") { if(list_feeder[d_i] == "global") {
continue; continue;
@ -86,13 +85,12 @@ function update_values() {
curr_data = data_for_processed_paste[dataset]; curr_data = data_for_processed_paste[dataset];
all_res.push(fetch_data(dataset, curr_data, list_feeder[d_i])); all_res.push(fetch_data(dataset, curr_data, list_feeder[d_i]));
} }
} }
return all_res; return all_res;
} }
var updateInterval = 30*1000; //30s = 30*1000ms var updateInterval = 30*1000; //30s = 30*1000ms
var options_processed_pastes = { var options_processed_pastes = {
series: { shadowSize: 0 , series: { shadowSize: 0 ,
lines: { fill: true, fillColor: { colors: [ { opacity: 1 }, { opacity: 0.1 } ] }} lines: { fill: true, fillColor: { colors: [ { opacity: 1 }, { opacity: 0.1 } ] }}
}, },
@ -106,15 +104,15 @@ function update_values() {
show: true, show: true,
position: "nw", position: "nw",
} }
}; };
function update_processed_pastes(graph, dataset, graph_type) { function update_processed_pastes(graph, dataset, graph_type) {
graph.setData(getData(dataset, graph_type)); graph.setData(getData(dataset, graph_type));
graph.getOptions().yaxes[0].max = curr_max[dataset]; graph.getOptions().yaxes[0].max = curr_max[dataset];
graph.setupGrid(); graph.setupGrid();
graph.draw(); graph.draw();
setTimeout(function(){ update_processed_pastes(graph, dataset, graph_type); }, updateInterval); setTimeout(function(){ update_processed_pastes(graph, dataset, graph_type); }, updateInterval);
} }
// END PROCESSED PASTES // END PROCESSED PASTES