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

Fix space

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-16 11:01:35 +01:00
parent 68e50d0c79
commit 0d6a99b35a
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY)) if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
{ {
// Thirdparty // Thirdparty
print '<td class="nowrap">'; print '<td class="tdoverflowmax100">';
$thirdpartystatic->id=$lines[$i]->socid; $thirdpartystatic->id=$lines[$i]->socid;
$thirdpartystatic->name=$lines[$i]->thirdparty_name; $thirdpartystatic->name=$lines[$i]->thirdparty_name;
print $thirdpartystatic->getNomUrl(1, 'project', 10); print $thirdpartystatic->getNomUrl(1, 'project', 10);
@ -839,10 +839,10 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY)) if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
{ {
// Thirdparty // Thirdparty
print '<td class="nowrap">'; print '<td class="tdoverflowmax100">';
$thirdpartystatic->id=$lines[$i]->thirdparty_id; $thirdpartystatic->id=$lines[$i]->thirdparty_id;
$thirdpartystatic->name=$lines[$i]->thirdparty_name; $thirdpartystatic->name=$lines[$i]->thirdparty_name;
print $thirdpartystatic->getNomUrl(1, 'project', 10); print $thirdpartystatic->getNomUrl(1, 'project');
print '</td>'; print '</td>';
} }

10
htdocs/projet/activity/perday.php
View File

@ -413,11 +413,11 @@ if (! empty($conf->global->PROJECT_LINES_PERDAY_SHOW_THIRDPARTY))
{ {
print '<td>'.$langs->trans("ThirdParty").'</td>'; print '<td>'.$langs->trans("ThirdParty").'</td>';
} }
print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>'; print '<td align="right" class="maxwidth100">'.$langs->trans("PlannedWorkload").'</td>';
print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>'; print '<td align="right" class="maxwidth100">'.$langs->trans("ProgressDeclared").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpent").'</td>';
if ($usertoprocess->id == $user->id) print '<td align="right">'.$langs->trans("TimeSpentByYou").'</td>'; if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
else print '<td align="right">'.$langs->trans("TimeSpentByUser").'</td>'; else print '<td align="right" class="maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';
print '<td align="center">'.$langs->trans("HourStart").'</td>'; print '<td align="center">'.$langs->trans("HourStart").'</td>';
print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>'; print '<td align="center" colspan="2">'.$langs->trans("Duration").'</td>';
print '<td align="right">'.$langs->trans("Note").'</td>'; print '<td align="right">'.$langs->trans("Note").'</td>';

26
htdocs/projet/activity/perweek.php
View File

@ -408,17 +408,17 @@ if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
{ {
print '<td>'.$langs->trans("ThirdParty").'</td>'; print '<td>'.$langs->trans("ThirdParty").'</td>';
} }
print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>'; print '<td align="right" class="maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>'; print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
if ($usertoprocess->id == $user->id) print '<td align="right">'.$langs->trans("TimeSpentByYou").'</td>'; if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
else print '<td align="right">'.$langs->trans("TimeSpentByUser").'</td>'; else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';
$startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']); $startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);
for($i=0;$i<7;$i++) 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 width="6%" 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></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
@ -460,13 +460,13 @@ if (count($tasksarray) > 0)
print '<tr class="liste_total"> print '<tr class="liste_total">
<td class="liste_total" colspan="'.$colspan.'" align="right">'.$langs->trans("Total").'</td> <td class="liste_total" colspan="'.$colspan.'" align="right">'.$langs->trans("Total").'</td>
<td class="liste_total hide0" width="7%" align="center"><div id="totalDay[0]">&nbsp;</div></td> <td class="liste_total hide0" align="center"><div id="totalDay[0]">&nbsp;</div></td>
<td class="liste_total hide1" width="7%" align="center"><div id="totalDay[1]">&nbsp;</div></td> <td class="liste_total hide1" align="center"><div id="totalDay[1]">&nbsp;</div></td>
<td class="liste_total hide2" width="7%" align="center"><div id="totalDay[2]">&nbsp;</div></td> <td class="liste_total hide2" align="center"><div id="totalDay[2]">&nbsp;</div></td>
<td class="liste_total hide3" width="7%" align="center"><div id="totalDay[3]">&nbsp;</div></td> <td class="liste_total hide3" align="center"><div id="totalDay[3]">&nbsp;</div></td>
<td class="liste_total hide4" width="7%" align="center"><div id="totalDay[4]">&nbsp;</div></td> <td class="liste_total hide4" align="center"><div id="totalDay[4]">&nbsp;</div></td>
<td class="liste_total hide5" width="7%" align="center"><div id="totalDay[5]">&nbsp;</div></td> <td class="liste_total hide5" align="center"><div id="totalDay[5]">&nbsp;</div></td>
<td class="liste_total hide6" width="7%" align="center"><div id="totalDay[6]">&nbsp;</div></td> <td class="liste_total hide6" align="center"><div id="totalDay[6]">&nbsp;</div></td>
<td class="liste_total"></td> <td class="liste_total"></td>
</tr>'; </tr>';
} }