committed by
Julius Härtl
parent
66f6a3e193
commit
f4a6060a3c
@@ -24,22 +24,17 @@
|
|||||||
|
|
||||||
namespace OCA\Deck\Service;
|
namespace OCA\Deck\Service;
|
||||||
|
|
||||||
use OCA\Deck\Activity\ActivityManager;
|
|
||||||
use OCA\Deck\Activity\ChangeSet;
|
use OCA\Deck\Activity\ChangeSet;
|
||||||
use OCA\Deck\Db\Acl;
|
use OCA\Deck\Db\Acl;
|
||||||
use OCA\Deck\Db\AclMapper;
|
|
||||||
use OCA\Deck\Db\AssignedUsersMapper;
|
use OCA\Deck\Db\AssignedUsersMapper;
|
||||||
use OCA\Deck\Db\ChangeHelper;
|
|
||||||
use OCA\Deck\Db\IPermissionMapper;
|
use OCA\Deck\Db\IPermissionMapper;
|
||||||
use OCA\Deck\Db\CardMapper;
|
use OCA\Deck\Db\CardMapper;
|
||||||
use OCA\Deck\Db\Label;
|
use OCA\Deck\Db\Label;
|
||||||
use OCA\Deck\Db\Stack;
|
use OCA\Deck\Db\Stack;
|
||||||
use OCA\Deck\Db\StackMapper;
|
|
||||||
use OCA\Deck\NoPermissionException;
|
use OCA\Deck\NoPermissionException;
|
||||||
use OCA\Deck\Notification\NotificationHelper;
|
use OCA\Deck\Notification\NotificationHelper;
|
||||||
use OCP\AppFramework\Db\DoesNotExistException;
|
use OCP\AppFramework\Db\DoesNotExistException;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
use OCP\IL10N;
|
|
||||||
use OCA\Deck\Db\Board;
|
use OCA\Deck\Db\Board;
|
||||||
use OCA\Deck\Db\BoardMapper;
|
use OCA\Deck\Db\BoardMapper;
|
||||||
use OCA\Deck\Db\LabelMapper;
|
use OCA\Deck\Db\LabelMapper;
|
||||||
@@ -50,53 +45,32 @@ use Symfony\Component\EventDispatcher\GenericEvent;
|
|||||||
|
|
||||||
class DashboardService {
|
class DashboardService {
|
||||||
private $boardMapper;
|
private $boardMapper;
|
||||||
private $stackMapper;
|
|
||||||
private $labelMapper;
|
private $labelMapper;
|
||||||
private $aclMapper;
|
|
||||||
private $cardMapper;
|
private $cardMapper;
|
||||||
private $l10n;
|
|
||||||
private $permissionService;
|
|
||||||
private $notificationHelper;
|
|
||||||
private $assignedUsersMapper;
|
private $assignedUsersMapper;
|
||||||
private $userManager;
|
private $userManager;
|
||||||
private $groupManager;
|
private $groupManager;
|
||||||
private $userId;
|
private $userId;
|
||||||
private $activityManager;
|
|
||||||
/** @var EventDispatcherInterface */
|
/** @var EventDispatcherInterface */
|
||||||
private $eventDispatcher;
|
private $eventDispatcher;
|
||||||
private $changeHelper;
|
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
BoardMapper $boardMapper,
|
BoardMapper $boardMapper,
|
||||||
StackMapper $stackMapper,
|
|
||||||
IL10N $l10n,
|
|
||||||
LabelMapper $labelMapper,
|
LabelMapper $labelMapper,
|
||||||
AclMapper $aclMapper,
|
|
||||||
CardMapper $cardMapper,
|
CardMapper $cardMapper,
|
||||||
PermissionService $permissionService,
|
|
||||||
NotificationHelper $notificationHelper,
|
|
||||||
AssignedUsersMapper $assignedUsersMapper,
|
AssignedUsersMapper $assignedUsersMapper,
|
||||||
IUserManager $userManager,
|
IUserManager $userManager,
|
||||||
IGroupManager $groupManager,
|
IGroupManager $groupManager,
|
||||||
ActivityManager $activityManager,
|
|
||||||
EventDispatcherInterface $eventDispatcher,
|
EventDispatcherInterface $eventDispatcher,
|
||||||
ChangeHelper $changeHelper,
|
|
||||||
$userId
|
$userId
|
||||||
) {
|
) {
|
||||||
$this->boardMapper = $boardMapper;
|
$this->boardMapper = $boardMapper;
|
||||||
$this->stackMapper = $stackMapper;
|
|
||||||
$this->labelMapper = $labelMapper;
|
$this->labelMapper = $labelMapper;
|
||||||
$this->aclMapper = $aclMapper;
|
|
||||||
$this->cardMapper = $cardMapper;
|
$this->cardMapper = $cardMapper;
|
||||||
$this->l10n = $l10n;
|
|
||||||
$this->permissionService = $permissionService;
|
|
||||||
$this->notificationHelper = $notificationHelper;
|
|
||||||
$this->assignedUsersMapper = $assignedUsersMapper;
|
$this->assignedUsersMapper = $assignedUsersMapper;
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
$this->groupManager = $groupManager;
|
$this->groupManager = $groupManager;
|
||||||
$this->activityManager = $activityManager;
|
|
||||||
$this->eventDispatcher = $eventDispatcher;
|
$this->eventDispatcher = $eventDispatcher;
|
||||||
$this->changeHelper = $changeHelper;
|
|
||||||
$this->userId = $userId;
|
$this->userId = $userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,11 +31,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-else>
|
<div v-else>
|
||||||
|
|
||||||
<div v-if="filter=='due'" class="dashboard">
|
<div v-if="filter=='due'" class="dashboard">
|
||||||
<div class="dashboard-column">
|
<div class="dashboard-column">
|
||||||
<h2>{{ t('deck', 'overdue') }}</h2>
|
<h2>{{ t('deck', 'overdue') }}</h2>
|
||||||
<div v-for="card in dueOverdue" :key="card.id">
|
<div v-for="card in withDueDashboardGroup.overdue" :key="card.id">
|
||||||
<CardItem :item="card" />
|
<CardItem :item="card" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -144,7 +143,6 @@ export default {
|
|||||||
...mapGetters([
|
...mapGetters([
|
||||||
'withDueDashboard',
|
'withDueDashboard',
|
||||||
'assignedCardsDashboard',
|
'assignedCardsDashboard',
|
||||||
'dueOverdue'
|
|
||||||
]),
|
]),
|
||||||
withDueDashboardGroup() {
|
withDueDashboardGroup() {
|
||||||
return this.groupByDue(this.withDueDashboard)
|
return this.groupByDue(this.withDueDashboard)
|
||||||
@@ -153,14 +151,14 @@ export default {
|
|||||||
return this.groupByDue(this.assignedCardsDashboard)
|
return this.groupByDue(this.assignedCardsDashboard)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
'$route.params.filter'() {
|
||||||
|
this.getData()
|
||||||
|
},
|
||||||
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getData()
|
this.getData()
|
||||||
},
|
},
|
||||||
watch: {
|
|
||||||
"$route.params.filter"() {
|
|
||||||
this.getData()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
async getData() {
|
async getData() {
|
||||||
this.loading = true
|
this.loading = true
|
||||||
@@ -178,7 +176,6 @@ export default {
|
|||||||
this.loading = false
|
this.loading = false
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
groupByDue(dataset) {
|
groupByDue(dataset) {
|
||||||
const all = {
|
const all = {
|
||||||
nodue: [],
|
nodue: [],
|
||||||
@@ -193,10 +190,9 @@ export default {
|
|||||||
if (card.duedate === null) {
|
if (card.duedate === null) {
|
||||||
all.nodue.push(card)
|
all.nodue.push(card)
|
||||||
} else {
|
} else {
|
||||||
const hours = Math.floor(moment(card.duedate).diff(this.$root.time, 'seconds') / 60 / 60 )
|
const hours = Math.floor(moment(card.duedate).diff(this.$root.time, 'seconds') / 60 / 60)
|
||||||
let d = new Date()
|
const d = new Date()
|
||||||
let currentHour = d.getHours()
|
const currentHour = d.getHours()
|
||||||
console.log(card.title +' '+ hours )
|
|
||||||
if (hours < 0) {
|
if (hours < 0) {
|
||||||
all.overdue.push(card)
|
all.overdue.push(card)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -194,4 +194,5 @@ export class CardApi {
|
|||||||
return Promise.reject(err)
|
return Promise.reject(err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export default {
|
|||||||
return state.withDue.filter((card) => {
|
return state.withDue.filter((card) => {
|
||||||
return card
|
return card
|
||||||
})
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
withDueDashboard: state => {
|
withDueDashboard: state => {
|
||||||
return state.withDue
|
return state.withDue
|
||||||
|
|||||||
Reference in New Issue
Block a user