From ce901ca4136e5980e940450cbcf6f70e01f18006 Mon Sep 17 00:00:00 2001 From: fbormann Date: Tue, 21 Feb 2017 16:56:56 -0300 Subject: [PATCH] modified subtitles of donut resource chart --- amadeus/static/css/base/amadeus.css | 8 ++------ amadeus/static/js/charts/home.js | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 8b95327..67363f4 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -1142,18 +1142,14 @@ li.item .notify_badge { /* CHART APP */ .pie-tooltip{ - background: #eee; - box-shadow: 0 0 5px #999999; - color: #333; - display: none; + + font-size: 30px; left: 130px; padding: 10px; position: absolute; text-align: center; - top: 95px; width: 80px; - z-index: 10; } diff --git a/amadeus/static/js/charts/home.js b/amadeus/static/js/charts/home.js index 7f67dd3..da8a424 100644 --- a/amadeus/static/js/charts/home.js +++ b/amadeus/static/js/charts/home.js @@ -60,27 +60,25 @@ var resource_donut_chart = { .attr('fill', function(d, i) { return color(i); }); - + var labelArc = d3.arc() + .outerRadius(radius*1.2 - donutInner) + .innerRadius(radius*1.2 - donutInner); + svg.selectAll("text.pie-tooltip") - .data(dataset) + .data(pie(dataset)) .enter() .append("text") - .text(function(d){ - return d[0]; - }) .attr("id", function(d){ - return d[0]; + return d.data[0]; }) - .attr("class","pie-tooltip"); - - path.on('mouseover', function(d) { //When the mouse is over the path - $('#'+d.data[0]).css("display", "block"); - }); + .attr("class","pie-tooltip") + .attr('fill',"#172121") + .attr("transform", function(d) { return "translate(" + labelArc.centroid(d) + ")"; }) + .attr("dy", ".35em") + .text(function(d) { return d.data[0]; }); - path.on('mouseout', function(d) { //When the mouse "leaves" the path - t = $('#'+d.data[0]).css("display", "none"); - }); + }) // end of the get method } -- libgit2 0.21.2