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

Update project.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-05-25 10:50:16 +02:00 committed by GitHub
parent dd946dd197
commit c56ef86bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htdocs/core/lib/project.lib.php
View File

@ -531,23 +531,26 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
} }
print '</td>'; print '</td>';
// Ressources // Contacts of task
print '<td>'; if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
foreach(array('internal','external') as $source)
{ {
$tab = $lines[$i]->liste_contact(-1,$source); print '<td>';
$num=count($tab); foreach(array('internal','external') as $source)
if (!empty($num)){ {
foreach ($tab as $contacttask){ $tab = $lines[$i]->liste_contact(-1,$source);
//var_dump($contacttask); $num=count($tab);
if ($source == 'internal') $c = new User($db); if (!empty($num)){
else $c = new Contact($db); foreach ($tab as $contacttask){
$c->fetch($contacttask['id']); //var_dump($contacttask);
print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>'; if ($source == 'internal') $c = new User($db);
else $c = new Contact($db);
$c->fetch($contacttask['id']);
print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
}
} }
} }
print '</td>';
} }
print '</td>';
// Tick to drag and drop // Tick to drag and drop
if ($addordertick) if ($addordertick)
@ -597,7 +600,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %'; if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
print '</td>'; print '</td>';
print '<td></td>'; print '<td></td>';
print '<td></td>'; // Contacts of task
if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
{
print '<td></td>';
}
if ($addordertick) print '<td class="hideonsmartphone"></td>'; if ($addordertick) print '<td class="hideonsmartphone"></td>';
print '</tr>'; print '</tr>';
} }