opensourcemirror
/
nextcloud-calendar
mirror of https://github.com/nextcloud/calendar.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix search results returning past events 

for calendar widget

Signed-off-by: Anna Larch <anna@nextcloud.com>
This commit is contained in:
Anna Larch 2022-10-27 14:19:15 +02:00
parent fd86c3729e
commit a5448476a3
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Dashboard/CalendarWidget.php
View File

@ -142,21 +142,13 @@ class CalendarWidget implements IAPIWidget, IButtonWidget, IIconWidget, IOptionW
* @param string|null $since Use any PHP DateTime allowed values to get future dates
* @param int $limit Max 14 items is the default
*/
public function getItems(string $userId, ?string $since = null, int $limit = 14): array {
public function getItems(string $userId, ?string $since = null, int $limit = 7): array {
$calendars = $this->calendarManager->getCalendarsForPrincipal('principals/users/' . $userId);
$count = count($calendars);
if ($count === 0) {
return [];
}
$limitPerCalendar = (int)round(($limit / $count)) ?? 1;
$dateTime = (new DateTimeImmutable())->setTimestamp($this->timeFactory->getTime());
if ($since !== null) {
try {
$dateTime = new DateTimeImmutable($since);
} catch (\Exception $e) {
// silently drop the exception and proceed with "now"
}
}
$inTwoWeeks = $dateTime->add(new DateInterval('P14D'));
$options = [
'timerange' => [
@ -166,7 +158,7 @@ class CalendarWidget implements IAPIWidget, IButtonWidget, IIconWidget, IOptionW
];
$widgetItems = [];
foreach ($calendars as $calendar) {
$searchResult = $calendar->search('', [], $options, $limitPerCalendar);
$searchResult = $calendar->search('', [], $options, $limit);
foreach ($searchResult as $calendarEvent) {
/** @var DateTimeImmutable $startDate */
$startDate = $calendarEvent['objects'][0]['DTSTART'][0];

2
tests/php/unit/Dashbaord/CalendarWidgetTest.php
View File

@ -137,7 +137,7 @@ class CalendarWidgetTest extends TestCase {
'end' => $twoWeeks,
]
];
$limit = 14;
$limit = 7;
$result = [
'id' => '3599',
'uid' => '59d30b6c-5a31-4d28-b1d6-c8f928180e96',