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

NEW Add widget of open opportunities

Browse Source
This commit is contained in:
Laurent Destailleur 2023-05-05 15:10:52 +02:00
parent daa1ac9e60
commit 166f8039fd
5 changed files with 235 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -173,6 +173,7 @@ NEW: write all fields and their properties in asciidoc format
NEW: Can add an array of several links in date selector
NEW: Implement MAIN_ACTIVATE_FILECACHE on bithday widget
NEW: Add widget "The next upcoming events"
NEW: Add widget of open opportunities
For developers or integrators:
------------------------------

8
htdocs/core/boxes/box_activity.php
View File

@ -134,11 +134,11 @@ class box_activity extends ModeleBoxes
if ($result) {
$num = $this->db->num_rows($result);
$line = 0;
while ($line < $num) {
$data[$line] = $this->db->fetch_object($result);
$j = 0;
while ($j < $num) {
$data[$j] = $this->db->fetch_object($result);
$line++;
$j++;
}
$this->db->free($result);

19
htdocs/core/boxes/box_project.php
View File

@ -88,7 +88,9 @@ class box_project extends ModeleBoxes
// list the summary of the orders
if ($user->rights->projet->lire) {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$projectstatic = new Project($this->db);
$companystatic = new Societe($this->db);
$socid = 0;
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
@ -99,10 +101,12 @@ class box_project extends ModeleBoxes
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
}
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public, p.fk_soc,";
$sql .= " s.nom as name, s.name_alias";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
$sql .= " AND p.fk_statut = 1"; // Only open projects
$sql .= " AND p.fk_statut = ".$projectstatic::STATUS_VALIDATED; // Only open projects
if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
}
@ -123,6 +127,10 @@ class box_project extends ModeleBoxes
$projectstatic->public = $objp->public;
$projectstatic->statut = $objp->status;
$companystatic->id = $objp->fk_soc;
$companystatic->name = $objp->name;
$companystatic->name_alias = $objp->name_alias;
$this->info_box_contents[$i][] = array(
'td' => 'class="nowraponall"',
'text' => $projectstatic->getNomUrl(1),
@ -134,6 +142,12 @@ class box_project extends ModeleBoxes
'text' => $objp->title,
);
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax100"',
'text' => ($objp->fk_soc > 0 ? $companystatic->getNomUrl(1) : ''),
'asis' => 1
);
$sql = "SELECT count(*) as nb, sum(progress) as totprogress";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
$sql .= " WHERE p.entity IN (".getEntity('project').')';
@ -173,6 +187,7 @@ class box_project extends ModeleBoxes
// Add the sum à the bottom of the boxes
$this->info_box_contents[$i][] = array(
'tr' => 'class="liste_total_wrap"',
'td' => 'class="liste_total"',
'text' => $langs->trans("Total")."&nbsp;".$textHead,
);

213
htdocs/core/boxes/box_project_opportunities.php Normal file
View File

@ -0,0 +1,213 @@
<?php
/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2016 Juan José Menent <jmenent@2byte.es>
* Copyright (C) 2020 Pierre Ardoin <mapiolca@me.com>
*
* 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 htdocs/core/boxes/box_project_opportunities.php
* \ingroup project
* \brief Module to show Projet activity of the current Year
*/
include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
/**
* Class to manage the box to show last projet
*/
class box_project_opportunities extends ModeleBoxes
{
public $boxcode = "project_opportunities";
public $boximg = "object_projectpub";
public $boxlabel;
//var $depends = array("projet");
/**
* @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, $langs;
// Load translation files required by the page
$langs->loadLangs(array('boxes', 'projects'));
$this->db = $db;
$this->boxlabel = "OpenedProjectsOpportunities";
$this->enabled = getDolGlobalInt('PROJECT_USE_OPPORTUNITIES');
$this->hidden = !$user->hasRight('projet', 'lire');
}
/**
* 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 $conf, $user, $langs;
$this->max = $max;
$totalMnt = 0;
$totalnb = 0;
$totalnbTask = 0;
$textHead = $langs->trans("OpenedProjectsOpportunities");
$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
$i = 0;
// list the summary of the orders
if ($user->hasRight('projet', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
$projectstatic = new Project($this->db);
$companystatic = new Societe($this->db);
$socid = 0;
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
// Get list of project id allowed to user (in a string list separated by coma)
$projectsListId = '';
if (empty($user->rights->projet->all->lire)) {
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
}
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount, p.public,";
$sql .= " s.nom as name, s.name_alias,";
$sql .= " cls.code as opp_status_code";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
$sql .= " AND p.usage_opportunity = 1";
$sql .= " AND p.fk_opp_status > 0";
$sql .= " AND p.fk_statut IN (".$projectstatic::STATUS_DRAFT.", ".$projectstatic::STATUS_VALIDATED.")"; // draft and open projects
//$sql .= " AND p.fk_statut = ".((int) $projectstatic::STATUS_VALIDATED); // Only open projects
if (empty($user->rights->projet->all->lire)) {
$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")"; // public and assigned to, or restricted to company for external users
}
$sql .= " ORDER BY p.datec DESC";
//$sql.= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result) {
$num = $this->db->num_rows($result);
while ($i < min($num, $max)) {
$objp = $this->db->fetch_object($result);
$projectstatic->id = $objp->rowid;
$projectstatic->ref = $objp->ref;
$projectstatic->title = $objp->title;
$projectstatic->public = $objp->public;
$projectstatic->statut = $objp->status;
$projectstatic->opp_status = $objp->opp_status;
$projectstatic->opp_status_code = $objp->opp_status_code;
$projectstatic->opp_percent = $objp->opp_percent;
$projectstatic->opp_amount = $objp->opp_amount;
$companystatic->id = $objp->fk_soc;
$companystatic->name = $objp->name;
$companystatic->name_alias = $objp->name_alias;
$this->info_box_contents[$i][] = array(
'td' => 'class="nowraponall"',
'text' => $projectstatic->getNomUrl(1),
'asis' => 1
);
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
'text' => $objp->title,
);
$this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax100"',
'text' => ($objp->fk_soc > 0 ? $companystatic->getNomUrl(1) : ''),
'asis' => 1
);
$this->info_box_contents[$i][] = array('td' => 'class="amount right"', 'text' => ($projectstatic->opp_amount ? price($projectstatic->opp_amount) : ''));
$this->info_box_contents[$i][] = array('td' => 'class=""', 'asis'=>1, 'text' => ($projectstatic->opp_status_code ? $langs->trans("OppStatus".$projectstatic->opp_status_code).' ' : '').'<span class="opacitymedium small">('.round($projectstatic->opp_percent).'%)</span>');
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
$i++;
}
if ($max < $num) {
$this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
$i++;
}
}
}
// Add the sum à the bottom of the boxes
$this->info_box_contents[$i][] = array(
'tr' => 'class="liste_total_wrap"',
'td' => 'class="liste_total"',
'text' => $langs->trans("Total")."&nbsp;".$textHead,
);
$this->info_box_contents[$i][] = array(
'td' => 'class="right liste_total" ',
'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
);
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => "&nbsp;",
);
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => "&nbsp;",
);
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => "&nbsp;",
);
}
/**
* 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);
}
}

2
htdocs/projet/class/project.class.php
View File

@ -658,8 +658,6 @@ class Project extends CommonObject
*/
public function fetch($id, $ref = '', $ref_ext = '', $email_msgid = '')
{
global $conf;
if (empty($id) && empty($ref) && empty($ref_ext) && empty($email_msgid)) {
dol_syslog(get_class($this)."::fetch Bad parameters", LOG_WARNING);
return -1;