Correction d'une erreur de syntaxe dans bw_graphs.js

[website.git] / assets / bw_graphs.js

diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js
index bed5e11d56106da427e252b8bec077fa83609a6a..2c93b4c677b04ae614500dfe7423dcf2b15a7855 100644 (file)
--- a/assets/bw_graphs.js
+++ b/assets/bw_graphs.js
@@ -38,9 +38,9 @@ BwDrawer.write_stack = d3.layout.stack()
 BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net";
 
 BwDrawer.periods = [
-    { id: "1_month", label: L10n.t_1_month },
-    { id: "3_months", label: L10n.t_3_months },
+    { id: "6_months", label: L10n.t_6_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) {
@@ -61,6 +61,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) {
+  // 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")
@@ -70,16 +77,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("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("id", "period_" + p.id)
+      .attr("id", "bw_period_" + p.id)
       .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);
@@ -153,7 +161,7 @@ BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
       .attr("d", function(d) { return BwDrawer.area(d.write_values); })
       .style("fill", function(d) { return BwDrawer.color(d.fingerprint); });
 
-  update_period = function(period) {
+  var update_period = function(period) {
     BwDrawer.x.domain([bw_data[period].minTime, bw_data[period].maxTime]);
     var t = svg.transition().duration(300);
     t.select(".x.axis").call(BwDrawer.xAxis);