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

Fix look and feel of v11

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-02 20:21:16 +01:00
parent 21e4717721
commit 12b63606df
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1811,7 +1811,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
if ($projectstatic->title) if ($projectstatic->title)
{ {
print ' - '; print ' - ';
print $projectstatic->title; print '<span class="secondary">'.$projectstatic->title.'</span>';
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
@ -1853,18 +1853,18 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
print "</td>\n"; print "</td>\n";
// Planned Workload // Planned Workload
print '<td align="right" class="leftborder plannedworkload">'; print '<td class="leftborder plannedworkload right">';
if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin'); if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
else print '--:--'; else print '--:--';
print '</td>'; print '</td>';
// Progress declared % // Progress declared %
print '<td align="right">'; print '<td class="right">';
print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress'); print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
print '</td>'; print '</td>';
// Time spent by everybody // Time spent by everybody
print '<td align="right">'; print '<td class="right">';
// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
if ($lines[$i]->duration) if ($lines[$i]->duration)
{ {
@ -1876,7 +1876,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
print "</td>\n"; print "</td>\n";
// Time spent by user // Time spent by user
print '<td align="right">'; print '<td class="right">';
$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id); $tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin'); if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
else print '--:--'; else print '--:--';
@ -1935,7 +1935,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
} }
// Warning // Warning
print '<td align="right">'; print '<td class="right">';
if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject")); if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
elseif ($disabledtask) elseif ($disabledtask)
{ {

8
htdocs/projet/activity/permonth.php
View File

@ -386,7 +386,7 @@ $head=project_timesheet_prepare_head($mode, $usertoprocess);
dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task'); dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
// Show description of content // Show description of content
print '<div class="hideonsmartphone">'; print '<div class="hideonsmartphone opacitymedium">';
if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>'; if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'<br>';
else else
{ {
@ -502,11 +502,11 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>'; if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/ else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>'; print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname?'<br>('.$usertoprocess->firstname.')':'').'</td>'; print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>('.dol_trunc($usertoprocess->firstname, 10).')' : '').'</td>';
foreach ($TWeek as $week_number) foreach ($TWeek as $week_number)
{ {
print '<td width="6%" align="center" class="bold hide">'.$langs->trans("Week").'<br>'.$week_number.'<br>('.$langs->trans('From').' '.$TFirstDays[$week_number].' '.$langs->trans('to').' '.$TLastDays[$week_number].')</td>'; print '<td width="6%" align="center" class="bold hide">'.$langs->trans("Week").' '.$week_number.'<br>('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].')</td>';
} }
print '<td></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
@ -597,7 +597,7 @@ if (count($tasksarray) > 0)
print '<tr class="liste_total"> print '<tr class="liste_total">
<td class="liste_total" colspan="'.$colspan.'">'; <td class="liste_total" colspan="'.$colspan.'">';
print $langs->trans("Total"); print $langs->trans("Total");
print ' - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong>'; print '<span class="opacitymediumbycolor"> - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
print '</td>'; print '</td>';
foreach ($TWeek as $weekNb) foreach ($TWeek as $weekNb)