From 66337ec234a1e61300365151139168ed244a39f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 30 Oct 2019 00:36:47 +0100 Subject: [PATCH] NEW Add widgets for BOMs and MOs --- htdocs/core/boxes/box_boms.php | 182 ++++++++++++++++++ htdocs/core/boxes/box_commandes.php | 2 +- htdocs/core/boxes/box_mos.php | 182 ++++++++++++++++++ htdocs/core/modules/modBom.class.php | 4 +- .../{mrp => }/core/modules/modMrp.class.php | 7 +- htdocs/langs/en_US/boxes.lang | 2 + 6 files changed, 369 insertions(+), 10 deletions(-) create mode 100644 htdocs/core/boxes/box_boms.php create mode 100644 htdocs/core/boxes/box_mos.php rename htdocs/{mrp => }/core/modules/modMrp.class.php (98%) diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php new file mode 100644 index 00000000000..b4ac04b3051 --- /dev/null +++ b/htdocs/core/boxes/box_boms.php @@ -0,0 +1,182 @@ + + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2015 Frederic France + * + * 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 . + */ + +/** + * \file htdocs/core/boxes/box_boms.php + * \ingroup bom + * \brief Widget for latest modified BOM + */ + +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; + + +/** + * Class to manage the box to show last orders + */ +class box_boms extends ModeleBoxes +{ + public $boxcode="lastboms"; + public $boximg="object_bom"; + public $boxlabel="BoxTitleLatestModifiedBoms"; + public $depends = array("bom"); + + /** + * @var DoliDB Database handler. + */ + public $db; + + 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 $user; + + $this->db = $db; + + $this->hidden = ! ($user->rights->bom->read); + } + + /** + * Load data for box to show them later + * + * @param int $max Maximum number of records to load + * @return void + */ + public function loadBox($max = 5) + { + global $user, $langs, $conf; + + $this->max = $max; + + include_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php'; + include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + + $bomstatic = new Bom($this->db); + $productstatic = new Product($this->db); + $userstatic = new User($this->db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max)); + + if ($user->rights->bom->read) + { + $sql = "SELECT p.ref as product_ref"; + $sql.= ", c.rowid"; + $sql.= ", c.date_creation"; + $sql.= ", c.tms"; + $sql.= ", c.ref"; + $sql.= ", c.status"; + $sql.= ", c.fk_user_valid"; + $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; + $sql.= ", ".MAIN_DB_PREFIX."bom_bom as c"; + $sql.= " WHERE c.fk_product = p.rowid"; + $sql.= " AND c.entity = ".$conf->entity; + $sql.= " ORDER BY c.tms DESC, c.ref DESC"; + $sql.= " ".$this->db->plimit($max, 0); + + $result = $this->db->query($sql); + if ($result) { + $num = $this->db->num_rows($result); + + $line = 0; + + while ($line < $num) { + $objp = $this->db->fetch_object($result); + $datem=$this->db->jdate($objp->tms); + $bomstatic->id = $objp->rowid; + $bomstatic->ref = $objp->ref; + $bomstatic->id = $objp->socid; + $bomstatic->status = $objp->status; + $productstatic->ref = $objp->product_ref; + + $this->info_box_contents[$line][] = array( + 'td' => '', + 'text' => $bomstatic->getNomUrl(1), + 'asis' => 1, + ); + + $this->info_box_contents[$line][] = array( + 'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"', + 'text' => $productstatic->getNomUrl(1), + 'asis' => 1, + ); + + if (! empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) { + if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid); + $this->info_box_contents[$line][] = array( + 'td' => 'class="right"', + 'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''), + 'asis' => 1, + ); + } + + $this->info_box_contents[$line][] = array( + 'td' => 'class="right"', + 'text' => dol_print_date($datem, 'day'), + ); + + $this->info_box_contents[$line][] = array( + 'td' => 'class="right" width="18"', + 'text' => $bomstatic->LibStatut($objp->status, 3), + ); + + $line++; + } + + if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders")); + + $this->db->free($result); + } else { + $this->info_box_contents[0][0] = array( + 'td' => '', + 'maxlength'=>500, + 'text' => ($this->db->error().' sql='.$sql), + ); + } + } else { + $this->info_box_contents[0][0] = array( + 'td' => 'class="nohover opacitymedium 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_commandes.php b/htdocs/core/boxes/box_commandes.php index 00e3d54386c..327f06fc0c9 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -21,7 +21,7 @@ /** * \file htdocs/core/boxes/box_commandes.php * \ingroup commande - * \brief Module de generation de l'affichage de la box commandes + * \brief Widget for latest sale orders */ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php new file mode 100644 index 00000000000..32ae864fc2f --- /dev/null +++ b/htdocs/core/boxes/box_mos.php @@ -0,0 +1,182 @@ + + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2015 Frederic France + * + * 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 . + */ + +/** + * \file htdocs/core/boxes/box_mos.php + * \ingroup mrp + * \brief Widget for latest modified MOs + */ + +include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; + + +/** + * Class to manage the box to show last orders + */ +class box_mos extends ModeleBoxes +{ + public $boxcode="lastmos"; + public $boximg="object_mrp"; + public $boxlabel="BoxTitleLatestModifiedMos"; + public $depends = array("mrp"); + + /** + * @var DoliDB Database handler. + */ + public $db; + + 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 $user; + + $this->db = $db; + + $this->hidden = ! ($user->rights->bom->read); + } + + /** + * Load data for box to show them later + * + * @param int $max Maximum number of records to load + * @return void + */ + public function loadBox($max = 5) + { + global $user, $langs, $conf; + + $this->max = $max; + + include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php'; + include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; + + $mostatic = new Mo($this->db); + $productstatic = new Product($this->db); + $userstatic = new User($this->db); + + $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max)); + + if ($user->rights->mrp->read) + { + $sql = "SELECT p.ref as product_ref"; + $sql.= ", c.rowid"; + $sql.= ", c.date_creation"; + $sql.= ", c.tms"; + $sql.= ", c.ref"; + $sql.= ", c.status"; + //$sql.= ", c.fk_user_valid"; + $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; + $sql.= ", ".MAIN_DB_PREFIX."mrp_mo as c"; + $sql.= " WHERE c.fk_product = p.rowid"; + $sql.= " AND c.entity = ".$conf->entity; + $sql.= " ORDER BY c.tms DESC, c.ref DESC"; + $sql.= " ".$this->db->plimit($max, 0); + + $result = $this->db->query($sql); + if ($result) { + $num = $this->db->num_rows($result); + + $line = 0; + + while ($line < $num) { + $objp = $this->db->fetch_object($result); + $datem=$this->db->jdate($objp->tms); + $mostatic->id = $objp->rowid; + $mostatic->ref = $objp->ref; + $mostatic->id = $objp->socid; + $mostatic->status = $objp->status; + $productstatic->ref = $objp->product_ref; + + $this->info_box_contents[$line][] = array( + 'td' => '', + 'text' => $mostatic->getNomUrl(1), + 'asis' => 1, + ); + + $this->info_box_contents[$line][] = array( + 'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"', + 'text' => $productstatic->getNomUrl(1), + 'asis' => 1, + ); + + if (! empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) { + if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid); + $this->info_box_contents[$line][] = array( + 'td' => 'class="right"', + 'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''), + 'asis' => 1, + ); + } + + $this->info_box_contents[$line][] = array( + 'td' => 'class="right"', + 'text' => dol_print_date($datem, 'day'), + ); + + $this->info_box_contents[$line][] = array( + 'td' => 'class="right" width="18"', + 'text' => $mostatic->LibStatut($objp->status, 3), + ); + + $line++; + } + + if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders")); + + $this->db->free($result); + } else { + $this->info_box_contents[0][0] = array( + 'td' => '', + 'maxlength'=>500, + 'text' => ($this->db->error().' sql='.$sql), + ); + } + } else { + $this->info_box_contents[0][0] = array( + 'td' => 'class="nohover opacitymedium 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/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php index e333103fc8d..720721ac156 100644 --- a/htdocs/core/modules/modBom.class.php +++ b/htdocs/core/modules/modBom.class.php @@ -189,9 +189,7 @@ class modBom extends DolibarrModules // Boxes/Widgets // Add here list of php file(s) stored in bom/core/boxes that contains class to show a widget. $this->boxes = array( - //0=>array('file'=>'bomwidget1.php@bom','note'=>'Widget provided by Bom','enabledbydefaulton'=>'Home'), - //1=>array('file'=>'bomwidget2.php@bom','note'=>'Widget provided by Bom'), - //2=>array('file'=>'bomwidget3.php@bom','note'=>'Widget provided by Bom') + 0=>array('file'=>'box_boms.php','note'=>'','enabledbydefaulton'=>'Home') ); diff --git a/htdocs/mrp/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php similarity index 98% rename from htdocs/mrp/core/modules/modMrp.class.php rename to htdocs/core/modules/modMrp.class.php index 7e57f70c6c8..53f778d063f 100644 --- a/htdocs/mrp/core/modules/modMrp.class.php +++ b/htdocs/core/modules/modMrp.class.php @@ -206,12 +206,7 @@ class modMrp extends DolibarrModules // Boxes/Widgets // Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget. $this->boxes = array( - // 0 => array( - // 'file' => 'mrpwidget1.php@mrp', - // 'note' => 'Widget provided by Mrp', - // 'enabledbydefaulton' => 'Home', - // ), - // ... + 0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home') ); // Cronjobs (List of cron jobs entries to add when module is enabled) diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index eee7d7dcfac..a55a0194632 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -44,6 +44,8 @@ BoxTitleLastActionsToDo=Latest %s actions to do BoxTitleLastContracts=Latest %s modified contracts BoxTitleLastModifiedDonations=Latest %s modified donations BoxTitleLastModifiedExpenses=Latest %s modified expense reports +BoxTitleLatestModifiedBoms=Latest %s modified BOMs +BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGoodCustomers=Good customers BoxTitleGoodCustomers=%s Good customers