diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 020223bdea0..67fe7362a99 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -688,7 +688,35 @@ while ($currentdaytoshow < $lastdaytoshow) { echo '
| '; + echo ' | ';
+
+ if ($canedit && $action == 'show_peruser')
+ {
+ // Filter on hours
+ print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
+ print ''.$langs->trans("Hours").'';
+ print "\n".' ';
+ print '';
+ if (empty($conf->dol_use_jmobile)) print ' - ';
+ else print ' ';
+ print '';
+ if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+ print ' '; + + // Filter on days + print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"'); + print ''.$langs->trans("DaysOfWeek").''; + print "\n".' ';
+ print '';
+ if (empty($conf->dol_use_jmobile)) print ' - ';
+ else print ' ';
+ print '';
+ print ' | ';
$i = 0; // 0 = sunday,
while ($i < 7)
{
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 444c14c41c4..43408a38373 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -140,34 +140,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '';
}
- if ($canedit && $action == 'show_peruser')
- {
- print '
| '.$langs->trans("Year").' | '; +print ''.$langs->trans("Year").' | '; print ''.$langs->trans("NbOfTasks").' | '; print '
| 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.' | '; + print '0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.' | '; print '0 | '; print '
| 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.' | '; + print '0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.' | '; print ''.$val['nb'].' | '; print '