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

Beteer display

Browse Source
This commit is contained in:
fhenry 2013-05-14 20:30:18 +02:00
parent 6727ab34ed
commit 7de861eee4
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,8 +49,8 @@ function project_prepare_head($object)
$h++; $h++;
if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled) if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled)) || ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
{ {
$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
$head[$h][1] = $langs->trans("Referers"); $head[$h][1] = $langs->trans("Referers");
@ -420,10 +420,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
print dol_print_date($lines[$i]->date_end,'day'); print dol_print_date($lines[$i]->date_end,'day');
print '</td>'; print '</td>';
// Duration // Planned Workload
print '<td align="center">'; print '<td align="center">';
print $lines[$i]->planned_workload.' '.$langs->trans('Hours'); if (!empty($lines[$i]->planned_workload)) {
print '</td>'; $planned_workload_hours = intval($lines[$i]->planned_workload / 3600);
}else {
$planned_workload_hours = 0;
}
print $planned_workload_hours.' '.$langs->trans('Hours');
print '</td>';
// Progress // Progress
print '<td align="right">'; print '<td align="right">';
@ -443,7 +448,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Tick to drag and drop // Tick to drag and drop
if ($addordertick) if ($addordertick)
{ {
print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>'; print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
} }
print "</tr>\n"; print "</tr>\n";
@ -555,10 +560,15 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
print dol_print_date($lines[$i]->date_end,'day'); print dol_print_date($lines[$i]->date_end,'day');
print '</td>'; print '</td>';
// Duration // Planned Workload
print '<td align="center">'; print '<td align="center">';
print $lines[$i]->planned_workload.' '.$langs->trans('Hours'); if (!empty($lines[$i]->planned_workload)) {
print '</td>'; $planned_workload_hours = intval($lines[$i]->planned_workload / 3600);
}else {
$planned_workload_hours = 0;
}
print $planned_workload_hours.' '.$langs->trans('Hours');
print '</td>';
// Progress // Progress
print '<td align="right">'; print '<td align="right">';

2
htdocs/projet/tasks.php
View File

@ -403,7 +403,7 @@ else
print '<td>'.$langs->trans("LabelTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>';
print '<td align="center">'.$langs->trans("DateStart").'</td>'; print '<td align="center">'.$langs->trans("DateStart").'</td>';
print '<td align="center">'.$langs->trans("DateEnd").'</td>'; print '<td align="center">'.$langs->trans("DateEnd").'</td>';
print '<td align="right">'.$langs->trans("Duration").'</td>'; print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>';
print '<td align="right">'.$langs->trans("Progress").'</td>'; print '<td align="right">'.$langs->trans("Progress").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';

2
htdocs/projet/tasks/index.php
View File

@ -100,7 +100,7 @@ print '<td width="80">'.$langs->trans("RefTask").'</td>';
print '<td>'.$langs->trans("LabelTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>';
print '<td align="center">'.$langs->trans("DateStart").'</td>'; print '<td align="center">'.$langs->trans("DateStart").'</td>';
print '<td align="center">'.$langs->trans("DateEnd").'</td>'; print '<td align="center">'.$langs->trans("DateEnd").'</td>';
print '<td align="center">'.$langs->trans("Duration").'</td>'; print '<td align="center">'.$langs->trans("PlannedWorkload").'</td>';
print '<td align="right">'.$langs->trans("Progress").'</td>'; print '<td align="right">'.$langs->trans("Progress").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print "</tr>\n"; print "</tr>\n";