lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to have this protected. Property can be read with method show()

Browse Source 
and this method can be override.
This commit is contained in:
Laurent Destailleur 2015-03-13 21:45:52 +01:00
parent bc3f9bf800
commit d056abc4e1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/class/dolgraph.class.php
View File

@ -65,7 +65,7 @@ class DolGraph
var $bgcolorgrid=array(255,255,255); // array(R,G,B) var $bgcolorgrid=array(255,255,255); // array(R,G,B)
var $datacolor; // array(array(R,G,B),...) var $datacolor; // array(array(R,G,B),...)
protected $_stringtoshow; // To store string to output graph into HTML page private $_stringtoshow; // To store string to output graph into HTML page
/** /**
@ -935,16 +935,16 @@ class DolGraph
opacity: 0.80 opacity: 0.80
}).appendTo("body").fadeIn(20); }).appendTo("body").fadeIn(20);
} }
var previousPoint = null; var previousPoint = null;
$("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) { $("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2)); $("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2)); $("#y").text(pos.y.toFixed(2));
if (item) { if (item) {
if (previousPoint != item.dataIndex) { if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex; previousPoint = item.dataIndex;
$("#tooltip").remove(); $("#tooltip").remove();
/* console.log(item); */ /* console.log(item); */
var x = item.datapoint[0].toFixed(2); var x = item.datapoint[0].toFixed(2);
@ -1022,7 +1022,7 @@ class DolGraph
return $this->_stringtoshow; return $this->_stringtoshow;
} }
/** /**
* getDefaultGraphSizeForStats * getDefaultGraphSizeForStats
* *
@ -1033,18 +1033,18 @@ class DolGraph
static function getDefaultGraphSizeForStats($direction,$defaultsize='') static function getDefaultGraphSizeForStats($direction,$defaultsize='')
{ {
global $conf; global $conf;
if ($direction == 'width') if ($direction == 'width')
{ {
if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500'); if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40)); else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
} }
if ($direction == 'height') if ($direction == 'height')
{ {
return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160'); return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
} }
return 0; return 0;
} }
} }