diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 4dab8237c16..4a1200d9e13 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -424,17 +424,17 @@ print '
';
-print ' | ';
-print ' | ';
-print ' | ';
+print ' | ';
+print ' | ';
+print ' | ';
if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print ' | ';
-print ' | ';
-print ' | ';
-print ' | ';
-print ' | ';
+print ' | ';
+print ' | ';
+print ' | ';
+print ' | ';
for($i=0;$i<7;$i++)
{
- print ' | ';
+ print ' | ';
}
// Action column
print '';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 86d79676d58..e6ee4e5cc40 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -435,7 +435,7 @@ if (! empty($arrayfields['t.datee']['checked'])) print_liste_field_titre
if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,"",$sortfield,$sortorder);
if (! empty($arrayfields['p.title']['checked'])) print_liste_field_titre($arrayfields['p.title']['label'],$_SERVER["PHP_SELF"],"p.title","",$param,"",$sortfield,$sortorder);
if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
-if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,"",$sortfield,$sortorder);
+if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'],$_SERVER["PHP_SELF"],"t.planned_workload","",$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'],$_SERVER["PHP_SELF"],"t.duration_effective","",$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'],$_SERVER["PHP_SELF"],"","",$param,'align="center"');
@@ -512,17 +512,17 @@ if (! empty($arrayfields['s.nom']['checked']))
}
if (! empty($arrayfields['p.fk_statut']['checked']))
{
- print ' | ';
+ print ' | ';
$arrayofstatus = array();
foreach($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key]=$langs->trans($val);
$arrayofstatus['99']=$langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
print $form->selectarray('search_projectstatus', $arrayofstatus, $search_projectstatus, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
print ' | ';
}
-if (! empty($arrayfields['t.planned_workload']['checked'])) print ' | ';
-if (! empty($arrayfields['t.duration_effective']['checked'])) print ' | ';
-if (! empty($arrayfields['t.progress_calculated']['checked'])) print ' | ';
-if (! empty($arrayfields['t.progress']['checked'])) print ' | ';
+if (! empty($arrayfields['t.planned_workload']['checked'])) print ' | ';
+if (! empty($arrayfields['t.duration_effective']['checked'])) print ' | ';
+if (! empty($arrayfields['t.progress_calculated']['checked'])) print ' | ';
+if (! empty($arrayfields['t.progress']['checked'])) print ' | ';
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -674,7 +674,7 @@ while ($i < min($num,$limit))
// Project status
if (! empty($arrayfields['p.fk_statut']['checked']))
{
- print '';
+ print ' | ';
print $projectstatic->getLibStatut(1);
print ' | ';
if (! $i) $totalarray['nbfield']++;
@@ -725,6 +725,7 @@ while ($i < min($num,$limit))
}
print '';
if (! $i) $totalarray['nbfield']++;
+ if (! $i) $totalarray['totalprogress_calculated']=$totalarray['nbfield'];
}
// Declared progress
if (! empty($arrayfields['t.progress']['checked']))
@@ -815,6 +816,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
}
elseif ($totalarray['totalplannedworkloadfield'] == $i) print ''.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).' | ';
elseif ($totalarray['totaldurationeffectivefield'] == $i) print ''.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).' | ';
+ elseif ($totalarray['totalprogress_calculated'] == $i) print ''.($totalarray['totaldurationeffective'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').' | ';
else print ' | ';
}
print '
';