Fix graph

aror99 · Dec 14, 2020 · 9595504 · 9595504
1 parent d988604
commit 9595504
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -164,8 +164,8 @@ public function loadBox($max = 5)
 					'text' => $langs->trans("NumberScheduledJobError")
 				);
 				$this->info_box_contents[$line][] = array(
-					'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'
+					'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')
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
@@ -1151,10 +1151,11 @@ private function draw_chart($file, $fileurl)
 				$this->stringtoshow .= ', stacked: true';
 			}
 			$this->stringtoshow .= ' }]';
+			$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }';
 			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
 			if ($isfunnel) {
 				$this->stringtoshow .= ', tooltips: { mode: \'nearest\',