diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 4dab8237c1610c01f67f831ad6a834febf61b48a..4a1200d9e1305250112be5042c494b9d58d4930f 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -424,17 +424,17 @@ print '<td align="right">'.$langs->trans("Note").'</td>'; print "</tr>\n"; print '<tr class="liste_titre">'; -print '<td class="liste_total"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; -print '<td class="liste_total"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; -print '<td class="liste_total"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) print '<td class="liste_total"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; // Action column print '<td class="liste_titre nowrap" align="right">'; $searchpitco=$form->showFilterAndCheckAddButtons(0); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index cf018ddf15300a9a5794fbb6c9996d263359d70c..fcfc3f8e9a6eb6a872a667be915043b3bf810b63 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -420,21 +420,21 @@ for($i=0;$i<7;$i++) { print '<td width="7%" align="center" class="hide'.$i.'">'.dol_print_date($startday + ($i * 3600 * 24), '%a').'<br>'.dol_print_date($startday + ($i * 3600 * 24), 'dayreduceformat').'</td>'; } -print '<td class="liste_total"></td>'; +print '<td></td>'; print "</tr>\n"; print '<tr class="liste_titre">'; -print '<td class="liste_total"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; -print '<td class="liste_total"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; -print '<td class="liste_total"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>'; +print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>'; if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) print '<td class="liste_total"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; -print '<td class="liste_total"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; +print '<td class="liste_titre"></td>'; for($i=0;$i<7;$i++) { - print '<td class="liste_total"></td>'; + print '<td class="liste_titre"></td>'; } // Action column print '<td class="liste_titre nowrap" align="right">'; diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 86d79676d584664c1593ad419cbbbf3fad30a7f1..e6ee4e5cc40ec02a584dc005b8dee7e36f7c8e7c 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 '<td class="liste_titre">'; + print '<td class="liste_titre center">'; $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 '</td>'; } -if (! empty($arrayfields['t.planned_workload']['checked'])) print '<td></td>'; -if (! empty($arrayfields['t.duration_effective']['checked'])) print '<td></td>'; -if (! empty($arrayfields['t.progress_calculated']['checked'])) print '<td></td>'; -if (! empty($arrayfields['t.progress']['checked'])) print '<td></td>'; +if (! empty($arrayfields['t.planned_workload']['checked'])) print '<td class="liste_titre"></td>'; +if (! empty($arrayfields['t.duration_effective']['checked'])) print '<td class="liste_titre"></td>'; +if (! empty($arrayfields['t.progress_calculated']['checked'])) print '<td class="liste_titre"></td>'; +if (! empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titre"></td>'; // 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 '<td>'; + print '<td align="center">'; print $projectstatic->getLibStatut(1); print '</td>'; if (! $i) $totalarray['nbfield']++; @@ -725,6 +725,7 @@ while ($i < min($num,$limit)) } print '</td>'; 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 '<td align="center">'.convertSecondToTime($totalarray['totalplannedworkload'],$plannedworkloadoutputformat).'</td>'; elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td align="center">'.convertSecondToTime($totalarray['totaldurationeffective'],$timespentoutputformat).'</td>'; + elseif ($totalarray['totalprogress_calculated'] == $i) print '<td align="center">'.($totalarray['totaldurationeffective'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>'; else print '<td></td>'; } print '</tr>';