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

update for continuous integration

Browse Source
This commit is contained in:
lmarcouiller 2021-03-08 13:58:23 +01:00
parent 8c7764ed5d
commit d8a74bad93
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/boxes/box_nb_ticket_last_x_days.php
View File

@ -39,7 +39,6 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db;
public $param; public $param;
public $info_box_head = array(); public $info_box_head = array();
@ -56,7 +55,7 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
$langs->load("boxes"); $langs->load("boxes");
$this->db = $db; $this->db = $db;
$this->boxlabel = $langs->transnoentitiesnoconv("BoxTicketSeverity"); $this->boxlabel = $langs->transnoentitiesnoconv("BoxTicketLastXDayswidget");
} }
/** /**
@ -67,7 +66,7 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
*/ */
public function loadBox($max = 5) public function loadBox($max = 5)
{ {
global $conf, $user, $langs,$db; global $conf, $user, $langs;
$badgeStatus0 = '#cbd3d3'; // draft $badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated $badgeStatus1 = '#bc9526'; // validated
@ -114,13 +113,13 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
$sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL " . $days . " DAY)"; $sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL " . $days . " DAY)";
$sql .= " GROUP BY CAST(t.datec AS DATE)"; $sql .= " GROUP BY CAST(t.datec AS DATE)";
$resql = $db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
$dataseries = array(); $dataseries = array();
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($resql); $objp = $this->db->fetch_object($resql);
while ($minimumdatecformated < $objp->datec) { while ($minimumdatecformated < $objp->datec) {
$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0); $dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
$minimumdatec = date_add($minimumdatec, $intervaltoadd); $minimumdatec = date_add($minimumdatec, $intervaltoadd);
@ -138,7 +137,7 @@ class box_nb_ticket_last_x_days extends ModeleBoxes
$i++; $i++;
} }
} else { } else {
dol_print_error($db); dol_print_error($this->db);
} }
if ($user->rights->ticket->read) { if ($user->rights->ticket->read) {

22
htdocs/core/boxes/box_ticket_by_severity.php
View File

@ -67,7 +67,7 @@ class box_ticket_by_severity extends ModeleBoxes
*/ */
public function loadBox($max = 5) public function loadBox($max = 5)
{ {
global $conf, $user, $langs,$db; global $conf, $user, $langs;
$badgeStatus0 = '#cbd3d3'; // draft $badgeStatus0 = '#cbd3d3'; // draft
$badgeStatus1 = '#bc9526'; // validated $badgeStatus1 = '#bc9526'; // validated
@ -102,14 +102,14 @@ class box_ticket_by_severity extends ModeleBoxes
$sql = "SELECT cts.rowid, cts.label, cts.code"; $sql = "SELECT cts.rowid, cts.label, cts.code";
$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts"; $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
$sql .= " WHERE cts.active = 1"; $sql .= " WHERE cts.active = 1";
$sql .= $db->order('cts.rowid', 'ASC'); $sql .= $this->db->order('cts.rowid', 'ASC');
$resql = $db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($resql); $objp = $this->db->fetch_object($resql);
$listofoppcode[$objp->rowid] = $objp->code; $listofoppcode[$objp->rowid] = $objp->code;
$listofopplabel[$objp->rowid] = $objp->label; $listofopplabel[$objp->rowid] = $objp->label;
switch ($objp->code) { switch ($objp->code) {
@ -131,7 +131,7 @@ class box_ticket_by_severity extends ModeleBoxes
$i++; $i++;
} }
} else { } else {
dol_print_error($db); dol_print_error($this->db);
} }
$dataseries = array(); $dataseries = array();
@ -140,20 +140,20 @@ class box_ticket_by_severity extends ModeleBoxes
$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
$sql .= " WHERE t.fk_statut <> 8"; $sql .= " WHERE t.fk_statut <> 8";
$sql .= " GROUP BY t.severity_code"; $sql .= " GROUP BY t.severity_code";
$resql = $db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($resql); $objp = $this->db->fetch_object($resql);
$data[$objp->severity_code] = $objp->nb; $data[$objp->severity_code] = $objp->nb;
$i++; $i++;
} }
foreach ($listofoppcode as $rowid => $code) { foreach ($listofoppcode as $rowid => $code) {
$dataseries[] = array('label' => $langs->getLabelFromKey($db, 'TicketSeverityShort' . $code, 'c_ticket_category', 'code', 'label', $code), 'data' => $data[$code]); $dataseries[] = array('label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_category', 'code', 'label', $code), 'data' => $data[$code]);
} }
} else { } else {
dol_print_error($db); dol_print_error($this->db);
} }
$stringtoprint = ''; $stringtoprint = '';
$stringtoprint .= '<div class="div-table-responsive-no-min ">'; $stringtoprint .= '<div class="div-table-responsive-no-min ">';

1
htdocs/langs/en_US/ticket.lang
View File

@ -306,6 +306,7 @@ ChartTicketType=Number of open tickets by type
BoxTicketSeverity=Number of open tickets by severity BoxTicketSeverity=Number of open tickets by severity
BoxNoTicketSeverity=No tickets opened BoxNoTicketSeverity=No tickets opened
BoxTicketLastXDays=Number of new tickets by days the last %s days 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 BoxNoTicketLastXDays=No new tickets the last %s days
NumberOfTicketByDay=Number of new tickets by day NumberOfTicketByDay=Number of new tickets by day
ChartNewTicketVSClose=Number of today's new tickets versus today's closed tickets ChartNewTicketVSClose=Number of today's new tickets versus today's closed tickets