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

Fix Time spent for "other task" was not visible when filtering project

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-11 13:08:13 +01:00
parent 46d28deee7
commit 6d9a9dd3fe
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/projet/activity/perday.php
View File

@ -326,12 +326,14 @@ if ($id)
$onlyopenedproject=1; // or -1 $onlyopenedproject=1; // or -1
$morewherefilter=''; $morewherefilter='';
if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref);
if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_project_ref);
if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref);
if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label);
if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty);
$tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
if ($morewherefilter) // Get all task with no filter so we can show total of time spent for not visible tasks if ($morewherefilter) // Get all task without any filter, so we can show total of time spent for not visible tasks
{ {
$tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. $tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
} }
@ -499,7 +501,12 @@ $isavailable[$daytoparse]=$isavailablefordayanduser; // in projectLinesPerWeek
if (count($tasksarray) > 0) if (count($tasksarray) > 0)
{ {
//var_dump($tasksarray); // contains only selected tasks
//var_dump($tasksarraywithoutfilter); // contains all tasks (if there is a filter, not defined if no filter)
//var_dump($tasksrole);
$j=0; $j=0;
$level=0;
$totalforvisibletasks = projectLinesPerDay($j, 0, $usertoprocess, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse, $isavailable, 0); $totalforvisibletasks = projectLinesPerDay($j, 0, $usertoprocess, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse, $isavailable, 0);
//var_dump($totalforvisibletasks); //var_dump($totalforvisibletasks);
@ -518,7 +525,6 @@ if (count($tasksarray) > 0)
$totalforeachday=array(); $totalforeachday=array();
foreach($listofdistinctprojectid as $tmpprojectid) foreach($listofdistinctprojectid as $tmpprojectid)
{ {
$lineother='';
$projectstatic->id=$tmpprojectid; $projectstatic->id=$tmpprojectid;
$projectstatic->loadTimeSpent($daytoparse, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week $projectstatic->loadTimeSpent($daytoparse, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
for ($idw = 0; $idw < 7; $idw++) for ($idw = 0; $idw < 7; $idw++)
@ -527,15 +533,25 @@ if (count($tasksarray) > 0)
$totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday]; $totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday];
} }
} }
$lineother='';
//var_dump($totalforeachday); //var_dump($totalforeachday);
// Is there a diff between selected/filtered tasks and all tasks ?
$isdiff = 0;
if (count($totalforeachday))
{
$timeonothertasks=($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]);
if ($timeonothertasks)
{
$isdiff=1;
}
}
$colspan = 8; $colspan = 8;
// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user // There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
if (count($totalforeachday)) if ($isdiff)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven othertaskwithtime">';
print '<td colspan="'.$colspan.'">'; print '<td colspan="'.$colspan.'">';
print $langs->trans("OtherFilteredTasks"); print $langs->trans("OtherFilteredTasks");
print '</td>'; print '</td>';

38
htdocs/projet/activity/perweek.php
View File

@ -41,7 +41,6 @@ $mode=GETPOST("mode",'alpha');
$id=GETPOST('id','int'); $id=GETPOST('id','int');
$taskid=GETPOST('taskid','int'); $taskid=GETPOST('taskid','int');
$mine=0; $mine=0;
if ($mode == 'mine') $mine=1; if ($mode == 'mine') $mine=1;
@ -328,12 +327,14 @@ if ($id)
$onlyopenedproject=1; // or -1 $onlyopenedproject=1; // or -1
$morewherefilter=''; $morewherefilter='';
if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref);
if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_project_ref);
if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref);
if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label);
if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty);
$tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
if ($morewherefilter) // Get all task with no filter so we can show total of time spent for not visible tasks if ($morewherefilter) // Get all task without any filter, so we can show total of time spent for not visible tasks
{ {
$tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. $tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
} }
@ -514,7 +515,8 @@ $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED
if (count($tasksarray) > 0) if (count($tasksarray) > 0)
{ {
//var_dump($tasksarray); //var_dump($tasksarray); // contains only selected tasks
//var_dump($tasksarraywithoutfilter); // contains all tasks (if there is a filter, not defined if no filter)
//var_dump($tasksrole); //var_dump($tasksrole);
$j=0; $j=0;
@ -537,7 +539,6 @@ if (count($tasksarray) > 0)
$totalforeachday=array(); $totalforeachday=array();
foreach($listofdistinctprojectid as $tmpprojectid) foreach($listofdistinctprojectid as $tmpprojectid)
{ {
$lineother='';
$projectstatic->id=$tmpprojectid; $projectstatic->id=$tmpprojectid;
$projectstatic->loadTimeSpent($firstdaytoshow, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week $projectstatic->loadTimeSpent($firstdaytoshow, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
for ($idw = 0; $idw < 7; $idw++) for ($idw = 0; $idw < 7; $idw++)
@ -546,15 +547,32 @@ if (count($tasksarray) > 0)
$totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday]; $totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday];
} }
} }
$lineother='';
//var_dump($totalforeachday); //var_dump($totalforeachday);
//var_dump($totalforvisibletasks);
// Is there a diff between selected/filtered tasks and all tasks ?
$isdiff = 0;
if (count($totalforeachday))
{
for ($idw = 0; $idw < 7; $idw++)
{
$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
$timeonothertasks=($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
if ($timeonothertasks)
{
$isdiff=1;
break;
}
}
}
$colspan=7; $colspan=7;
// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user // There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
if (count($totalforeachday)) if ($isdiff)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven othertaskwithtime">';
print '<td colspan="'.$colspan.'">'; print '<td colspan="'.$colspan.'">';
print $langs->trans("OtherFilteredTasks"); print $langs->trans("OtherFilteredTasks");
print '</td>'; print '</td>';