From 65143884ff015e878041eddfb02c19f56f9f9fd4 Mon Sep 17 00:00:00 2001 From: Nazareno Andrade Date: Sat, 10 Sep 2016 11:56:05 -0300 Subject: [PATCH] Passa a usar https no streamchart --- js/streamgraph.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/js/streamgraph.js b/js/streamgraph.js index 3e7f3614..d9244770 100644 --- a/js/streamgraph.js +++ b/js/streamgraph.js @@ -104,7 +104,7 @@ var svg = d3.select("#stream").append("svg") 'class': 'streamchart' }) .append("g") - .attr("transform", "translate(" + margin.left + "," + margin.top + ")") + .attr("transform", "translate(" + margin.left + "," + margin.top + ")") .call(zoom); var chart = svg.append('g').attr('id', 'g-chart'); @@ -120,7 +120,7 @@ document.getElementById("aFazeres").onclick = function() { if(aFazeres.options[aFazeres.selectedIndex].value != ultimoAFazer){ ultimoAFazer = aFazeres.options[aFazeres.selectedIndex].value; d3.select("#g-chart").selectAll("*").remove(); - createGraph("http://web.cloud.lsd.ufcg.edu.br:44142/ementas/contagem?count_by="+aFazeres.options[aFazeres.selectedIndex].value); + createGraph("https://wwws.cloud.lsd.ufcg.edu.br:44142/ementas/contagem?count_by="+aFazeres.options[aFazeres.selectedIndex].value); } }; @@ -142,7 +142,7 @@ function createGraph(request){ x.domain(d3.extent(data, function(d) { return d.date; })); y.domain([0, d3.max(data, function(d) { return d.y0 + d.y; })]); - + var invertedx = ""; chart.selectAll(".layer") @@ -183,9 +183,9 @@ function createGraph(request){ d3.select(this) .classed("hover", true) .attr("stroke", strokecolor) - .attr("stroke-width", "0.5px"), + .attr("stroke-width", "0.5px"), tooltip.html( "

" + d.key + "
quant: " + pro + "
data: "+invertedx+"

" ).style("visibility", "visible"); - + }) .on("mouseout", function(d, i) { chart.selectAll(".layer") @@ -213,12 +213,12 @@ function createGraph(request){ d3.select(this) .classed("hover", true) .attr("stroke", strokecolor) - .attr("stroke-width", "0.5px"), + .attr("stroke-width", "0.5px"), tooltip.html( "

" + d.key + "
quant: " + pro + "
data: "+invertedx+"

" ).style("visibility", "visible"); - + }) - + }); } - createGraph("http://web.cloud.lsd.ufcg.edu.br:44142/ementas/contagem?count_by=tipo"); -} \ No newline at end of file + createGraph("https://wwws.cloud.lsd.ufcg.edu.br:44142/ementas/contagem?count_by=tipo"); +}