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

Fix graph

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-14 19:57:59 +01:00
parent d9886044a6
commit 9595504b56
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/boxes/box_scheduled_jobs.php
View File

@ -164,8 +164,8 @@ class box_scheduled_jobs extends ModeleBoxes
'text' => $langs->trans("NumberScheduledJobError") 'text' => $langs->trans("NumberScheduledJobError")
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => 'class="right"colspan="2"', 'td' => 'class="right" colspan="2"',
'textnoformat' => $nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0' 'textnoformat' => ($nbjobsinerror ? '<span class="error"><a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'">'.$nbjobsinerror.'</a></span>'.img_error() : '0')
); );
} else { } else {
$this->info_box_contents[0][0] = array( $this->info_box_contents[0][0] = array(

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

@ -1151,10 +1151,11 @@ class DolGraph
$this->stringtoshow .= ', stacked: true'; $this->stringtoshow .= ', stacked: true';
} }
$this->stringtoshow .= ' }]'; $this->stringtoshow .= ' }]';
$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }';
if ($type == 'bar' && count($arrayofgroupslegend) > 0) { if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
$this->stringtoshow .= ', yAxes: [{ 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 ($isfunnel) { if ($isfunnel) {
$this->stringtoshow .= ', tooltips: { mode: \'nearest\', $this->stringtoshow .= ', tooltips: { mode: \'nearest\',