diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 989a0a7c719..e748e937f8e 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -31,10 +31,10 @@ require("./pre.inc.php"); if (!$user->rights->projet->lire) accessforbidden(); -Function PLines(&$inc, $parent, $lines, &$level) +Function PLines(&$inc, $parent, $lines, &$level, $actors) { $form = new Form($db); // $db est null ici mais inutile pour la fonction select_date() - global $bc, $langs; + global $user, $bc, $langs; for ($i = 0 ; $i < sizeof($lines) ; $i++) { if ($parent == 0) @@ -57,15 +57,25 @@ Function PLines(&$inc, $parent, $lines, &$level) $minutes = substr("00"."$minutes", -2); print ''.$heure." h ".$minutes."\n"; - print ''; - print ' '; - print "\n"; - print $form->select_date('',$lines[$i][2]); - print ''; + + // TODO améliorer le test + + if ($actors[$lines[$i][2]] == 'admin') + { + print ''; + print ' '; + print "\n"; + print $form->select_date('',$lines[$i][2]); + print ''; + } + else + { + print ' '; + } print "\n"; $inc++; $level++; - PLines($inc, $lines[$i][2], $lines, $level); + PLines($inc, $lines[$i][2], $lines, $level, $actors); $level--; } else @@ -225,9 +235,34 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) print '
'; print ''; print ''; - print ''; + print ''; print ''; + + /* Liste des acteurs */ + $sql = "SELECT a.fk_projet_task, a.role"; + $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_actors as a"; + $sql .= " WHERE a.fk_user = ".$user->id; + + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + $actors = array(); + while ($i < $num) + { + $row = $db->fetch_row($resql); + $actors[$row[0]] = $row[1]; + $i++; + } + $db->free(); + } + else + { + dolibarr_print_error($db); + } + /* Liste des tâches */ $sql = "SELECT t.rowid, t.title, t.fk_task_parent, t.duration_effective"; @@ -280,7 +315,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) print ''; print ''; print "\n"; - PLines($j, 0, $tasks, $level); + PLines($j, 0, $tasks, $level, $actors); print '';
'.$langs->trans("Label").''.$projet->title.'
'.$langs->trans("Project").''.$projet->title.''.$langs->trans("Company").''.$projet->societe->nom_url.'
'.$langs->trans("DurationEffective").''.$langs->trans("AddDuration").'