From c7bcb85d9a6aa4292df201c46cb73e3dfc823723 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 4 Jul 2024 12:17:13 +0530 Subject: [PATCH] fixed integer data is shown as decimal in pie chart --- modules/graphnvd3/graphnvd3.php | 1 + modules/statsbestcategories/statsbestcategories.php | 2 +- modules/statsbestproducts/statsbestproducts.php | 2 +- modules/statspersonalinfos/statspersonalinfos.php | 12 ++++++++---- modules/statssales/statssales.php | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/graphnvd3/graphnvd3.php b/modules/graphnvd3/graphnvd3.php index 62b104acf..f2439f53b 100644 --- a/modules/graphnvd3/graphnvd3.php +++ b/modules/graphnvd3/graphnvd3.php @@ -92,6 +92,7 @@ class GraphNvD3 extends ModuleGraphEngine .y(function(d) { return d.value; }) .showLabels(true) .labelType("percent")' + .((isset($params['format']) && $params['format']) ? '.valueFormat(d3.format("'.$params['format'].'"))' : '') ); return ' diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index 55198a104..1ec55aa3c 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -62,7 +62,7 @@ class StatsBestCategories extends ModuleGrid ), array( 'id' => 'totalRoomsBooked', - 'header' => $this->l('Rooms booked'), + 'header' => $this->l('Room nights booked'), 'dataIndex' => 'totalRoomsBooked', 'align' => 'center', 'tooltip' => $this->l('The room nights booked for the hotel.'), diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index 61100c405..537e63f1a 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -70,7 +70,7 @@ class StatsBestProducts extends ModuleGrid ), array( 'id' => 'totalRoomsBooked', - 'header' => $this->l('Rooms booked'), + 'header' => $this->l('Room nights booked'), 'dataIndex' => 'totalRoomsBooked', 'tooltip' => $this->l('The room nights booked for the room type.'), 'align' => 'center', diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index 045ac0f4e..a0e30f0d6 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -116,7 +116,8 @@ class StatsPersonalInfos extends ModuleGraph
'.$this->engine(array( 'type' => 'pie', - 'option' => 'gender' + 'option' => 'gender', + 'format' => 'd' )).'
@@ -133,7 +134,8 @@ class StatsPersonalInfos extends ModuleGraph
'.$this->engine(array( 'type' => 'pie', - 'option' => 'age' + 'option' => 'age', + 'format' => 'd' )).'
@@ -150,7 +152,8 @@ class StatsPersonalInfos extends ModuleGraph
'.$this->engine(array( 'type' => 'pie', - 'option' => 'country' + 'option' => 'country', + 'format' => 'd' )).'
@@ -167,7 +170,8 @@ class StatsPersonalInfos extends ModuleGraph
'.$this->engine(array( 'type' => 'pie', - 'option' => 'currency' + 'option' => 'currency', + 'format' => 'd' )).'
diff --git a/modules/statssales/statssales.php b/modules/statssales/statssales.php index cda0279cb..264ddc207 100644 --- a/modules/statssales/statssales.php +++ b/modules/statssales/statssales.php @@ -176,6 +176,7 @@ class StatsSales extends ModuleGraph '.($totals['orderCount'] ? $this->engine(array( 'type' => 'pie', 'option' => '3-'.(int)Tools::getValue('id_country').'-'.(int)Tools::getValue('id_hotel'), + 'format' => 'd' )) : $this->l('No orders found.')).'