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

Normalize code

Browse Source
This commit is contained in:
Laurent Destailleur 2016-12-22 16:09:12 +01:00
parent 4875509b56
commit 1307b93d55
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/holiday/define_holiday.php
View File

@ -175,25 +175,41 @@ else
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n"; print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'" id="tablelines3">'."\n";
print "<tr class=\"liste_titre\">"; print '<tr class="liste_titre">';
print '<td width="55%">'.$langs->trans('Employee').'</td>'; print_liste_field_titre($langs->trans('Employee'), $_SERVER["PHP_SELF"]);
if (count($typeleaves)) if (count($typeleaves))
{ {
foreach($typeleaves as $key => $val) foreach($typeleaves as $key => $val)
{ {
print '<td width="20%" style="text-align:center">'.$val['label'].'</td>'; print '<th style="text-align:center">'.$val['label'].'</th>';
} }
} }
else else
{ {
print '<td>'.$langs->trans("NoLeaveWithCounterDefined").'</td>'; print '<th>'.$langs->trans("NoLeaveWithCounterDefined").'</th>';
} }
print '<td width="20%" style="text-align:center">'; print '<th style="text-align:center">';
if ($canedit) print $langs->trans('Note'); if ($canedit) print $langs->trans('Note');
print '</td>'; print '</th>';
print '<td></td>'; print_liste_field_titre('');
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">';
print '<td class="liste_titre"></td>';
if (count($typeleaves))
{
foreach($typeleaves as $key => $val)
{
print '<td class="liste_titre" style="text-align:center"></td>';
}
}
else
{
print '<td class="liste_titre"></td>';
}
print '<td class="liste_titre"></td>';
print '<td class="liste_titre"></td>';
print '</tr>';
foreach($listUsers as $users) foreach($listUsers as $users)
{ {
$var=!$var; $var=!$var;
@ -204,7 +220,7 @@ else
if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it. if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
} }
print '<tr '.$bc[$var].' style="height: 20px;">'; print '<tr '.$bc[$var].'>';
print '<td>'; print '<td>';
$userstatic->id=$users['rowid']; $userstatic->id=$users['rowid'];
$userstatic->lastname=$users['lastname']; $userstatic->lastname=$users['lastname'];

31
htdocs/holiday/view_log.php
View File

@ -78,17 +78,28 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"")
print '<tbody>'; print '<tbody>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('ID'));
print '<td class="liste_titre">'.$langs->trans('ID').'</td>'; print_liste_field_titre($langs->trans('Date'), $_SERVER["PHP_SELF"], '', '', '', 'align="center"');
print '<td class="liste_titre" align="center">'.$langs->trans('Date').'</td>'; print_liste_field_titre($langs->trans('ActionByCP'));
print '<td class="liste_titre">'.$langs->trans('ActionByCP').'</td>'; print_liste_field_titre($langs->trans('UserUpdateCP'));
print '<td class="liste_titre">'.$langs->trans('UserUpdateCP').'</td>'; print_liste_field_titre($langs->trans('Description'));
print '<td class="liste_titre">'.$langs->trans('Description').'</td>'; print_liste_field_titre($langs->trans('Type'));
print '<td class="liste_titre">'.$langs->trans('Type').'</td>'; print_liste_field_titre($langs->trans('PrevSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"');
print '<td class="liste_titre" align="right">'.$langs->trans('PrevSoldeCP').'</td>'; print_liste_field_titre($langs->trans('NewSoldeCP'), $_SERVER["PHP_SELF"], '', '', '', 'align="right"');
print '<td class="liste_titre" align="right">'.$langs->trans('NewSoldeCP').'</td>';
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">';
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>';
print '<td class="liste_titre"></td>';
print '</tr>';
$var=true; $var=true;
foreach($cp->logs as $logs_CP) foreach($cp->logs as $logs_CP)