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

Fix remove warning on chartjs 3.5

Browse Source
This commit is contained in:
Laurent Destailleur 2022-04-07 17:50:18 +02:00
parent f884137433
commit 746cec015b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1303,11 +1303,13 @@ class DolGraph
$this->stringtoshow .= $xaxis; $this->stringtoshow .= $xaxis;
/* For Chartjs v2.9 */ /* For Chartjs v2.9 */
/*
if (empty($showlegend)) { if (empty($showlegend)) {
$this->stringtoshow .= 'legend: { display: false }, '."\n"; $this->stringtoshow .= 'legend: { display: false }, '."\n";
} else { } else {
$this->stringtoshow .= 'legend: { maxWidth: '.round($this->width / 2).', labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' }, '."\n"; $this->stringtoshow .= 'legend: { maxWidth: '.round($this->width / 2).', labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' }, '."\n";
} }
*/
/* For Chartjs v3.5 */ /* For Chartjs v3.5 */
$this->stringtoshow .= 'plugins: { '."\n"; $this->stringtoshow .= 'plugins: { '."\n";
@ -1318,7 +1320,9 @@ class DolGraph
} }
$this->stringtoshow .= "}, \n"; $this->stringtoshow .= "}, \n";
$this->stringtoshow .= 'scales: { xAxes: [{ '; /* For Chartjs v2.9 */
/*
$this->stringtoshow .= 'scales: { xAxis: [{ ';
if ($this->hideXValues) { if ($this->hideXValues) {
$this->stringtoshow .= ' ticks: { display: false }, display: true,'; $this->stringtoshow .= ' ticks: { display: false }, display: true,';
} }
@ -1328,11 +1332,12 @@ class DolGraph
$this->stringtoshow .= ', stacked: true'; $this->stringtoshow .= ', stacked: true';
} }
$this->stringtoshow .= ' }]'; $this->stringtoshow .= ' }]';
$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }'; $this->stringtoshow .= ', yAxis: [{ ticks: { beginAtZero: true }';
if ($type == 'bar' && count($arrayofgroupslegend) > 0) { if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
$this->stringtoshow .= ', stacked: true'; $this->stringtoshow .= ', stacked: true';
} }
$this->stringtoshow .= ' }] }'; $this->stringtoshow .= ' }] }';
*/
// Add a callback to change label to show only positive value // Add a callback to change label to show only positive value
if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) { if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) {