Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-24 03:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix for Due Cards and some cleanup

Browse source
This commit is contained in:
John R. Supplee 2021-03-11 02:05:46 +02:00
parent 06cae36199
commit 07aa20a3cd
4 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/components/main/dueCards.js
View file

@ -1,4 +1,12 @@
import { CardSearchPagedComponent } from '../../lib/cardSearch';
import {
OPERATOR_HAS,
OPERATOR_SORT,
OPERATOR_USER,
ORDER_DESCENDING,
PREDICATE_DUE_AT,
} from '../../../config/search-const';
import { QueryParams } from '../../../config/query-classes';
// const subManager = new SubsManager();
@ -46,18 +54,22 @@ class DueCardsComponent extends CardSearchPagedComponent {
onCreated() {
super.onCreated();
const queryParams = {
has: [{ field: 'dueAt', exists: true }],
limit: 5,
skip: 0,
sort: { name: 'dueAt', order: 'des' },
};
const queryParams = new QueryParams();
queryParams.addPredicate(OPERATOR_HAS, {
field: PREDICATE_DUE_AT,
exists: true,
});
// queryParams[OPERATOR_LIMIT] = 5;
queryParams.addPredicate(OPERATOR_SORT, {
name: PREDICATE_DUE_AT,
order: ORDER_DESCENDING,
});
if (Utils.dueCardsView() !== 'all') {
queryParams.users = [Meteor.user().username];
queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
}
this.runGlobalSearch(queryParams);
this.runGlobalSearch(queryParams.getParams());
}
dueCardsView() {

16
client/components/main/myCards.js
View file

@ -1,6 +1,12 @@
import { CardSearchPagedComponent } from '../../lib/cardSearch';
import {QueryParams} from "../../../config/query-classes";
import {OPERATOR_SORT, OPERATOR_USER} from "../../../config/search-const";
import { QueryParams } from '../../../config/query-classes';
import {
OPERATOR_LIMIT,
OPERATOR_SORT,
OPERATOR_USER,
ORDER_DESCENDING,
PREDICATE_DUE_AT,
} from '../../../config/search-const';
// const subManager = new SubsManager();
@ -52,7 +58,11 @@ class MyCardsComponent extends CardSearchPagedComponent {
const queryParams = new QueryParams();
queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
queryParams.addPredicate(OPERATOR_SORT, { name: 'dueAt', order: 'des' });
queryParams.addPredicate(OPERATOR_SORT, {
name: PREDICATE_DUE_AT,
order: ORDER_DESCENDING,
});
queryParams.addPredicate(OPERATOR_LIMIT, 100);
this.runGlobalSearch(queryParams);
Meteor.subscribe('setting');

3
client/lib/cardSearch.js
View file

@ -1,3 +1,6 @@
import Cards from '../../models/cards';
import SessionData from '../../models/usersessiondata';
export class CardSearchPagedComponent extends BlazeComponent {
onCreated() {
this.searching = new ReactiveVar(false);

4
config/query-classes.js
View file

@ -193,6 +193,10 @@ export class Query {
return this.queryParams.getParams();
}
addPredicate(operator, predicate) {
this.queryParams.addPredicate(operator, predicate);
}
buildParams(queryText) {
queryText = queryText.trim();
// eslint-disable-next-line no-console