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

FIX : wrong personnal project time spent

Browse Source
This commit is contained in:
gauthier 2017-10-19 09:46:19 +02:00
parent d5d337c631
commit 3793ae323a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/project.lib.php
View File

@ -762,7 +762,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
// Time spent by user
print '<td align="right">';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent();
$tmptimespent=$taskstatic->getSummaryOfTimeSpent('', $fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
else print '--:--';
print "</td>\n";

4
htdocs/projet/class/task.class.php
View File

@ -911,9 +911,10 @@ class Task extends CommonObject
* Calculate total of time spent for task
*
* @param int $id Id of object (here task)
* @param int $user_id Filter on user time
* @return array Array of info for task array('min_date', 'max_date', 'total_duration')
*/
function getSummaryOfTimeSpent($id='')
function getSummaryOfTimeSpent($id='', $user_id='')
{
global $langs;
@ -927,6 +928,7 @@ class Task extends CommonObject
$sql.= " SUM(t.task_duration) as total_duration";
$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql.= " WHERE t.fk_task = ".$id;
if(!empty($user_id)) $sql.= " AND t.fk_user = ".$user_id;
dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
$resql=$this->db->query($sql);