From fc31680bd0289995caccfcb849d30d8056021f04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Mar 2020 02:55:06 +0100
Subject: [PATCH] Several fix for chart.js graphs

---
 htdocs/adherents/index.php                        | 2 +-
 htdocs/comm/propal/index.php                      | 2 +-
 htdocs/commande/index.php                         | 2 +-
 htdocs/contrat/index.php                          | 2 +-
 htdocs/core/boxes/box_graph_invoices_permonth.php | 1 +
 htdocs/core/class/conf.class.php                  | 2 ++
 htdocs/core/class/dolgraph.class.php              | 6 ++++--
 htdocs/don/index.php                              | 2 +-
 htdocs/fichinter/index.php                        | 2 +-
 htdocs/product/index.php                          | 2 +-
 htdocs/projet/graph_opportunities.inc.php         | 4 ++--
 htdocs/societe/index.php                          | 2 +-
 htdocs/supplier_proposal/index.php                | 2 +-
 htdocs/theme/eldy/global.inc.php                  | 4 ++--
 htdocs/ticket/index.php                           | 8 ++++----
 15 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index cab3e002028..180fa2d4954 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -207,7 +207,7 @@ if ($conf->use_javascript_ajax)
     $dolgraph->setShowLegend(1);
     $dolgraph->setShowPercent(1);
     $dolgraph->SetType(array('pie'));
-    $dolgraph->setWidth('100%');
+    $dolgraph->setHeight('200');
     $dolgraph->draw('idgraphstatus');
     print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 11bb4292036..1eff7f56520 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -144,7 +144,7 @@ if ($resql)
         $dolgraph->setShowLegend(1);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
-        $dolgraph->setWidth('100%');
+        $dolgraph->setHeight('200');
         $dolgraph->draw('idgraphthirdparties');
         print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index b8866a7c487..fcd510282df 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -143,7 +143,7 @@ if ($resql)
         $dolgraph->setShowLegend(1);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
-        $dolgraph->setWidth('100%');
+        $dolgraph->setHeight('200');
         $dolgraph->draw('idgraphstatus');
         print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 6dd6fc56e17..dccd02a86b6 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -212,7 +212,7 @@ if (!empty($conf->use_javascript_ajax))
     $dolgraph->setShowLegend(1);
     $dolgraph->setShowPercent(1);
     $dolgraph->SetType(array('pie'));
-    $dolgraph->setWidth('100%');
+    $dolgraph->setHeight('200');
     $dolgraph->draw('idgraphstatus');
     print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 6c0a20bc6db..e78b6e235b1 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -160,6 +160,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						}
 						$i++;
 					}
+
 					$px1->SetLegend($legend);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
 					$px1->SetWidth($WIDTH);
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 87204294947..3500b2492fe 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -683,6 +683,8 @@ class Conf
 
 		if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
 
+		if (!isset($conf->global->MAIN_JS_GRAPH)) $conf->global->MAIN_JS_GRAPH = 'chart';	// Use chart.js library
+
 		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
 		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
 
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 0035b4c813e..4dff7e50e76 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1025,7 +1025,7 @@ class DolGraph
 		// No height for the pie grah
 		$cssfordiv = 'dolgraphchart';
 		if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'pie' || $this->type[$firstlot] == 'polar')) $cssfordiv .= ' dolgraphcharpie';
-		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.(strpos($this->width, '%') > 0 ? '': 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical)?'':' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"><canvas id="canvas_'.$tag.'"></canvas></div>'."\n";
+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '': 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '': 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical)?'':' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center"><canvas id="canvas_'.$tag.'"></canvas></div>'."\n";
 
 		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
 		$i = $firstlot;
@@ -1135,12 +1135,14 @@ class DolGraph
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
 
 			$this->stringtoshow .= '
+				var options = { maintainAspectRatio: false, aspectRatio: 2.5 };
+
 				var ctx = document.getElementById("canvas_'.$tag.'").getContext("2d");
 				var chart = new Chart(ctx, {
 			    // The type of chart we want to create
     			type: \''.$type.'\',
 				// Configuration options go here
-    			options: {},
+    			options: options,
 				data: {
 					labels: [';
 
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 6366d0fb6e6..122fe61dee4 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -140,7 +140,7 @@ if ($conf->use_javascript_ajax)
     $dolgraph->setShowLegend(1);
     $dolgraph->setShowPercent(1);
     $dolgraph->SetType(array('pie'));
-    $dolgraph->setWidth('100%');
+    $dolgraph->setHeight('200');
     $dolgraph->draw('idgraphstatus');
     print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index cd18699ccdb..ff71e3b8786 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -143,7 +143,7 @@ if ($resql)
         $dolgraph->setShowLegend(1);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
-        $dolgraph->setWidth('100%');
+        $dolgraph->setHeight('200');
         $dolgraph->draw('idgraphstatus');
         print $dolgraph->show($total ? 0 : 1);
         $data = array('series'=>$dataseries);
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 161a4a1c3b5..b323faba5b9 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -183,7 +183,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 		$dolgraph->setShowLegend(1);
 		$dolgraph->setShowPercent(0);
 		$dolgraph->SetType(array('pie'));
-		$dolgraph->setWidth('100%');
+		$dolgraph->setHeight('200');
 		$dolgraph->draw('idgraphstatus');
 		print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 5a6d97c38ce..6d464a08383 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -83,8 +83,8 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	        $dolgraph->setShowLegend(1);
 	        $dolgraph->setShowPercent(1);
 	        $dolgraph->SetType(array('pie'));
-	        $dolgraph->setWidth('100%');
-	        $dolgraph->SetHeight(180);
+	        //$dolgraph->setWidth('100%');
+	        $dolgraph->SetHeight('200');
 	        $dolgraph->draw('idgraphstatus');
 	        print $dolgraph->show($totaloppnb ? 0 : 1);
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 6ae3f0cac28..2ad547700c0 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -115,7 +115,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$dolgraph->setShowLegend(1);
 	$dolgraph->setShowPercent(1);
 	$dolgraph->SetType(array('pie'));
-	$dolgraph->setWidth('100%');
+	$dolgraph->setHeight('200');
 	$dolgraph->draw('idgraphthirdparties');
 	print $dolgraph->show();
     print '</td></tr>'."\n";
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index a6c95083410..c5b2739b3d4 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -147,7 +147,7 @@ if ($resql)
         $dolgraph->setShowLegend(1);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
-        $dolgraph->setWidth('100%');
+        $dolgraph->setHeight('200');
         $dolgraph->draw('idgraphstatus');
         print $dolgraph->show($total ? 0 : 1);
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 61d0d885de0..abf43c1eef8 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3403,7 +3403,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft
 	background: -o-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
 	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
 	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
-	background: -ms-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
+	/* background: -ms-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); */
 }
 .noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre)
@@ -3419,7 +3419,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft
 	background: -o-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
 	background: -moz-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
 	background: -webkit-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
-	background: -ms-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
+	/* background: -ms-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); */
 }
 .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre)
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 92a931bf15d..5e0360e8ce7 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -110,7 +110,7 @@ if (empty($endyear)) {
 
 $startyear = $endyear - 1;
 $WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '100%' : '80%';
-$HEIGHT = '228';
+$HEIGHT = '200';
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
@@ -242,7 +242,7 @@ if (!empty($dataseries) && count($dataseries) > 1) {
         $px1->SetType(array('pie'));
         $px1->SetLegend($legend);
         $px1->SetMaxValue($px1->GetCeilMaxValue());
-        $px1->SetWidth($WIDTH);
+        //$px1->SetWidth($WIDTH);
         $px1->SetHeight($HEIGHT);
         $px1->SetYLabel($langs->trans("TicketStatByStatus"));
         $px1->SetShading(3);
@@ -327,7 +327,7 @@ if ($result) {
             print '<tr class="oddeven">';
 
             // Ref
-            print '<td class="nowrap">';
+            print '<td class="nowraponall">';
             print $tickesupstatic->getNomUrl(1);
             print "</td>\n";
 
@@ -356,7 +356,7 @@ if ($result) {
             print $objp->severity_label;
             print "</td>";
 
-            print '<td class="nowrap right">';
+            print '<td class="nowraponall right">';
             print $tickesupstatic->getLibStatut(5);
             print "</td>";