card dashboard

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>

appinfo/routes.php

@@ -65,7 +65,12 @@ return [
 		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
 		['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
 		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/unassign', 'verb' => 'PUT'],
+		
+		// dashboard
+		['name' => 'card#findAllWithDue', 'url' => '/dashboard/due', 'verb' => 'GET'],
+		['name' => 'card#findMyAssignedCards', 'url' => '/dashboard/assigned', 'verb' => 'GET'],
 
+		// attachments
 		['name' => 'attachment#getAll', 'url' => '/cards/{cardId}/attachments', 'verb' => 'GET'],
 		['name' => 'attachment#create', 'url' => '/cards/{cardId}/attachment', 'verb' => 'POST'],
 		['name' => 'attachment#display', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'GET'],
@@ -110,6 +115,8 @@ return [
 		['name' => 'card_api#reorder', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder', 'verb' => 'PUT'],
 		['name' => 'card_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'DELETE'],
 
+		['name' => 'card_api#findAllWithDue', 'url' => '/api/v1.0/dashboard/due', 'verb' => 'GET'],
+
 		['name' => 'label_api#get', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'GET'],
 		['name' => 'label_api#create', 'url' => '/api/v1.0/boards/{boardId}/labels', 'verb' => 'POST'],
 		['name' => 'label_api#update', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'PUT'],

lib/Controller/CardController.php

@@ -25,6 +25,7 @@ namespace OCA\Deck\Controller;
 
 use OCA\Deck\Service\AssignmentService;
 use OCA\Deck\Service\CardService;
+use OCA\Deck\Service\DashboardService;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 
@@ -33,10 +34,11 @@ class CardController extends Controller {
 	private $cardService;
 	private $assignmentService;
 
-	public function __construct($appName, IRequest $request, CardService $cardService, AssignmentService $assignmentService, $userId) {
+	public function __construct($appName, IRequest $request, CardService $cardService, DashboardService $dashboardService, AssignmentService $assignmentService, $userId) {
 		parent::__construct($appName, $request);
 		$this->userId = $userId;
 		$this->cardService = $cardService;
+		$this->dashboardService = $dashboardService;
 		$this->assignmentService = $assignmentService;
 	}
 
@@ -165,4 +167,20 @@ class CardController extends Controller {
 	public function unassignUser($cardId, $userId, $type = 0) {
 		return $this->assignmentService->unassignUser($cardId, $userId, $type);
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @return array
+	 */
+	public function findAllWithDue($userId) {
+		return $this->dashboardService->findAllWithDue($userId);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @return array
+	 */
+	public function findMyAssignedCards($userId) {
+		return $this->dashboardService->findMyAssignedCards($userId);
+	}
 }

lib/Db/CardMapper.php

@@ -141,6 +141,23 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
 		return $this->findEntities($sql, [$stackId], $limit, $offset);
 	}
 
+	public function findAllWithDue($boardId) {
+		$sql = 'SELECT c.* FROM `*PREFIX*deck_cards` c
+	  	INNER JOIN `*PREFIX*deck_stacks` s ON s.id = c.stack_id
+		INNER JOIN `*PREFIX*deck_boards` b ON b.id = s.board_id
+		  WHERE `s`.`board_id` = ? AND duedate IS NOT NULL AND NOT c.archived AND c.deleted_at = 0 AND s.deleted_at = 0 AND NOT b.archived AND b.deleted_at = 0';
+		return $this->findEntities($sql, [$boardId]);
+	}
+
+	public function findMyAssignedCards($boardId, $username) {
+		$sql = 'SELECT c.* FROM `*PREFIX*deck_cards` c
+	  	INNER JOIN `*PREFIX*deck_stacks` s ON s.id = c.stack_id
+		INNER JOIN `*PREFIX*deck_boards` b ON b.id = s.board_id
+		INNER JOIN `*PREFIX*deck_assigned_users` u ON c.id = card_id
+		  WHERE `s`.`board_id` = ? AND participant = ? AND NOT c.archived AND c.deleted_at = 0 AND s.deleted_at = 0 AND NOT b.archived AND b.deleted_at = 0';
+		return $this->findEntities($sql, [$boardId, $username]);
+	}
+
 	public function findOverdue() {
 		$sql = 'SELECT id,title,duedate,notified from `*PREFIX*deck_cards` WHERE duedate < NOW() AND NOT archived AND deleted_at = 0';
 		return $this->findEntities($sql);

lib/Service/CardService.php

@@ -564,4 +564,28 @@ class CardService {
 			'\OCA\Deck\Card::onUpdate', new FTSEvent(null, ['id' => $cardId, 'card' => $card])
 		);
 	}
+
+	/**
+	 *
+	 * @return array
+	 * @throws \OCA\Deck\NoPermissionException
+	 * @throws BadRequestException
+	 */
+	public function findAllWithDue($userId) {
+		$cards = $this->cardMapper->findAllWithDue($userId);
+		
+		return $cards;
+	}
+
+	/**
+	 *
+	 * @return array
+	 * @throws \OCA\Deck\NoPermissionException
+	 * @throws BadRequestException
+	 */
+	public function findMyAssignedCards($userId) {
+		$cards = $this->cardMapper->findMyAssignedCards($userId);
+		
+		return $cards;
+	}
 }

lib/Service/DashboardService.php

@@ -0,0 +1,163 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Deck\Service;
+
+use OCA\Deck\Activity\ActivityManager;
+use OCA\Deck\Activity\ChangeSet;
+use OCA\Deck\Db\Acl;
+use OCA\Deck\Db\AclMapper;
+use OCA\Deck\Db\AssignedUsersMapper;
+use OCA\Deck\Db\ChangeHelper;
+use OCA\Deck\Db\IPermissionMapper;
+use OCA\Deck\Db\CardMapper;
+use OCA\Deck\Db\Label;
+use OCA\Deck\Db\Stack;
+use OCA\Deck\Db\StackMapper;
+use OCA\Deck\NoPermissionException;
+use OCA\Deck\Notification\NotificationHelper;
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IGroupManager;
+use OCP\IL10N;
+use OCA\Deck\Db\Board;
+use OCA\Deck\Db\BoardMapper;
+use OCA\Deck\Db\LabelMapper;
+use OCP\IUserManager;
+use OCA\Deck\BadRequestException;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+class DashboardService {
+	private $boardMapper;
+	private $stackMapper;
+	private $labelMapper;
+	private $aclMapper;
+	private $cardMapper;
+	private $l10n;
+	private $permissionService;
+	private $notificationHelper;
+	private $assignedUsersMapper;
+	private $userManager;
+	private $groupManager;
+	private $userId;
+	private $activityManager;
+	/** @var EventDispatcherInterface */
+	private $eventDispatcher;
+	private $changeHelper;
+	
+	public function __construct(
+		BoardMapper $boardMapper,
+		StackMapper $stackMapper,
+		IL10N $l10n,
+		LabelMapper $labelMapper,
+		AclMapper $aclMapper,
+		CardMapper $cardMapper,
+		PermissionService $permissionService,
+		NotificationHelper $notificationHelper,
+		AssignedUsersMapper $assignedUsersMapper,
+		IUserManager $userManager,
+		IGroupManager $groupManager,
+		ActivityManager $activityManager,
+		EventDispatcherInterface $eventDispatcher,
+		ChangeHelper $changeHelper,
+		$userId
+	) {
+		$this->boardMapper = $boardMapper;
+		$this->stackMapper = $stackMapper;
+		$this->labelMapper = $labelMapper;
+		$this->aclMapper = $aclMapper;
+		$this->cardMapper = $cardMapper;
+		$this->l10n = $l10n;
+		$this->permissionService = $permissionService;
+		$this->notificationHelper = $notificationHelper;
+		$this->assignedUsersMapper = $assignedUsersMapper;
+		$this->userManager = $userManager;
+		$this->groupManager = $groupManager;
+		$this->activityManager = $activityManager;
+		$this->eventDispatcher = $eventDispatcher;
+		$this->changeHelper = $changeHelper;
+		$this->userId = $userId;
+	}
+
+	/**
+	 * Set a different user than the current one, e.g. when no user is available in occ
+	 *
+	 * @param string $userId
+	 */
+	public function setUserId(string $userId): void {
+		$this->userId = $userId;
+	}
+
+	
+	/**
+	 * @return array
+	 */
+	public function findAllWithDue($userId) {
+		$userInfo = $this->getBoardPrerequisites();
+		$userBoards = $this->findAllBoardsFromUser($userInfo);
+		$allDueCards = [];
+		foreach ($userBoards as $userBoard) {
+			$allDueCards[] = $this->cardMapper->findAllWithDue($userBoard->getId());
+		}
+		return $allDueCards;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function findMyAssignedCards($userId) {
+		$userInfo = $this->getBoardPrerequisites();
+		$userBoards = $this->findAllBoardsFromUser($userInfo);
+		$allAssignedCards = [];
+		foreach ($userBoards as $userBoard) {
+			$allAssignedCards[] = $this->cardMapper->findMyAssignedCards($userBoard->getId(), $this->userId);
+		}
+		return $allAssignedCards;
+	}
+
+	/**
+	 * @return array
+	 */
+	private function findAllBoardsFromUser($userInfo, $since = -1) {
+		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
+		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null,  $since);
+		$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null,  $since);
+		return array_merge($userBoards, $groupBoards, $circleBoards);
+	}
+
+	/**
+	 * @return array
+	 */
+	private function getBoardPrerequisites() {
+		$groups = $this->groupManager->getUserGroupIds(
+			$this->userManager->get($this->userId)
+		);
+		return [
+			'user' => $this->userId,
+			'groups' => $groups
+		];
+	}
+
+
+}

src/App.vue

@@ -85,6 +85,7 @@ export default {
 	created() {
 		this.$store.dispatch('loadBoards')
 		this.$store.dispatch('loadSharees')
+		this.$store.dispatch('loadDashboards')
 	},
 }
 

src/components/Controls.vue

@@ -30,6 +30,10 @@
 				({{ t('deck', 'Archived cards') }})
 			</p>
 		</div>
+		<div v-if="dashboardName" class="board-title">
+			<!-- <div :style="{backgroundColor: '#' + board.color}" class="board-bullet" /> -->
+			<h2><a href="#">{{ dashboardName }}</a></h2>
+		</div>
 		<div v-if="board" class="board-actions">
 			<div v-if="canManage && !showArchived && !board.archived"
 				id="stack-add"
@@ -206,6 +210,11 @@ export default {
 			required: false,
 			default: null,
 		},
+		dashboardName: {
+			type: String,
+			required: false,
+			default: null,
+		},
 	},
 	data() {
 		return {

src/components/dashboards/Dashboards.vue

@@ -0,0 +1,156 @@
+<!--
+  - @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+  -
+  - @author Julius Härtl <jus@bitgrid.net>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<div>
+		<Controls :dashboard-name="filter" />
+
+		<div v-if="filter=='due'" class="dashboard">
+			<div class="dashboard-column">
+				<h2>overdue</h2>
+				<div v-for="card in withDueDashboardGroup.overdue" :key="card.id">
+					<!-- <CardItem :id="card.id" /> -->
+					{{ card.title }}
+				</div>
+			</div>
+
+			<div class="dashboard-column">
+				<h2>today</h2>
+				{{ withDueDashboardGroup.today }}
+			</div>
+
+			<div class="dashboard-column">
+				<h2>tomorrow</h2>
+				{{ withDueDashboardGroup.tomorrow }}
+			</div>
+
+			<div class="dashboard-column">
+				<h2>this week</h2>
+				{{ withDueDashboardGroup.thisWeek }}
+			</div>
+		</div>
+
+		<div v-if="filter=='assigned'" class="dashboard">
+			<div class="dashboard-column">
+				<h2>overdue</h2>
+				<div v-for="card in assignedCardsDashboardGroup.overdue" :key="card.id">
+					{{ card.title }}
+				</div>
+			</div>
+
+			<div class="dashboard-column">
+				<h2>today</h2>
+				{{ assignedCardsDashboardGroup.today }}
+			</div>
+
+			<div class="dashboard-column">
+				<h2>tomorrow</h2>
+				{{ assignedCardsDashboardGroup.tomorrow }}
+			</div>
+
+			<div class="dashboard-column">
+				<h2>this week</h2>
+				{{ assignedCardsDashboardGroup.thisWeek }}
+			</div>
+		</div>
+
+	</div>
+</template>
+
+<script>
+
+import Controls from '../Controls'
+import CardItem from '../cards/CardItem'
+import { mapGetters } from 'vuex'
+
+export default {
+	name: 'Dashboards',
+	components: {
+		Controls,
+		CardItem,
+	},
+	props: {
+		filter: {
+			type: String,
+			default: '',
+		},
+	},
+	computed: {
+		...mapGetters([
+			'withDueDashboard',
+			'assignedCardsDashboard',
+		]),
+		withDueDashboardGroup() {
+			return this.groupByDue(this.withDueDashboard)
+		},
+		assignedCardsDashboardGroup() {
+			return this.groupByDue(this.assignedCardsDashboard)
+		},
+	},
+	methods: {
+		groupByDue(dataset) {
+			const all = {
+				overdue: [],
+				today: [],
+				tomorrow: [],
+				thisWeek: [],
+			}
+			dataset.forEach(card => {
+				const days = Math.floor(moment(card.duedate).diff(this.$root.time, 'seconds') / 60 / 60 / 24)
+				if (days < 0) {
+				  all.overdue.push(card)
+				}
+				if (days === 0) {
+					all.thisWeek.push(card)
+				}
+				if (days === 1) {
+					all.tomorrow.push(card)
+				}
+				if (days === 2) {
+					all.today.push(card)
+				}
+
+			})
+			return all
+
+		}
+	},
+	created() {
+		this.$store.dispatch('loadDashboards')
+	},
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+.dashboard {
+  display: flex;
+	align-items: stretch;
+
+  .dashboard-column {
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+</style>

src/components/navigation/AppNavigation.vue

@@ -23,6 +23,14 @@
 <template>
 	<AppNavigationVue :class="{'icon-loading': loading}">
 		<template #list>
+			<AppNavigationItem
+				:title="t('deck', 'Due cards')"
+				icon="icon-calendar-dark"
+				to="/dashboards/due" />
+			<AppNavigationItem
+				:title="t('deck', 'My assigned cards')"
+				icon="icon-group"
+				to="/dashboards/assigned" />
 			<AppNavigationBoardCategory
 				id="deck-navigation-all"
 				to="/board"
@@ -71,6 +79,7 @@ import ClickOutside from 'vue-click-outside'
 import { AppNavigation as AppNavigationVue, AppNavigationSettings, Multiselect } from '@nextcloud/vue'
 import AppNavigationAddBoard from './AppNavigationAddBoard'
 import AppNavigationBoardCategory from './AppNavigationBoardCategory'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 
@@ -84,6 +93,7 @@ export default {
 		AppNavigationAddBoard,
 		AppNavigationBoardCategory,
 		Multiselect,
+		AppNavigationItem,
 	},
 	directives: {
 		ClickOutside,
@@ -101,6 +111,15 @@ export default {
 			groupLimit: [],
 			groupLimitDisabled: true,
 			canCreate: canCreateState,
+			allDashboards: [{
+				id: 1,
+				title: 'due',
+				color: '999999',
+				acl: [],
+				permissions: {
+					PERMISSION_MANAGE: false,
+				},
+			}],
 		}
 	},
 	computed: {
@@ -108,6 +127,7 @@ export default {
 			'noneArchivedBoards',
 			'archivedBoards',
 			'sharedBoards',
+			// 'dashboards',
 		]),
 		isAdmin() {
 			// eslint-disable-next-line

src/router.js

@@ -29,6 +29,7 @@ import Board from './components/board/Board'
 import Sidebar from './components/Sidebar'
 import BoardSidebar from './components/board/BoardSidebar'
 import CardSidebar from './components/card/CardSidebar'
+import Dashboards from './components/dashboards/Dashboards'
 
 Vue.use(Router)
 
@@ -41,6 +42,20 @@ export default new Router({
 			name: 'main',
 			component: Boards,
 		},
+		{
+			path: '/dashboards/:filter',
+			name: 'dashboards',
+			components: {
+				default: Dashboards,
+			},
+			props: {
+				default: (route) => {
+					return {
+						filter: route.params.filter,
+					}
+				},
+			},
+		},
 		{
 			path: '/board',
 			name: 'boards',

src/services/CardApi.js

@@ -195,4 +195,24 @@ export class CardApi {
 			})
 	}
 
+	findAllWithDue(data) {
+		return axios.get(this.url(`/dashboard/due`))
+			.then(
+				(response) => Promise.resolve(response.data),
+				(err) => Promise.reject(err)
+			)
+			.catch((err) => Promise.reject(err)
+			)
+	}
+
+	findMyAssignedCards(data) {
+		return axios.get(this.url(`/dashboard/assigned`))
+			.then(
+				(response) => Promise.resolve(response.data),
+				(err) => Promise.reject(err)
+			)
+			.catch((err) => Promise.reject(err)
+			)
+	}
+
 }

src/store/dashboard.js

@@ -0,0 +1,63 @@
+/*
+ * @copyright Copyright (c) 2020 Jakob Röhrl <jakob.roehrl@web.de>
+ *
+ * @author Jakob Röhrl <jakob.roehrl@web.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import Vue from 'vue'
+import Vuex from 'vuex'
+import { CardApi } from '../services/CardApi'
+Vue.use(Vuex)
+
+const apiClient = new CardApi()
+export default {
+	state: {
+		withDue: [],
+		assignedCards: [],
+	},
+	getters: {
+		withDueDashboard: state => {
+			return state.withDue
+		},
+		assignedCardsDashboard: state => {
+			return state.assignedCards
+		},
+	},
+	mutations: {
+		setWithDueDashboard(state, withDue) {
+			state.withDue = withDue
+		},
+		setAssignedCards(state, assignedCards) {
+			state.assignedCards = assignedCards
+		},
+
+	},
+	actions: {
+		async loadDashboards({ commit }) {
+			const withDue = await apiClient.findAllWithDue()
+			const withDueFlat = withDue.flat()
+			commit('setWithDueDashboard', withDueFlat)
+
+			const assignedCards = await apiClient.findMyAssignedCards()
+			const assignedCardsFlat = assignedCards.flat()
+			commit('setAssignedCards', assignedCardsFlat)
+			
+		},
+	},
+}

src/store/main.js

@@ -32,6 +32,7 @@ import card from './card'
 import comment from './comment'
 import trashbin from './trashbin'
 import attachment from './attachment'
+import dashboard from './dashboard'
 import debounce from 'lodash/debounce'
 Vue.use(Vuex)
 
@@ -51,6 +52,7 @@ export default new Vuex.Store({
 		comment,
 		trashbin,
 		attachment,
+		dashboard,
 	},
 	strict: debug,
 	state: {