From e6412a26b2cbacc6174fe592ea7402d67b306e62 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@graves.cl>
Date: Thu, 21 Mar 2013 09:36:50 -0700
Subject: [PATCH] added prefixes in line chart
---
lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php | 4 ++++
.../lib/Haanga/Extension/Filter/D3stackedcolumnchart.php | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/D3linechart.php
index 6e202031..34b350d8 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 29966dfa..d3cc9440 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(){
--
GitLab