Ajout Capitole du Libre 2017

[website.git] / assets / bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index bed5e11d56106da427e252b8bec077fa83609a6a..08d9fe5c61b732d3e015842a01c36c27f1a79466 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -41,6 +41,7 @@ BwDrawer.periods = [
     { id: "1_month", label: L10n.t_1_month },
     { id: "3_months", label: L10n.t_3_months },
     { id: "1_year", label: L10n.t_1_year },
     { id: "1_month", label: L10n.t_1_month },
     { id: "3_months", label: L10n.t_3_months },
     { id: "1_year", label: L10n.t_1_year },

+    { id: "5_years", label: L10n.t_5_years },

   ];
 
 BwDrawer.extract_values = function(history, interval, minTime, maxTime) {
   ];
 
 BwDrawer.extract_values = function(history, interval, minTime, maxTime) {


@@ -61,6 +62,13 @@ BwDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint})
 BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
 
 BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
 BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
 
 BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {

+  // Purge non running relays
+  raw_data.relays.forEach(function(r, i) {
+    if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') {
+      raw_data.relays.splice(i, 1);
+    }
+  });
+

   var update_period;
 
   var svg = d3.select(selector).append("svg")
   var update_period;
 
   var svg = d3.select(selector).append("svg")


@@ -70,16 +78,17 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
 
   var form = d3.select(selector).append("form")
       .attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
 
   var form = d3.select(selector).append("form")

+      .attr("class", "graph-period")

       .attr("action", "#");
   BwDrawer.periods.forEach(function(p) {
     var div = form.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")
       .attr("action", "#");
   BwDrawer.periods.forEach(function(p) {
     var div = form.append("div");
     var radio = div.append("input")
       .attr("type", "radio")
       .attr("name", "period")

-      .attr("id", "period_" + p.id)
+      .attr("id", "bw_period_" + p.id)

       .on("click", function() { update_period(p.id); });
     div.append("label")
       .on("click", function() { update_period(p.id); });
     div.append("label")

-      .attr("for", "period_" + p.id)
+      .attr("for", "bw_period_" + p.id)

       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);
       .text(p.label);
     if (p.id == BwDrawer.periods[0].id) {
       radio.attr("checked", true);