Skip to content

Implement new dashboard widget interfaces #4033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 5 commits into from
Sep 21, 2022
Merged

Implement new dashboard widget interfaces #4033

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dba89a
implement IAPIWidget interface
Sep 6, 2022
e29ac75
use @nc/vue button in dashboard widget, use material icon inside
Sep 6, 2022
0c95e7c
implement IButtonWidget and IIconWidget
Sep 6, 2022
44127d4
use since param to build widget item list
Sep 7, 2022
6449082
fix widget api buttons
Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use since param to build widget item list 
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
Julien Veyssier committed Sep 16, 2022
commit 44127d4bf657fd189ef27993769351a209aeca3f
5 changes: 3 additions & 2 deletions lib/Dashboard/DeckWidget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,11 @@ public function load(): void {
public function getItems(string $userId, ?string $since = null, int $limit = 7): array {
$upcomingCards = $this->dashboardService->findUpcomingCards($userId);
$nowTimestamp = (new Datetime())->getTimestamp();
$upcomingCards = array_filter($upcomingCards, static function(array $card) use ($nowTimestamp) {
$sinceTimestamp = $since !== null ? (new Datetime($since))->getTimestamp() : null;
$upcomingCards = array_filter($upcomingCards, static function(array $card) use ($nowTimestamp, $sinceTimestamp) {
if ($card['duedate']) {
$ts = (new Datetime($card['duedate']))->getTimestamp();
return $ts > $nowTimestamp;
return $ts > $nowTimestamp && ($sinceTimestamp === null || $ts > $sinceTimestamp);
}
return false;
});
Expand Down