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

SQL + insertion champs dans box

Browse Source
This commit is contained in:
Adrien Raze 2020-08-27 17:23:53 +02:00
parent 912999a6b6
commit c9833c501d
2 changed files with 35 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
htdocs/core/boxes/box_validated_projects.php
View File

@ -20,18 +20,18 @@
*/ */
/** /**
* \file htdocs/core/boxes/box_project.php * \file htdocs/core/boxes/box_validated_projects.php
* \ingroup projet * \ingroup projet
* \brief Module to show Projet activity of the current Year * \brief Module to show validated projects whose tasks are assigned to the connected person, without any time entered by the connected person
*/ */
include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php"; include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
/** /**
* Class to manage the box to show last projet * Class to manage the box to show last projet
*/ */
class box_project extends ModeleBoxes class box_validated_projects extends ModeleBoxes
{ {
public $boxcode="project"; public $boxcode="validated_project";
public $boximg="object_projectpub"; public $boximg="object_projectpub";
public $boxlabel; public $boxlabel;
//var $depends = array("projet"); //var $depends = array("projet");
@ -60,7 +60,7 @@ class box_project extends ModeleBoxes
$langs->loadLangs(array('boxes', 'projects')); $langs->loadLangs(array('boxes', 'projects'));
$this->db = $db; $this->db = $db;
$this->boxlabel = "OpenedProjects"; $this->boxlabel = "ValidatedProjects";
$this->hidden = ! ($user->rights->projet->lire); $this->hidden = ! ($user->rights->projet->lire);
} }
@ -81,11 +81,12 @@ class box_project extends ModeleBoxes
$totalnb = 0; $totalnb = 0;
$totalnbTask=0; $totalnbTask=0;
$textHead = $langs->trans("OpenedProjects"); $textHead = $langs->trans("ValidatedProjects");
$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead)); $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
// list the summary of the orders // list the summary of the orders
if ($user->rights->projet->lire) { if ($user->rights->projet->lire) {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$projectstatic = new Project($this->db); $projectstatic = new Project($this->db);
@ -96,17 +97,20 @@ class box_project extends ModeleBoxes
$projectsListId=''; $projectsListId='';
if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid); if (! $user->rights->projet->all->lire) $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 as Ref, p.fk_soc as Client, p.dateo as startDate,";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " (SELECT COUNT(t.rowid) FROM ".MAIN_DB_PREFIX."projet_task AS t";
$sql.= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
$sql.= " AND p.fk_statut = 1"; // Only open projects $sql.= " WHERE t.fk_projet = p.rowid AND c.fk_socpeople = ".$user->id." AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time)) AS 'taskNumber'";
if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users $sql.= " FROM ".MAIN_DB_PREFIX."projet AS p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
$sql.= " ORDER BY p.datec DESC"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
//$sql.= $this->db->plimit($max, 0); $sql.= " WHERE p.fk_statut = 1"; // Only open projects
$sql.= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time)";
$sql.= " AND c.fk_socpeople = ".$user->id;
$sql.= " GROUP BY p.ref";
$sql.= " ORDER BY p.dateo ASC";
var_dump($user->id);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
@ -114,10 +118,10 @@ class box_project extends ModeleBoxes
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$projectstatic->id = $objp->rowid; $projectstatic->id = $objp->rowid;
$projectstatic->ref = $objp->ref; $projectstatic->ref = $objp->Ref;
$projectstatic->title = $objp->title; $projectstatic->customer = $objp->Client;
$projectstatic->public = $objp->public; $projectstatic->startDate = $objp->startDate;
$projectstatic->statut = $objp->status; $projectstatic->taskNumber = $objp->taskNumber;
$this->info_box_contents[$i][] = array( $this->info_box_contents[$i][] = array(
'td' => 'class="nowraponall"', 'td' => 'class="nowraponall"',
@ -127,67 +131,24 @@ class box_project extends ModeleBoxes
$this->info_box_contents[$i][] = array( $this->info_box_contents[$i][] = array(
'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"', 'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
'text' => $objp->title, 'text' => $objp->Client,
); );
$sql ="SELECT count(*) as nb, sum(progress) as totprogress"; $this->info_box_contents[$i][] = array(
$sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid"; 'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
$sql.= " WHERE p.entity IN (".getEntity('project').')'; 'text' => $objp->startDate,
$sql.=" AND p.rowid = ".$objp->rowid; );
$resultTask = $this->db->query($sql);
if ($resultTask) {
$objTask = $this->db->fetch_object($resultTask);
$this->info_box_contents[$i][] = array(
'td' => 'class="right"',
'text' => $objTask->nb." ".$langs->trans("Tasks"),
);
if ($objTask->nb > 0)
$this->info_box_contents[$i][] = array(
'td' => 'class="right"',
'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
);
else
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
$totalnbTask += $objTask->nb;
} else {
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A ");
}
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
$i++; $this->info_box_contents[$i][] = array(
} 'td' => 'class="nowraponall"',
if ($max < $num) 'text' => $objp->taskNumber."&nbsp;".$langs->trans("Tasks"),
{ );
$this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
$i++; $i++;
} }
} }
} }
// Add the sum à the bottom of the boxes
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => $langs->trans("Total")."&nbsp;".$textHead,
'text' => "&nbsp;",
);
$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="right liste_total" ',
'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
);
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => "&nbsp;",
);
$this->info_box_contents[$i][] = array(
'td' => 'class="liste_total"',
'text' => "&nbsp;",
);
} }
/** /**

2
htdocs/core/modules/modProjet.class.php
View File

@ -144,6 +144,8 @@ class modProjet extends DolibarrModules
$r++; $r++;
$this->boxes[$r][1] = "box_task.php"; $this->boxes[$r][1] = "box_task.php";
$r++; $r++;
$this->boxes[$r][1] = "box_validated_projects.php";
$r++;
// Permissions // Permissions
$this->rights = array(); $this->rights = array();