From b9028c2bf495d8462a22e381e33f29829af34522 Mon Sep 17 00:00:00 2001 From: numeroteca Date: Thu, 15 Jun 2017 14:18:20 +0200 Subject: [PATCH] =?UTF-8?q?reordena=20en=203=20columnas=20la=20selecci?= =?UTF-8?q?=C3=B3n=20de=20filtros.=20Issue=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style.css | 4 ++++ index.html | 46 +++++++++++++++++++++++++++++++++++----------- js/dataviz.js | 11 ++++++----- 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index 7e5abfa..3be0469 100644 --- a/css/style.css +++ b/css/style.css @@ -188,3 +188,7 @@ mark { font-size: 25px; font-weight: bold; } + +#select { + margin-bottom: 10px; +} diff --git a/index.html b/index.html index 36562b3..d41f5b7 100644 --- a/index.html +++ b/index.html @@ -67,18 +67,42 @@

Contratos menores | Ayuntamiento de Valencia 2015

Datos: @enrikuspf). Datos limpiados con OpenRefine.

-
- - -
-
Centros de gasto que emite contrato:
-
Descripción del contrato:
-
Filtros -
-
-
+
+
+
Proveedor
+
+ + +
+
+
+
Política
+
+
+
+
Descripción del contrato
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Visualización realizada por @numeroteca. Colaboran: @elctrodnd21 + @martgnz | numeroteca.org.
diff --git a/js/dataviz.js b/js/dataviz.js index 5922ae0..e28cb1c 100644 --- a/js/dataviz.js +++ b/js/dataviz.js @@ -94,6 +94,7 @@ var legend = d3.select("#legend"); var legendcosas = d3.select("#legendcosas").attr("class", "legendcosas"); var legendcentros = d3.select("#legendcentros").attr("class", "legendcentros"); var filtros = d3.select("#filters"); +var randomselect = d3.select("#randomselect"); //Class filters var filters = []; @@ -126,7 +127,7 @@ d3.tsv("data/viplist_val2015.tsv", function(error, data) {//reads the viplist.ts d3.select(this).transition().duration(0).attr("class","btn-success btn btn-default btn-xs"); //adds class success to button //svg.selectAll('.personatable text').remove( ); // svg.selectAll('.persontable>text').remove(); - filtros.select('#filterlayout1').html(d.people + " (contratos: " + d.ncontratos + ", importe: " + d.importe + "€)").style('opacity','1.0'); //write in description + filtros.select('#filterlayout1').html("" + d.people + "
Importe: " + d.importe + "€
nº de contratos: " + d.ncontratos + "").style('opacity','1.0'); //write in description //svg.selectAll('.description').text(""); // if (d.ncontratos == '-') { //don't show ( ) if the field entidad is empty // svg.select('.persontable').append('text').text(d.people).attr("class","vipname") @@ -182,7 +183,7 @@ d3.tsv("data/thinglist_val2015.tsv", function(error, data) {//reads the thinglis d3.select(this).transition().duration(0).attr("class","btn-success btn btn-default btn-xs thing"); //adds class success to button //svg.selectAll('.personatable text').remove( ); // svg.selectAll('.persontable>text').remove() - filtros.select('#filterlayout3').html(d.cosa).style('opacity','1.0'); + filtros.select('#filterlayout3').html("" + d.cosa + "").style('opacity','1.0'); //svg.selectAll('.description').text(""); // svg.select('.persontable').append('text').text(d.cosa).attr("class","vipname") // .attr("x", function() { return (randomvar == 0) ? 40 : 0;}) @@ -223,7 +224,7 @@ d3.tsv("data/centroslist_val2015.tsv", function(error, data) {//reads the centro svg.selectAll('svg .bar'+ filtersText).style("opacity",activeopacity).style("visibility","visible"); d3.select(this).transition().duration(0).attr("class","btn-success btn btn-default btn-xs centro"); //adds class success to button //svg.selectAll('.personatable text').remove( ); - filtros.select('#filterlayout2').html(d.descripEs).style('opacity','1.0'); + filtros.select('#filterlayout2').html("" + d.descripEs + "").style('opacity','1.0'); // svg.selectAll('.persontable>text').remove() //svg.selectAll('.description').text(""); // svg.select('.persontable').append('text').text(d.descripEs).attr("class","vipname") @@ -246,7 +247,7 @@ d3.tsv("data/centroslist_val2015.tsv", function(error, data) {//reads the centro }); //end read thinglist.tsv file //On load write "Todos" in the selection description -filtros.selectAll('div').html("Todos").style('opacity','0.3'); +filtros.selectAll('.filtro').html("Todos").style('opacity','0.3'); //Enters data.tsv and starts the graph----------------------------------------- d3.tsv("data/data_val2015.tsv", type, function(error, data) {//reads the data.tsv file @@ -344,7 +345,7 @@ topline.append('line') }); //Random button: posiciona las barras aleatoriamente en el eje vertical, manteniendo su posición horizontal por fecha - legendcosas.append("div").attr("class","inactive btn btn-default btn-xs pull-right") + randomselect.append("div").attr("class","inactive btn btn-default btn-xs pull-right") .text("Posición vertical aleatoria") .attr("title","Posiciona las barras que representan los gastos aleatoriamente, manteniendo la posición por fecha") .attr("id","random")