diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index 7828151a74b..67d55dec480 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -156,14 +156,10 @@ function PLinesb(&$inc, $parent, $lines, &$level, $tasksrole)
$var = !$var;
print "
\n";
- print "| ";
- $projectstatic->id=$lines[$i]->projectid;
- $projectstatic->ref=$lines[$i]->projectref;
- print $projectstatic->getNomUrl(1);
- print " | ";
-
- print "".$lines[$i]->id." | ";
+ // Ref
+ print ''.$lines[$i]->id.' | ';
+ // Label task
print "";
for ($k = 0 ; $k < $level ; $k++)
@@ -171,22 +167,29 @@ function PLinesb(&$inc, $parent, $lines, &$level, $tasksrole)
print " ";
}
- print ''.$lines[$i]->title." | \n";
+ print $lines[$i]->title;
+ print "\n";
+
+ // Project
+ print "";
+ $projectstatic->id=$lines[$i]->projectid;
+ $projectstatic->ref=$lines[$i]->projectref;
+ print $projectstatic->getNomUrl(1);
+ print " | ";
$heure = intval($lines[$i]->duration);
$minutes = round((($lines[$i]->duration - $heure) * 60),0);
$minutes = substr("00"."$minutes", -2);
-
print ''.$heure." h ".$minutes." | \n";
if ($tasksrole[$lines[$i]->id] == 'admin')
{
- print '';
- print '';
- print ' ';
- print ' | ';
- print "";
+ print ' | ';
print $form->select_date('',$lines[$i]->id,'','','',"addtime");
+ print ' ';
+ print ' ';
+ print ' | ';
+ print " ";
print ' | ';
}
else
@@ -242,15 +245,15 @@ function PLines(&$inc, $parent, $lines, &$level, $var, $showproject=1)
print "
\n";
- print "| ".$lines[$i]->id." | ";
+ print ''.$lines[$i]->id.' | ';
print "";
for ($k = 0 ; $k < $level ; $k++)
{
print " ";
}
-
- print ''.$lines[$i]->title." | \n";
+ print $lines[$i]->title;
+ print "\n";
if ($showproject)
{
@@ -264,7 +267,7 @@ function PLines(&$inc, $parent, $lines, &$level, $var, $showproject=1)
$heure = intval($lines[$i]->duration);
$minutes = round((($lines[$i]->duration - $heure) * 60),0);
$minutes = substr("00"."$minutes", -2);
- print ''.$heure." h ".$minutes." | \n";
+ print ''.$heure." h ".$minutes.' | ';
print "
\n";
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index aa0e0532a72..dcfb970c495 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -126,9 +126,9 @@ print '';
print '';
print '';
-print '| '.$langs->trans("Project").' | ';
print ''.$langs->trans("RefTask").' | ';
print ''.$langs->trans("LabelTask").' | ';
+print ''.$langs->trans("Project").' | ';
print ''.$langs->trans("TimeSpent").' | ';
print ''.$langs->trans("AddDuration").' | ';
print "
\n";
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index fbe1c3556ae..21fbea9e979 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/projet/tasks/task.php
* \ingroup projet
- * \brief Fiche tāches d'un projet
+ * \brief Fiche tļæ½ches d'un projet
* \version $Id$
*/
@@ -112,7 +112,7 @@ if ($_GET["id"] > 0)
else print ' ';
print '';
- /* Liste des tāches */
+ /* List of time spent */
$sql = "SELECT t.task_date, t.task_duration, t.fk_user, u.login, u.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
@@ -163,16 +163,25 @@ if ($_GET["id"] > 0)
print '';
print '| '.$langs->trans("Date").' | ';
print ''.$langs->trans("TimeSpent").' | ';
- print ''.$langs->trans("User").' | ';
+ print ''.$langs->trans("By").' | ';
print "
\n";
foreach ($tasks as $task_time)
{
$var=!$var;
print "";
- print '| '.dolibarr_print_date($db->jdate($task_time->task_date),'day').' | ';
- print ''.$task_time->task_duration.' | ';
- $user->id=$task_time->rowid;
+
+ // Date
+ print ''.dolibarr_print_date($db->jdate($task_time->task_date),'day').' '.dolibarr_print_date($db->jdate($task_time->task_date),'%A').' | ';
+
+ // Time spent
+ $heure = intval($task_time->task_duration);
+ $minutes = round((($task_time->task_duration - $heure) * 60),0);
+ $minutes = substr("00"."$minutes", -2);
+ print ''.$heure." h ".$minutes." | \n";
+
+ // User
+ $user->id=$task_time->rowid;
$user->nom=$task_time->login;
print ''.$user->getNomUrl(1).' | ';
print "
\n";