Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
This commit is contained in:
Jakob Röhrl 2020-07-16 12:21:48 +02:00 коммит произвёл Julius Härtl
Родитель 66f6a3e193
Коммит f4a6060a3c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4C614C6ED2CDE6DF
4 изменённых файлов: 11 добавлений и 40 удалений

Просмотреть файл

@ -24,22 +24,17 @@
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;
@ -50,53 +45,32 @@ 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;
}

Просмотреть файл

@ -31,11 +31,10 @@
</div>
<div v-else>
<div v-if="filter=='due'" class="dashboard">
<div class="dashboard-column">
<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" />
</div>
</div>
@ -144,7 +143,6 @@ export default {
...mapGetters([
'withDueDashboard',
'assignedCardsDashboard',
'dueOverdue'
]),
withDueDashboardGroup() {
return this.groupByDue(this.withDueDashboard)
@ -153,14 +151,14 @@ export default {
return this.groupByDue(this.assignedCardsDashboard)
},
},
watch: {
'$route.params.filter'() {
this.getData()
},
},
created() {
this.getData()
},
watch: {
"$route.params.filter"() {
this.getData()
}
},
methods: {
async getData() {
this.loading = true
@ -178,7 +176,6 @@ export default {
this.loading = false
},
groupByDue(dataset) {
const all = {
nodue: [],
@ -193,10 +190,9 @@ export default {
if (card.duedate === null) {
all.nodue.push(card)
} else {
const hours = Math.floor(moment(card.duedate).diff(this.$root.time, 'seconds') / 60 / 60 )
let d = new Date()
let currentHour = d.getHours()
console.log(card.title +' '+ hours )
const hours = Math.floor(moment(card.duedate).diff(this.$root.time, 'seconds') / 60 / 60)
const d = new Date()
const currentHour = d.getHours()
if (hours < 0) {
all.overdue.push(card)
}

Просмотреть файл

@ -194,4 +194,5 @@ export class CardApi {
return Promise.reject(err)
})
}
}

Просмотреть файл

@ -36,7 +36,7 @@ export default {
return state.withDue.filter((card) => {
return card
})
},
withDueDashboard: state => {
return state.withDue