Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/core/src/api/Api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export interface FilterMatchModeOptions {
readonly DATE_IS_NOT: string;
readonly DATE_BEFORE: string;
readonly DATE_AFTER: string;
readonly DATE_EQUALS_AND_AFTER: string;
readonly DATE_EQUALS_AND_BEFORE: string;
}

export declare const FilterMatchMode: FilterMatchModeOptions;
Expand Down Expand Up @@ -46,6 +48,8 @@ export declare namespace FilterService {
dateIsNot(value: any, filter: string): boolean;
dateBefore(value: any, filter: string): boolean;
dateAfter(value: any, filter: string): boolean;
dateEqualsAndAfter(value: any, filter: string): boolean;
dateEqualsAndBefore(value: any, filter: string): boolean;
}
export function register(rule: string, fn: (...arg: any[]) => boolean): void;
}
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/api/FilterMatchMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ const FilterMatchMode = {
DATE_IS: 'dateIs',
DATE_IS_NOT: 'dateIsNot',
DATE_BEFORE: 'dateBefore',
DATE_AFTER: 'dateAfter'
DATE_AFTER: 'dateAfter',
DATE_EQUALS_AND_AFTER : 'dateEqualsAndAfter',
DATE_EQUALS_AND_BEFORE : 'dateEqualsAndBefore'
};

export default FilterMatchMode;
24 changes: 23 additions & 1 deletion packages/core/src/api/FilterService.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,29 @@ const FilterService = {
}

return value.getTime() > filter.getTime();
}
},
dateEqualsAndAfter: function dateEqualsAndAfter(value, filter) {
if (filter === undefined || filter === null) {
return true;
}

if (value === undefined || value === null) {
return false;
}

return value.getTime() >= filter.getTime();
},
dateEqualsAndBefore: function dateEqualsAndBefore(value, filter) {
if (filter === undefined || filter === null) {
return true;
}

if (value === undefined || value === null) {
return false;
}

return value.getTime() <= filter.getTime();
},
},
register(rule, fn) {
this.filters[rule] = fn;
Expand Down