diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index fea200ed241..8dde28bbb71 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -149,7 +149,8 @@ if ($_GET["id"] > 0) print ''; print ''; - print ''; + print ''; + print ''; print ''; print ''; print "\n"; @@ -157,10 +158,15 @@ if ($_GET["id"] > 0) print ''; // Note - print ''; + // Contributor + print ''; + // Date print '
'.$langs->trans("Note").''.$langs->trans("Note").''.$langs->trans("By").''.$langs->trans("Date").''.$langs->trans("Duration").'
'; + print ''; print ''; print ''; + print ' '; // TODO ajout liste deroulante des participants + print ''; print $html->select_date('','time','','','',"timespent_date"); @@ -212,10 +218,10 @@ if ($_GET["id"] > 0) print ''; print ''; + print ''; print ''; print ''; - print ''; - print ''; + print ''; print ''; print "\n"; @@ -224,6 +230,18 @@ if ($_GET["id"] > 0) $var=!$var; print ""; + // Note + print ''; + // User $user->id = $task_time->fk_user; $user->nom = $task_time->name; @@ -231,10 +249,16 @@ if ($_GET["id"] > 0) print ''; // Date - print ''; - - // Note - print ''; + print ''; // Time spent $heure = intval($task_time->task_duration);
'.$langs->trans("Note").''.$langs->trans("By").''.$langs->trans("Date").''.$langs->trans("Note").''.$langs->trans("TimeSpent").''.$langs->trans("Duration").' 
'; + if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) + { + print ''; + } + else + { + print dol_nl2br($task_time->note); + } + print ''.$user->getNomUrl(1).''.dol_print_date($db->jdate($task_time->task_date),'%A').' '.dol_print_date($db->jdate($task_time->task_date),'daytext').''.dol_nl2br($task_time->note).''; + if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid) + { + print $html->select_date($task_time->task_date,'timeline','','','',"timespent_date"); + } + else + { + print dol_print_date($db->jdate($task_time->task_date),'%A').' '.dol_print_date($db->jdate($task_time->task_date),'daytext'); + } + print '