card dashboard

Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
This commit is contained in:
Jakob Röhrl
2020-05-20 11:18:23 +02:00
committed by Julius Härtl
parent cba260fefd
commit 3c5f68e0c3
13 changed files with 516 additions and 1 deletions

View File

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

View File

@@ -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 {

View File

@@ -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>

View File

@@ -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

View File

@@ -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',

View File

@@ -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)
)
}
}

63
src/store/dashboard.js Normal file
View File

@@ -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)
},
},
}

View File

@@ -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: {