Memory optimisation
Add number of other events not shown in calendar for each day
This commit is contained in:
parent
4b8786fda6
commit
62b3d11542
@ -509,7 +509,6 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray, $maxPri
|
|||||||
|
|
||||||
//$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year);
|
//$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year);
|
||||||
$i=0;
|
$i=0;
|
||||||
$ok=true;
|
|
||||||
|
|
||||||
foreach ($actionarray as $daykey => $notused)
|
foreach ($actionarray as $daykey => $notused)
|
||||||
{
|
{
|
||||||
@ -520,7 +519,6 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray, $maxPri
|
|||||||
{
|
{
|
||||||
foreach ($actionarray[$daykey] as $index => $action)
|
foreach ($actionarray[$daykey] as $index => $action)
|
||||||
{
|
{
|
||||||
|
|
||||||
if ($i < $maxPrint || $maxPrint == 0)
|
if ($i < $maxPrint || $maxPrint == 0)
|
||||||
{
|
{
|
||||||
$ponct=($action->date_start_in_calendar == $action->date_end_in_calendar);
|
$ponct=($action->date_start_in_calendar == $action->date_end_in_calendar);
|
||||||
@ -579,12 +577,16 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray, $maxPri
|
|||||||
print '</td></tr></table>';
|
print '</td></tr></table>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
else if($ok)
|
else
|
||||||
{
|
{
|
||||||
print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=maxPrint&month='.$month.'&year='.$year.'">'.img_picto("all","1downarrow_selected.png").' ...</a>';
|
print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action=maxPrint&month='.$month.'&year='.$year.'">'.img_picto("all","1downarrow_selected.png").' ...';
|
||||||
$ok=false;
|
print ' +'.(sizeof($actionarray[$daykey])-$maxPrint);
|
||||||
|
print '</a>';
|
||||||
|
break;
|
||||||
|
//$ok=false; // To avoid to show twice the link
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (! $i) print ' ';
|
if (! $i) print ' ';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user