Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Refactored dashboard indicator

Browse Source
This commit is contained in:
Marcos García de La Fuente
2015-02-15 15:01:28 +01:00
parent bedaa483ad
commit d1f73499e9
13 changed files with 296 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/commande/class/commande.class.php
View File

@@ -106,10 +106,6 @@ class Commande extends CommonOrder
var $lines = array();
// Pour board
var $nbtodo;
var $nbtodolate;
/**
* Constructor
@@ -2729,15 +2725,12 @@ class Commande extends CommonOrder
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Object user
* @return int <0 if KO, >0 if OK
* @return BoardResponse|int <0 if KO, BoardResponse if OK
*/
function load_board($user)
{
global $conf, $user;
global $conf, $user, $langs;
$now=dol_now();
$this->nbtodo=$this->nbtodolate=0;
$clause = " WHERE";
$sql = "SELECT c.rowid, c.date_creation as datec, c.date_livraison as delivery_date, c.fk_statut";
@@ -2756,14 +2749,26 @@ class Commande extends CommonOrder
$resql=$this->db->query($sql);
if ($resql)
{
$now=dol_now();
$response = new BoardResponse();
$response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
$response->label=$langs->trans("OrdersToProcess");
$response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3';
$response->img=img_object($langs->trans("Orders"),"order");
while ($obj=$this->db->fetch_object($resql))
{
$this->nbtodo++;
$response->nbtodo++;
$date_to_test = empty($obj->delivery_date) ? $obj->datec : $obj->delivery_date;
if ($obj->fk_statut != 3 && $this->db->jdate($date_to_test) < ($now - $conf->commande->client->warning_delay)) $this->nbtodolate++;
if ($obj->fk_statut != 3 && $this->db->jdate($date_to_test) < ($now - $conf->commande->client->warning_delay)) {
$response->nbtodolate++;
}
}
return 1;
return $response;
}
else
{