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

Merge branch 'Dolibarr:develop' into develop

Browse Source
This commit is contained in:
mikygee 2022-09-04 21:12:01 +02:00 committed by GitHub
commit 194ae4e51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,7 +515,7 @@ class DolGraph
/** /**
* Show pointvalue or not * Show pointvalue or not
* *
* @param int $showpointvalue 1=Show value for each point, as tooltip or inline (default), 0=Hide value * @param int $showpointvalue 1=Show value for each point, as tooltip or inline (default), 0=Hide value, 2=Show values for each serie on same point
* @return void * @return void
*/ */
public function setShowPointValue($showpointvalue) public function setShowPointValue($showpointvalue)
@ -1299,8 +1299,12 @@ class DolGraph
$type = 'line'; $type = 'line';
} }
// Set options
$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, '; $this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
$this->stringtoshow .= $xaxis; $this->stringtoshow .= $xaxis;
if ($this->showpointvalue == 2) {
$this->stringtoshow .= 'interaction: { intersect: true, mode: \'index\'}, ';
}
/* For Chartjs v2.9 */ /* For Chartjs v2.9 */
/* /*