diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index a4ebd2bb7c79648746d92c1e5cb4810f206a74ff..e7d542c93201857d65af8761e753e6304206336e 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -2,6 +2,7 @@
/custom*
/extensions*
/nltechno*
+/teclib*
/bootstrap*
/google*
/multicompany*
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 1dccb2c24564a9d5431b9a4eb19e859daa1940c9..3062fe1783a8a55122fce6392d07c7f1df0dc079 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -228,7 +228,14 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$numlines=count($lines);
- $total=0;
+ // We declare counter as global because we want to edit them into recursive call
+ global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+ if ($level == 0)
+ {
+ $total_projectlinesa_spent=0;
+ $total_projectlinesa_planned=0;
+ $total_projectlinesa_spent_if_planned=0;
+ }
for ($i = 0 ; $i < $numlines ; $i++)
{
@@ -293,8 +300,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($showproject)
{
+ // Project ref
print "<td>";
- //var_dump($taskrole);
if ($showlineingray) print '<i>';
$projectstatic->id=$lines[$i]->fk_project;
$projectstatic->ref=$lines[$i]->projectref;
@@ -390,7 +397,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
$level++;
if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
$level--;
- $total += $lines[$i]->duration;
+ $total_projectlinesa_spent += $lines[$i]->duration;
+ $total_projectlinesa_planned += $lines[$i]->planned_workload;
+ if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
}
}
else
@@ -399,7 +408,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
}
- if ($total>0 && $level==0)
+ if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level==0)
{
print '<tr class="liste_total">';
print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@@ -407,10 +416,16 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print '<td></td>';
print '<td></td>';
print '<td></td>';
+ print '<td align="center" class="nowrap liste_total">';
+ print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
+ print '</td>';
print '<td></td>';
- print '<td></td>';
- print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total, 'allhourmin').'</td>';
- print '<td></td>';
+ print '<td align="right" class="nowrap liste_total">';
+ print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
+ print '</td>';
+ print '<td align="right" class="nowrap liste_total">';
+ if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent_if_planned / $total_projectlinesa_planned,2).' %';
+ print '</td>';
if ($addordertick) print '<td class="hideonsmartphone"></td>';
print '</tr>';
}
@@ -459,7 +474,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
{
print "<tr ".$bc[$var].">\n";
-
+
// Project
print "<td>";
$projectstatic->id=$lines[$i]->fk_project;
@@ -468,14 +483,14 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
$projectstatic->label=$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project];
print $projectstatic->getNomUrl(1);
print "</td>";
-
+
// Ref
print '<td>';
$taskstatic->id=$lines[$i]->id;
$taskstatic->ref=$lines[$i]->id;
print $taskstatic->getNomUrl(1);
print '</td>';
-
+
// Label task
print "<td>";
for ($k = 0 ; $k < $level ; $k++)
@@ -486,28 +501,28 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
$taskstatic->ref=$lines[$i]->label;
print $taskstatic->getNomUrl(0);
print "</td>\n";
-
+
// Date start
print '<td align="center">';
print dol_print_date($lines[$i]->date_start,'dayhour');
print '</td>';
-
+
// Date end
print '<td align="center">';
print dol_print_date($lines[$i]->date_end,'dayhour');
print '</td>';
-
+
// Planned Workload
print '<td align="right">';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
else print '--:--';
print '</td>';
-
+
// Progress declared %
print '<td align="right">';
print $lines[$i]->progress.' %';
print '</td>';
-
+
// Time spent
print '<td align="right">';
if ($lines[$i]->duration)
@@ -518,7 +533,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
}
else print '--:--';
print "</td>\n";
-
+
$disabledproject=1;$disabledtask=1;
//print "x".$lines[$i]->fk_project;
//var_dump($lines[$i]);
@@ -534,7 +549,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
{
$disabledtask=1;
}
-
+
print '<td class="nowrap">';
$s =$form->select_date('',$lines[$i]->id,'','','',"addtime",1,0,1,$disabledtask);
$s.=' ';
@@ -546,7 +561,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
print '</td>';
-
+
print "</tr>\n";
}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 4e020ab3ae063b6b3050753c225193be3f76b11a..d98fa1756eb364d223ca43bb17d8022cf462ef53 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -146,3 +146,5 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
WarningNotRelevant=Irrelevant operation for this dataset
+WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index a4b71c6239365e56cd0a712f15284ead8c2ea3ac..97c0851d9107a3875bda57d1e36beffeac3f5235 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -164,9 +164,10 @@ if ( $resql )
if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
{
-/* print '<tr '.$bc[0].'>';
+/* $langs->load("errors");
+ print '<tr '.$bc[0].'>';
print '<td colspan="9">';
- print $langs->trans("TooManyDataPleaseUseMoreFilters");
+ print $langs->trans("WarningTooManyDataPleaseUseMoreFilters");
print '</td></tr>';*/
}
else
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index a798157dd110221a91583af040bf3278d502e3e8..e9fa7c6522a1b90beb459641214809c772eea8b8 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -121,9 +121,10 @@ print "</tr>\n";
if (count($tasksarray) > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
{
+ $langs->load("errors");
print '<tr '.$bc[0].'>';
print '<td colspan="9">';
- print $langs->trans("TooManyDataPleaseUseMoreFilters");
+ print $langs->trans("WarningTooManyDataPleaseUseMoreFilters");
print '</td></tr>';
}
else