From b71a8c5d6f3b83f2837f4529cdac87433f1871a8 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 8 Mar 2021 15:26:35 +0100
Subject: [PATCH] Close #15917 : boxes on ticket index

---
 .../core/boxes/box_nb_ticket_last_x_days.php  |  57 +++--
 htdocs/core/boxes/box_nb_tickets_type.php     | 208 ++++++++++++++++++
 htdocs/core/boxes/box_new_vs_close_ticket.php | 181 +++++++++++++++
 htdocs/core/boxes/box_ticket_by_severity.php  |   9 +-
 htdocs/core/modules/modTicket.class.php       |   4 +-
 .../install/mysql/migration/13.0.0-14.0.0.sql |   2 +
 htdocs/langs/en_US/ticket.lang                |   6 +-
 htdocs/ticket/index.php                       | 201 ++---------------
 8 files changed, 449 insertions(+), 219 deletions(-)
 create mode 100644 htdocs/core/boxes/box_nb_tickets_type.php
 create mode 100644 htdocs/core/boxes/box_new_vs_close_ticket.php

diff --git a/htdocs/core/boxes/box_nb_ticket_last_x_days.php b/htdocs/core/boxes/box_nb_ticket_last_x_days.php
index a963b5ff346..4cf5adba252 100644
--- a/htdocs/core/boxes/box_nb_ticket_last_x_days.php
+++ b/htdocs/core/boxes/box_nb_ticket_last_x_days.php
@@ -55,7 +55,7 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
 		$langs->load("boxes");
 		$this->db = $db;
 
-		$this->boxlabel = $langs->transnoentitiesnoconv("BoxTicketLastXDayswidget");
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxNumberOfTicketByDay");
 	}
 
 	/**
@@ -109,38 +109,37 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
 		$minimumdatec = date_sub($today, $intervaltosub);
 		$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
 
-		$sql = "SELECT CAST(t.datec AS DATE) as datec, COUNT(t.datec) as nb";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-		$sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL " . $days . " DAY)";
-		$sql .= " GROUP BY CAST(t.datec AS DATE)";
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			$dataseries = array();
-			while ($i < $num) {
-				$objp = $this->db->fetch_object($resql);
-				while ($minimumdatecformated < $objp->datec) {
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT CAST(t.datec AS DATE) as datec, COUNT(t.datec) as nb";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL " . $days . " DAY)";
+			$sql .= " GROUP BY CAST(t.datec AS DATE)";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				$dataseries = array();
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					while ($minimumdatecformated < $objp->datec) {
+						$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
+						$minimumdatec = date_add($minimumdatec, $intervaltoadd);
+						$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+					}
+					$dataseries[] = array('label' => dol_print_date($objp->datec, 'day'), 'data' => $objp->nb);
+					$minimumdatec = date_add($minimumdatec, $intervaltoadd);
+					$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+					$i++;
+				}
+				while (count($dataseries) < $days) {
 					$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
 					$minimumdatec = date_add($minimumdatec, $intervaltoadd);
 					$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+					$i++;
 				}
-				$dataseries[] = array('label' => dol_print_date($objp->datec, 'day'), 'data' => $objp->nb);
-				$minimumdatec = date_add($minimumdatec, $intervaltoadd);
-				$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
-				$i++;
+			} else {
+				dol_print_error($this->db);
 			}
-			while (count($dataseries) < $days) {
-				$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
-				$minimumdatec = date_add($minimumdatec, $intervaltoadd);
-				$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
-				$i++;
-			}
-		} else {
-			dol_print_error($this->db);
-		}
-
-		if ($user->rights->ticket->read) {
 			$stringtoshow = '<div class="div-table-responsive-no-min">';
 			$stringtoshow .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
@@ -170,7 +169,7 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
 				$px1->SetData($data);
 				$px1->setShowLegend(2);
 				$px1->SetType(array('bar'));
-				$px1->SetLegend(array($langs->trans('NumberOfTicketByDay')));
+				$px1->SetLegend(array($langs->trans('BoxNumberOfTicketByDay')));
 				$px1->SetMaxValue($px1->GetCeilMaxValue());
 				$px1->SetHeight(192);
 				$px1->SetShading(3);
diff --git a/htdocs/core/boxes/box_nb_tickets_type.php b/htdocs/core/boxes/box_nb_tickets_type.php
new file mode 100644
index 00000000000..c73eeac97f3
--- /dev/null
+++ b/htdocs/core/boxes/box_nb_tickets_type.php
@@ -0,0 +1,208 @@
+<?php
+/* Module descriptor for ticket system
+ * Copyright (C) 2013-2016  Jean-François FERRY     <hello@librethic.io>
+ *               2016       Christophe Battarel     <christophe@altairis.fr>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     \file        core/boxes/box_nb_ticket_last_x_days.php
+ *     \ingroup     ticket
+ *     \brief       This box shows the number of new daily tickets the last X days
+ */
+require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box
+ */
+class box_nb_tickets_type extends ModeleBoxes
+{
+
+	public $boxcode = "box_nb_tickets_type";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$this->db = $db;
+
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxTicketType");
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+
+		$badgeStatus0 = '#cbd3d3'; // draft
+		$badgeStatus1 = '#bc9526'; // validated
+		$badgeStatus1b = '#bc9526'; // validated
+		$badgeStatus2 = '#9c9c26'; // approved
+		$badgeStatus3 = '#bca52b';
+		$badgeStatus4 = '#25a580'; // Color ok
+		$badgeStatus4b = '#25a580'; // Color ok
+		$badgeStatus5 = '#cad2d2';
+		$badgeStatus6 = '#cad2d2';
+		$badgeStatus7 = '#baa32b';
+		$badgeStatus8 = '#993013';
+		$badgeStatus9 = '#e7f0f0';
+		$text = $langs->trans("BoxTicketType");
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text)
+		);
+
+		$listofopplabel = array();
+		$listofoppcode = array();
+		$colorseriesstat = array();
+		if ($user->rights->ticket->read) {
+			$sql = "SELECT ctt.rowid, ctt.label, ctt.code";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
+			$sql .= " WHERE ctt.active = 1";
+			$sql .= $this->db->order('ctt.rowid', 'ASC');
+			$resql = $this->db->query($sql);
+
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$listofoppcode[$objp->rowid] = $objp->code;
+					$listofopplabel[$objp->rowid] = $objp->label;
+					switch ($objp->code) {
+						case 'COM':
+							$colorseriesstat[$objp->rowid] = $badgeStatus1;
+							break;
+						case 'HELP':
+							$colorseriesstat[$objp->rowid] = $badgeStatus2;
+							break;
+						case 'ISSUE':
+							$colorseriesstat[$objp->rowid] = $badgeStatus3;
+							break;
+						case 'REQUEST':
+							$colorseriesstat[$objp->rowid] = $badgeStatus4;
+							break;
+						case 'OTHER':
+							$colorseriesstat[$objp->rowid] = $badgeStatus5;
+							break;
+						default:
+							break;
+					}
+					$i++;
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			$dataseries = array();
+			$data = array();
+			$sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " WHERE t.fk_statut <> 8";
+			$sql .= " GROUP BY t.type_code";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$objp = $this->db->fetch_object($resql);
+					$data[$objp->type_code] = $objp->nb;
+					$i++;
+				}
+				foreach ($listofoppcode as $rowid => $code) {
+					$dataseries[] = array('label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_category', 'code', 'label', $code), 'data' => $data[$code]);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			$stringtoprint = '';
+			$stringtoprint .= '<div class="div-table-responsive-no-min ">';
+			if (!empty($dataseries) && count($dataseries) > 0) {
+				$px1 = new DolGraph();
+				$mesg = $px1->isGraphKo();
+				$totalnb = 0;
+				if (!$mesg) {
+					$px1->SetDataColor(array_values($colorseriesstat));
+					$data = array();
+					$legend = array();
+					foreach ($dataseries as $value) {
+						$data[] = array($value['label'], $value['data']);
+						$totalnb += $value['data'];
+					}
+					$px1->SetData($data);
+					$px1->setShowLegend(2);
+					$px1->SetType(array('pie'));
+					$px1->SetLegend($legend);
+					$px1->SetMaxValue($px1->GetCeilMaxValue());
+					$px1->SetShading(3);
+					$px1->SetHorizTickIncrement(1);
+					$px1->SetCssPrefix("cssboxes");
+					$px1->mode = 'depth';
+					$px1->draw('idgraphtickettype');
+					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
+				}
+				$stringtoprint .= '</div>';
+				$this->info_box_contents[][]=array(
+					'td' => 'center',
+					'text' => $stringtoprint
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text' => $langs->trans("BoxNoTicketSeverity"),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"),
+			);
+		}
+	}
+
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_new_vs_close_ticket.php b/htdocs/core/boxes/box_new_vs_close_ticket.php
new file mode 100644
index 00000000000..56544257460
--- /dev/null
+++ b/htdocs/core/boxes/box_new_vs_close_ticket.php
@@ -0,0 +1,181 @@
+<?php
+/* Module descriptor for ticket system
+ * Copyright (C) 2013-2016  Jean-François FERRY     <hello@librethic.io>
+ *               2016       Christophe Battarel     <christophe@altairis.fr>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     \file        core/boxes/box_nb_ticket_last_x_days.php
+ *     \ingroup     ticket
+ *     \brief       This box shows the number of new daily tickets the last X days
+ */
+require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box
+ */
+class box_new_vs_close_ticket extends ModeleBoxes
+{
+
+	public $boxcode = "box_nb_tickets_type";
+	public $boximg = "ticket";
+	public $boxlabel;
+	public $depends = array("ticket");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+
+	public $param;
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+	/**
+	 * Constructor
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $langs;
+		$langs->load("boxes");
+		$this->db = $db;
+
+		$this->boxlabel = $langs->transnoentitiesnoconv("BoxNewTicketVSClose");
+	}
+
+	/**
+	 * Load data into info_box_contents array to show array later.
+	 *
+	 *     @param  int $max Maximum number of records to load
+	 *     @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
+
+		$badgeStatus0 = '#cbd3d3'; // draft
+		$badgeStatus1 = '#bc9526'; // validated
+		$badgeStatus1b = '#bc9526'; // validated
+		$badgeStatus2 = '#9c9c26'; // approved
+		$badgeStatus3 = '#bca52b';
+		$badgeStatus4 = '#25a580'; // Color ok
+		$badgeStatus4b = '#25a580'; // Color ok
+		$badgeStatus5 = '#cad2d2';
+		$badgeStatus6 = '#cad2d2';
+		$badgeStatus7 = '#baa32b';
+		$badgeStatus8 = '#993013';
+		$badgeStatus9 = '#e7f0f0';
+		$text = $langs->trans("BoxNewTicketVSClose");
+		$this->info_box_head = array(
+			'text' => $text,
+			'limit' => dol_strlen($text)
+		);
+
+		if ($user->rights->ticket->read) {
+			$data = array();
+			$totalnb = 0;
+			$sql = "SELECT COUNT(t.datec) as nb";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " WHERE CAST(t.datec AS DATE) = CURRENT_DATE";
+			$sql .= " AND t.fk_statut <> 8";
+			$sql .= " GROUP BY CAST(t.datec AS DATE)";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				if ($num > 0) {
+					$objp = $this->db->fetch_object($resql);
+					$data[] = array($langs->trans('TicketCreatedToday'), $objp->nb);
+					$totalnb += $objp->nb;
+				} else {
+					$data[] = array($langs->trans('TicketCreatedToday'), 0);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			$sql = "SELECT COUNT(t.date_close) as nb";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " WHERE CAST(t.date_close AS DATE) = CURRENT_DATE";
+			$sql .= " AND t.fk_statut = 8";
+			$sql .= " GROUP BY CAST(t.date_close AS DATE)";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				if ($num > 0) {
+					$objp = $this->db->fetch_object($resql);
+					$data[] = array($langs->trans('TicketClosedToday'), $objp->nb);
+					$totalnb += $objp->nb;
+				} else {
+					$data[] = array($langs->trans('TicketClosedToday'), 0);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+			$colorseries = array();
+			$colorseries[] = $badgeStatus8;
+			$colorseries[] = $badgeStatus2;
+			$stringtoprint = '';
+			$stringtoprint .= '<div class="div-table-responsive-no-min ">';
+			if (!empty($data) && count($data) > 0) {
+				$px1 = new DolGraph();
+				$mesg = $px1->isGraphKo();
+				if (!$mesg) {
+					$px1->SetDataColor(array_values($colorseries));
+					$px1->SetData($data);
+					$px1->setShowLegend(2);
+					$px1->SetType(array('pie'));
+					$px1->SetMaxValue($px1->GetCeilMaxValue());
+					$px1->SetShading(3);
+					$px1->SetHorizTickIncrement(1);
+					$px1->SetCssPrefix("cssboxes");
+					$px1->mode = 'depth';
+
+					$px1->draw('idgraphticketnewvsclosetoday');
+					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
+				}
+				$stringtoprint .= '</div>';
+				$this->info_box_contents[][]=array(
+					'td' => 'center',
+					'text' => $stringtoprint
+				);
+			} else {
+				$this->info_box_contents[0][0] = array(
+					'td' => 'class="center opacitymedium"',
+					'text' => $langs->trans("BoxNoTicketSeverity"),
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => 'class="left"',
+				'text' => $langs->trans("ReadPermissionNotAllowed"),
+			);
+		}
+	}
+
+	/**
+	 *     Method to show box
+	 *
+	 *     @param  array $head     Array with properties of box title
+	 *     @param  array $contents Array with properties of box lines
+	 *     @param  int   $nooutput No print, only return string
+	 *     @return string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_ticket_by_severity.php b/htdocs/core/boxes/box_ticket_by_severity.php
index ac0c0b7bedb..3f9ef17308c 100644
--- a/htdocs/core/boxes/box_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_ticket_by_severity.php
@@ -94,11 +94,10 @@ class box_ticket_by_severity extends ModeleBoxes
 			'limit' => dol_strlen($text)
 		);
 
+		$listofopplabel = array();
+		$listofoppcode = array();
+		$colorseriesstat = array();
 		if ($user->rights->ticket->read) {
-			$listofopplabel = array();
-			$listofoppcode = array();
-			$colorseriesstat = array();
-
 			$sql = "SELECT cts.rowid, cts.label, cts.code";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
 			$sql .= " WHERE cts.active = 1";
@@ -174,7 +173,7 @@ class box_ticket_by_severity extends ModeleBoxes
 					$px1->SetType(array('pie'));
 					$px1->SetLegend($legend);
 					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					$px1->SetHeight($HEIGHT);
+					//$px1->SetHeight($HEIGHT);
 					$px1->SetShading(3);
 					$px1->SetHorizTickIncrement(1);
 					$px1->SetCssPrefix("cssboxes");
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 01c58b917fb..2db99938778 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -145,7 +145,9 @@ class modTicket extends DolibarrModules
 			0=>array('file'=>'box_last_ticket.php', 'enabledbydefaulton'=>'Home'),
 			1=>array('file'=>'box_last_modified_ticket.php', 'enabledbydefaulton'=>'Home'),
 			2=>array('file'=>'box_ticket_by_severity.php', 'enabledbydefaulton'=>'ticketindex'),
-			3=>array('file'=>'box_nb_ticket_last_x_days.php', 'enabledbydefaulton'=>'ticketindex')
+			3=>array('file'=>'box_nb_ticket_last_x_days.php', 'enabledbydefaulton'=>'ticketindex'),
+			4=>array('file'=>'box_nb_tickets_type.php', 'enabledbydefaulton'=>'ticketindex'),
+			5=>array('file'=>'box_new_vs_close_ticket.php', 'enabledbydefaulton'=>'ticketindex')
 		); // Boxes list
 
 		// Permissions
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 49733b50421..4a81f5f0d20 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -259,3 +259,5 @@ ALTER TABLE llx_salary CHANGE paye paye smallint default 0 NOT NULL;
 
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_ticket_by_severity.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_ticket_by_severity.php' AND entity = 1);
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_nb_ticket_last_x_days.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_nb_ticket_last_x_days.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_nb_tickets_type.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_nb_tickets_type.php' AND entity = 1);
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_new_vs_close_ticket.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_new_vs_close_ticket.php' AND entity = 1);
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index bda7d9b0354..93f55289351 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -302,13 +302,13 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-ChartTicketType=Number of open tickets by type
+BoxTicketType=Number of open tickets by type
 BoxTicketSeverity=Number of open tickets by severity
 BoxNoTicketSeverity=No tickets opened
 BoxTicketLastXDays=Number of new tickets by days the last %s days
 BoxTicketLastXDayswidget = Number of new tickets by days the last X days
 BoxNoTicketLastXDays=No new tickets the last %s days
-NumberOfTicketByDay=Number of new tickets by day
-ChartNewTicketVSClose=Number of today's new tickets versus today's closed tickets
+BoxNumberOfTicketByDay=Number of new tickets by day
+BoxNewTicketVSClose=Number of today's new tickets versus today's closed tickets
 TicketCreatedToday=Ticket created today
 TicketClosedToday=Ticket closed today
\ No newline at end of file
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 79d55fdcff5..1495b597774 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -26,6 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $hookmanager = new HookManager($db);
 
@@ -70,6 +71,7 @@ $object = new Ticket($db);
 /*
  * View
  */
+$resultboxes = FormOther::getBoxesArea($user, "11"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 $form = new Form($db);
 $tickesupstatic = new Ticket($db);
@@ -77,7 +79,7 @@ $tickesupstatic = new Ticket($db);
 llxHeader('', $langs->trans('TicketsIndex'), '');
 
 $linkback = '';
-print load_fiche_titre($langs->trans('TicketsIndex'), $linkback, 'ticket');
+print load_fiche_titre($langs->trans('TicketsIndex'), $resultboxes['selectboxlist'], 'ticket');
 
 
 $dir = '';
@@ -181,7 +183,7 @@ if ($result) {
 		}
 	}
 
-	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
 	$dataseries = array();
 	$colorseries = array();
@@ -398,186 +400,23 @@ if ($result) {
 	dol_print_error($db);
 }
 
-/*
- * Chart of Ticket Type
- */
-
-$listofopplabel = array();
-$listofoppcode = array();
-$colorseriesstat = array();
-
-$sql = "SELECT ctt.rowid, ctt.label, ctt.code";
-$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
-$sql .= " WHERE ctt.active = 1";
-$sql .= $db->order('ctt.rowid', 'ASC');
-$resql = $db->query($sql);
-
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num) {
-		$objp = $db->fetch_object($resql);
-		$listofoppcode[$objp->rowid] = $objp->code;
-		$listofopplabel[$objp->rowid] = $objp->label;
-		switch ($objp->code) {
-			case 'COM':
-				$colorseriesstat[$objp->rowid] = $badgeStatus1;
-				break;
-			case 'HELP':
-				$colorseriesstat[$objp->rowid] = $badgeStatus2;
-				break;
-			case 'ISSUE':
-				$colorseriesstat[$objp->rowid] = $badgeStatus3;
-				break;
-			case 'REQUEST':
-				$colorseriesstat[$objp->rowid] = $badgeStatus4;
-				break;
-			case 'OTHER':
-				$colorseriesstat[$objp->rowid] = $badgeStatus5;
-				break;
-			default:
-				break;
-		}
-		$i++;
-	}
-} else {
-	dol_print_error($db);
-}
-
-$dataseries = array();
-$data = array();
-$sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
-$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-$sql .= " WHERE t.fk_statut <> 8";
-$sql .= " GROUP BY t.type_code";
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num) {
-		$objp = $db->fetch_object($resql);
-		$data[$objp->type_code] = $objp->nb;
-		$i++;
-	}
-	foreach ($listofoppcode as $rowid => $code) {
-		$dataseries[] = array('label' => $langs->getLabelFromKey($db, 'TicketTypeShort' . $code, 'c_ticket_category', 'code', 'label', $code), 'data' => $data[$code]);
-	}
-} else {
-	dol_print_error($db);
-}
-$transChartTicketType = $langs->trans('ChartTicketType');
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><th colspan="5">' . $transChartTicketType . '</th></tr>';
-print '<td class="">';
-if (!empty($dataseries) && count($dataseries) > 0) {
-	$px1 = new DolGraph();
-	$mesg = $px1->isGraphKo();
-	$totalnb = 0;
-	if (!$mesg) {
-		$px1->SetDataColor(array_values($colorseriesstat));
-		$data = array();
-		$legend = array();
-		foreach ($dataseries as $value) {
-			$data[] = array($value['label'], $value['data']);
-			$totalnb += $value['data'];
-		}
-		$px1->SetData($data);
-		$px1->setShowLegend(2);
-		$px1->SetType(array('pie'));
-		$px1->SetLegend($legend);
-		$px1->SetMaxValue($px1->GetCeilMaxValue());
-		$px1->SetHeight($HEIGHT);
-		$px1->SetShading(3);
-		$px1->SetHorizTickIncrement(1);
-		$px1->SetCssPrefix("cssboxes");
-		$px1->mode = 'depth';
-
-		$px1->draw('idgraphtickettype');
-		print $px1->show($totalnb ? 0 : 1);
-	}
-}
-
-print '</td>';
-print "</table>";
-print '</div>';
-
-
-$dataseries = array();
-$data = array();
-$totalnb = 0;
-$sql = "SELECT COUNT(t.datec) as nb";
-$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-$sql .= " WHERE CAST(t.datec AS DATE) = CURRENT_DATE";
-$sql .= " AND t.fk_statut <> 8";
-$sql .= " GROUP BY CAST(t.datec AS DATE)";
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	if ($num > 0) {
-		$objp = $db->fetch_object($resql);
-		$data[] = array($langs->trans('TicketCreatedToday'), $objp->nb);
-		$totalnb += $objp->nb;
-	} else {
-		$data[] = array($langs->trans('TicketCreatedToday'), 0);
-	}
-} else {
-	dol_print_error($db);
-}
-$sql = "SELECT COUNT(t.date_close) as nb";
-$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
-$sql .= " WHERE CAST(t.date_close AS DATE) = CURRENT_DATE";
-$sql .= " AND t.fk_statut = 8";
-$sql .= " GROUP BY CAST(t.date_close AS DATE)";
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	if ($num > 0) {
-		$objp = $db->fetch_object($resql);
-		$data[] = array($langs->trans('TicketClosedToday'), $objp->nb);
-		$totalnb += $objp->nb;
-	} else {
-		$data[] = array($langs->trans('TicketClosedToday'), 0);
-	}
-} else {
-	dol_print_error($db);
-}
-$colorseries = array();
-$colorseries[] = $badgeStatus8;
-$colorseries[] = $badgeStatus2;
-$transChartTicketType = $langs->trans('ChartNewTicketVSClose');
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><th colspan="5">' . $transChartTicketType . '</th></tr>';
-print '<td class="center">';
-
-
-$px1 = new DolGraph();
-$mesg = $px1->isGraphKo();
-if (!$mesg) {
-	$px1->SetDataColor(array_values($colorseries));
-	$px1->SetData($data);
-	$px1->setShowLegend(2);
-	$px1->SetType(array('pie'));
-	$px1->SetLegend($legend);
-	$px1->SetMaxValue($px1->GetCeilMaxValue());
-	$px1->SetHeight($HEIGHT);
-	$px1->SetShading(3);
-	$px1->SetHorizTickIncrement(1);
-	$px1->SetCssPrefix("cssboxes");
-	$px1->mode = 'depth';
-
-	$px1->draw('idgraphticketnewvsclosetoday');
-	print $px1->show($totalnb ? 0 : 1);
-}
-
-
-print '</td>';
-print "</table>";
-print '</div>';
-
-
 print '</div></div></div>';
+
+/*
+* Show boxes
+*/
+$boxlist .= '<div class="twocolumns">';
+$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+$boxlist .= $resultboxes['boxlista'];
+$boxlist .= '</div>';
+$boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
+$boxlist .= $resultboxes['boxlistb'];
+$boxlist .= '</div>';
+$boxlist .= "\n";
+$boxlist .= '</div>';
+print $boxlist;
+
+print '</div>';
 print '<div style="clear:both"></div>';
 
 $parameters = array('user' => $user);