diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php index 6e202031ea6611bcc77faebc61dbce9179068bf8..34b350d83aa33e8c9a99edea00c8ec91458fcbf0 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php @@ -111,6 +111,10 @@ class Haanga_Extension_Filter_D3LineChart{ $pre = "<div id='".$divId."'></div> <script src='http://d3js.org/d3.v2.min.js?2.9.3'></script> <script type='text/javascript'> + //Adding namespaces + d3.ns.prefix['vsr'] = 'http://purl.org/twc/vocab/vsr#'; + d3.ns.prefix['rdf'] = 'http://www.w3.org/2000/01/rdf-schema#'; + var options_$divId = ".json_encode($options)."; var dataset_$divId = ".json_encode($data)."; var color = d3.scale.category10(); diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php b/lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php index 29966dfa2df4b94aba9c56172f236cdb942fa468..d3cc9440c7de7d11e093463054baf60a90ab2394 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/D3stackedcolumnchart.php @@ -240,7 +240,7 @@ tooltip_$divId = svg.append('text').style('opacity', 0).style('font-family', 'sa //Events d3.selectAll('rect.bar') .on('mouseover', function(e){ - newX = parseFloat(d3.select(this).attr('x')) + 0*parseFloat(d3.select(this).attr('width')); + console.log('asd'); newY = parseFloat(d3.select(this).attr('y')); if(newY > maxHeight_$divId){ newY -=10; @@ -248,6 +248,7 @@ d3.selectAll('rect.bar') if(newY < 10){ newY +=11; } + console.log('asd'); tooltip_$divId.style('opacity', 1).attr('y', newY).attr('x', newX).text(e.values); d3.select(this).style('opacity', 1); }).on('mouseout', function(){