-
+
@@ -81,7 +73,7 @@
@@ -101,16 +93,16 @@
- {{(d.correspondent$ | async)?.name}}
+ {{(d.correspondent$ | async)?.name}}
|
{{d.title | documentTitle}}
-
+
|
- {{(d.document_type$ | async)?.name}}
+ {{(d.document_type$ | async)?.name}}
|
@@ -125,5 +117,5 @@
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 09e73dd96..8d090f001 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -6,11 +6,16 @@ import { cloneFilterRules, FilterRule } from 'src/app/data/filter-rule';
import { FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
import { SavedViewConfig } from 'src/app/data/saved-view-config';
import { DocumentListViewService } from 'src/app/services/document-list-view.service';
+import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service';
import { DOCUMENT_SORT_FIELDS } from 'src/app/services/rest/document.service';
import { SavedViewConfigService } from 'src/app/services/saved-view-config.service';
import { Toast, ToastService } from 'src/app/services/toast.service';
import { environment } from 'src/environments/environment';
import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component';
+import { FilterEditorComponent } from 'src/app/components/filter-editor/filter-editor.component';
+import { PaperlessTag } from 'src/app/data/paperless-tag';
+import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
+import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
@Component({
selector: 'app-document-list',
@@ -22,6 +27,7 @@ export class DocumentListComponent implements OnInit {
constructor(
public list: DocumentListViewService,
public savedViewConfigService: SavedViewConfigService,
+ public filterEditorService: FilterEditorViewService,
public route: ActivatedRoute,
private toastService: ToastService,
public modalService: NgbModal,
@@ -29,13 +35,18 @@ export class DocumentListComponent implements OnInit {
displayMode = 'smallCards' // largeCards, smallCards, details
- filterRules: FilterRule[] = []
- showFilter = false
-
get isFiltered() {
return this.list.filterRules?.length > 0
}
+ set filterRules(filterRules: FilterRule[]) {
+ this.filterEditorService.filterRules = filterRules
+ }
+
+ get filterRules(): FilterRule[] {
+ return this.filterEditorService.filterRules
+ }
+
getTitle() {
return this.list.savedViewTitle || "Documents"
}
@@ -55,31 +66,29 @@ export class DocumentListComponent implements OnInit {
this.route.paramMap.subscribe(params => {
if (params.has('id')) {
this.list.savedView = this.savedViewConfigService.getConfig(params.get('id'))
- this.filterRules = this.list.filterRules
- this.showFilter = false
+ this.filterEditorService.filterRules = this.list.filterRules
this.titleService.setTitle(`${this.list.savedView.title} - ${environment.appTitle}`)
} else {
this.list.savedView = null
- this.filterRules = this.list.filterRules
- this.showFilter = this.filterRules.length > 0
+ this.filterEditorService.filterRules = this.list.filterRules
this.titleService.setTitle(`Documents - ${environment.appTitle}`)
}
this.list.clear()
this.list.reload()
})
+ this.filterEditorService.filterRules = this.list.filterRules
}
applyFilterRules() {
- this.list.filterRules = this.filterRules
+ this.list.filterRules = this.filterEditorService.filterRules
}
clearFilterRules() {
- this.list.filterRules = this.filterRules
- this.showFilter = false
+ this.list.filterRules = this.filterEditorService.filterRules
}
loadViewConfig(config: SavedViewConfig) {
- this.filterRules = cloneFilterRules(config.filterRules)
+ this.filterEditorService.filterRules = cloneFilterRules(config.filterRules)
this.list.load(config)
}
@@ -103,42 +112,18 @@ export class DocumentListComponent implements OnInit {
})
}
- filterByTag(tag_id: number) {
- let filterRules = this.list.filterRules
- if (filterRules.find(rule => rule.type.id == FILTER_HAS_TAG && rule.value == tag_id)) {
- return
- }
-
- filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_HAS_TAG), value: tag_id})
- this.filterRules = filterRules
+ clickTag(tagID: number) {
+ this.filterEditorService.toggleFilterByTag(tagID)
this.applyFilterRules()
}
- filterByCorrespondent(correspondent_id: number) {
- let filterRules = this.list.filterRules
- let existing_rule = filterRules.find(rule => rule.type.id == FILTER_CORRESPONDENT)
- if (existing_rule && existing_rule.value == correspondent_id) {
- return
- } else if (existing_rule) {
- existing_rule.value = correspondent_id
- } else {
- filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_CORRESPONDENT), value: correspondent_id})
- }
- this.filterRules = filterRules
+ clickCorrespondent(correspondentID: number) {
+ this.filterEditorService.toggleFilterByCorrespondent(correspondentID)
this.applyFilterRules()
}
- filterByDocumentType(document_type_id: number) {
- let filterRules = this.list.filterRules
- let existing_rule = filterRules.find(rule => rule.type.id == FILTER_DOCUMENT_TYPE)
- if (existing_rule && existing_rule.value == document_type_id) {
- return
- } else if (existing_rule) {
- existing_rule.value = document_type_id
- } else {
- filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_DOCUMENT_TYPE), value: document_type_id})
- }
- this.filterRules = filterRules
+ clickDocumentType(documentTypeID: number) {
+ this.filterEditorService.toggleFilterByDocumentType(documentTypeID)
this.applyFilterRules()
}
diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
new file mode 100644
index 000000000..c4befd701
--- /dev/null
+++ b/src-ui/src/app/components/filter-editor/filter-dropdown-date/filter-dropdown-date.component.html
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{rule.type.name}}
+
-
-
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/filter-editor/filter-editor.component.scss
index e69de29bb..05df7b213 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.scss
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.scss
@@ -0,0 +1,10 @@
+.quick-filter {
+ min-width: 250px;
+ max-height: 400px;
+ overflow-y: scroll;
+
+ .selected-icon {
+ min-width: 1em;
+ min-height: 1em;
+ }
+}
diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
index b04127287..a6940795e 100644
--- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts
@@ -1,67 +1,88 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FilterRule } from 'src/app/data/filter-rule';
-import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
+import { Component, EventEmitter, Input, Output, ElementRef, AfterViewInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterEditorViewService } from 'src/app/services/filter-editor-view.service'
+import { PaperlessTag } from 'src/app/data/paperless-tag';
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
-import { PaperlessTag } from 'src/app/data/paperless-tag';
-import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
-import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
-import { TagService } from 'src/app/services/rest/tag.service';
-
+import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
+import { FilterDropdownDateComponent } from './filter-dropdown-date/filter-dropdown-date.component'
+import { fromEvent } from 'rxjs';
+import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
@Component({
selector: 'app-filter-editor',
templateUrl: './filter-editor.component.html',
styleUrls: ['./filter-editor.component.scss']
})
-export class FilterEditorComponent implements OnInit {
+export class FilterEditorComponent implements AfterViewInit {
- constructor(private documentTypeService: DocumentTypeService, private tagService: TagService, private correspondentService: CorrespondentService) { }
+ constructor() { }
+
+ @Input()
+ filterEditorService: FilterEditorViewService
@Output()
clear = new EventEmitter()
- @Input()
- filterRules: FilterRule[] = []
-
@Output()
apply = new EventEmitter()
- selectedRuleType: FilterRuleType = FILTER_RULE_TYPES[0]
+ @ViewChild('filterTextInput') filterTextInput: ElementRef;
- correspondents: PaperlessCorrespondent[] = []
- tags: PaperlessTag[] = []
- documentTypes: PaperlessDocumentType[] = []
-
- newRuleClicked() {
- this.filterRules.push({type: this.selectedRuleType, value: this.selectedRuleType.default})
- this.selectedRuleType = this.getRuleTypes().length > 0 ? this.getRuleTypes()[0] : null
+ ngAfterViewInit() {
+ fromEvent(this.filterTextInput.nativeElement,'keyup').pipe(
+ debounceTime(150),
+ distinctUntilChanged(),
+ tap()
+ ).subscribe((event: Event) => {
+ this.filterEditorService.filterText = (event.target as HTMLInputElement).value
+ this.applyFilters()
+ })
}
- removeRuleClicked(rule) {
- let index = this.filterRules.findIndex(r => r == rule)
- if (index > -1) {
- this.filterRules.splice(index, 1)
- }
- }
-
- applyClicked() {
+ applyFilters() {
this.apply.next()
}
- clearClicked() {
- this.filterRules.splice(0,this.filterRules.length)
+ clearSelected() {
+ this.filterEditorService.clear()
this.clear.next()
}
- ngOnInit(): void {
- this.correspondentService.listAll().subscribe(result => {this.correspondents = result.results})
- this.tagService.listAll().subscribe(result => this.tags = result.results)
- this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
+ onToggleTag(tag: PaperlessTag) {
+ this.filterEditorService.toggleFilterByTag(tag)
+ this.applyFilters()
}
- getRuleTypes() {
- return FILTER_RULE_TYPES.filter(rt => rt.multi || !this.filterRules.find(r => r.type == rt))
+ onToggleCorrespondent(correspondent: PaperlessCorrespondent) {
+ this.filterEditorService.toggleFilterByCorrespondent(correspondent)
+ this.applyFilters()
}
+ onToggleDocumentType(documentType: PaperlessDocumentType) {
+ this.filterEditorService.toggleFilterByDocumentType(documentType)
+ this.applyFilters()
+ }
+
+ onDateCreatedBeforeSet(date: NgbDateStruct) {
+ this.filterEditorService.setDateCreatedBefore(date)
+ this.applyFilters()
+ }
+
+ onDateCreatedAfterSet(date: NgbDateStruct) {
+ this.filterEditorService.setDateCreatedAfter(date)
+ this.applyFilters()
+ }
+
+ onDateAddedBeforeSet(date: NgbDateStruct) {
+ this.filterEditorService.setDateAddedBefore(date)
+ this.applyFilters()
+ }
+
+ onDateAddedAfterSet(date: NgbDateStruct) {
+ this.filterEditorService.setDateAddedAfter(date)
+ this.applyFilters()
+ }
}
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index a35759f69..ea8e60eee 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -22,15 +22,15 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
{id: FILTER_TITLE, name: "Title contains", filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
{id: FILTER_CONTENT, name: "Content contains", filtervar: "content__icontains", datatype: "string", multi: false, default: ""},
-
+
{id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
-
+
{id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false},
{id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false},
- {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
- {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
- {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
+ {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
+ {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
+ {id: FILTER_DOES_NOT_HAVE_TAG, name: "Does not have tag", filtervar: "tags__id__none", datatype: "tag", multi: true},
{id: FILTER_HAS_ANY_TAG, name: "Has any tag", filtervar: "is_tagged", datatype: "boolean", multi: false, default: true},
{id: FILTER_CREATED_BEFORE, name: "Created before", filtervar: "created__date__lt", datatype: "date", multi: false},
@@ -42,7 +42,7 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
{id: FILTER_ADDED_BEFORE, name: "Added before", filtervar: "added__date__lt", datatype: "date", multi: false},
{id: FILTER_ADDED_AFTER, name: "Added after", filtervar: "added__date__gt", datatype: "date", multi: false},
-
+
{id: FILTER_MODIFIED_BEFORE, name: "Modified before", filtervar: "modified__date__lt", datatype: "date", multi: false},
{id: FILTER_MODIFIED_AFTER, name: "Modified after", filtervar: "modified__date__gt", datatype: "date", multi: false},
]
@@ -54,4 +54,4 @@ export interface FilterRuleType {
datatype: string //number, string, boolean, date
multi: boolean
default?: any
-}
\ No newline at end of file
+}
diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts
new file mode 100644
index 000000000..f799f40cc
--- /dev/null
+++ b/src-ui/src/app/pipes/filter.pipe.ts
@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'filter'
+})
+export class FilterPipe implements PipeTransform {
+ transform(items: any[], searchText: string): any[] {
+ if (!items) return [];
+ if (!searchText) return items;
+
+ return items.filter(item => {
+ return Object.keys(item).some(key => {
+ return String(item[key]).toLowerCase().includes(searchText.toLowerCase());
+ });
+ });
+ }
+}
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 811ac3c4b..8692ed1c0 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -9,7 +9,7 @@ import { DocumentService } from './rest/document.service';
/**
* This service manages the document list which is displayed using the document list view.
- *
+ *
* This service also serves saved views by transparently switching between the document list
* and saved views on request. See below.
*/
@@ -25,7 +25,7 @@ export class DocumentListViewService {
currentPage = 1
currentPageSize: number = +localStorage.getItem(GENERAL_SETTINGS.DOCUMENT_LIST_SIZE) || GENERAL_SETTINGS.DOCUMENT_LIST_SIZE_DEFAULT
collectionSize: number
-
+
/**
* This is the current config for the document list. The service will always remember the last settings used for the document list.
*/
@@ -192,7 +192,7 @@ export class DocumentListViewService {
}
}
- constructor(private documentService: DocumentService) {
+ constructor(private documentService: DocumentService) {
let documentListViewConfigJson = sessionStorage.getItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
if (documentListViewConfigJson) {
try {
diff --git a/src-ui/src/app/services/filter-editor-view.service.spec.ts b/src-ui/src/app/services/filter-editor-view.service.spec.ts
new file mode 100644
index 000000000..8051bcf0d
--- /dev/null
+++ b/src-ui/src/app/services/filter-editor-view.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FilterEditorViewService } from './filter-editor-view.service';
+
+describe('FilterEditorViewService', () => {
+ let service: FilterEditorViewService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(FilterEditorViewService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src-ui/src/app/services/filter-editor-view.service.ts b/src-ui/src/app/services/filter-editor-view.service.ts
new file mode 100644
index 000000000..89f40189c
--- /dev/null
+++ b/src-ui/src/app/services/filter-editor-view.service.ts
@@ -0,0 +1,189 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { TagService } from 'src/app/services/rest/tag.service';
+import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
+import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
+import { ObjectWithId } from 'src/app/data/object-with-id';
+import { FilterRule } from 'src/app/data/filter-rule';
+import { FilterRuleType, FILTER_RULE_TYPES, FILTER_CORRESPONDENT, FILTER_DOCUMENT_TYPE, FILTER_HAS_TAG, FILTER_TITLE, FILTER_ADDED_BEFORE, FILTER_ADDED_AFTER, FILTER_CREATED_BEFORE, FILTER_CREATED_AFTER, FILTER_CREATED_YEAR, FILTER_CREATED_MONTH, FILTER_CREATED_DAY } from 'src/app/data/filter-rule-type';
+import { Results } from 'src/app/data/results'
+import { PaperlessTag } from 'src/app/data/paperless-tag';
+import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
+import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
+import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FilterEditorViewService {
+ private tags$: Observable >
+ private correspondents$: Observable>
+ private documentTypes$: Observable>
+
+ tags: PaperlessTag[] = []
+ correspondents: PaperlessCorrespondent[]
+ documentTypes: PaperlessDocumentType[] = []
+
+ filterRules: FilterRule[] = []
+
+ constructor(private tagService: TagService, private documentTypeService: DocumentTypeService, private correspondentService: CorrespondentService) {
+ this.tags$ = this.tagService.listAll()
+ this.tags$.subscribe(result => this.tags = result.results)
+ this.correspondents$ = this.correspondentService.listAll()
+ this.correspondents$.subscribe(result => this.correspondents = result.results)
+ this.documentTypes$ = this.documentTypeService.listAll()
+ this.documentTypes$.subscribe(result => this.documentTypes = result.results)
+ }
+
+ clear() {
+ this.filterRules = []
+ }
+
+ hasFilters() {
+ return this.filterRules.length > 0
+ }
+
+ set filterText(text: string) {
+ let filterRules = this.filterRules
+ let existingRule = filterRules.find(rule => rule.type.id == FILTER_TITLE)
+ if (existingRule && existingRule.value == text) {
+ return
+ } else if (existingRule) {
+ existingRule.value = text
+ } else {
+ filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: text})
+ }
+ this.filterRules = filterRules
+ }
+
+ get filterText(): string {
+ let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
+ return existingRule ? existingRule.value : ''
+ }
+
+ get selectedTags(): PaperlessTag[] {
+ let tagRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_HAS_TAG)
+ return this.tags?.filter(t => tagRules.find(tr => tr.value == t.id))
+ }
+
+ get selectedCorrespondents(): PaperlessCorrespondent[] {
+ let correspondentRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_CORRESPONDENT)
+ return this.correspondents?.filter(c => correspondentRules.find(cr => cr.value == c.id))
+ }
+
+ get selectedDocumentTypes(): PaperlessDocumentType[] {
+ let documentTypeRules: FilterRule[] = this.filterRules.filter(fr => fr.type.id == FILTER_DOCUMENT_TYPE)
+ return this.documentTypes?.filter(dt => documentTypeRules.find(dtr => dtr.value == dt.id))
+ }
+
+ toggleFilterByTag(tag: PaperlessTag | number) {
+ if (typeof tag == 'number') tag = this.tags?.find(t => t.id == tag)
+ this.toggleFilterByItem(tag, FILTER_HAS_TAG)
+ }
+
+ toggleFilterByCorrespondent(correspondent: PaperlessCorrespondent | number) {
+ if (typeof correspondent == 'number') correspondent = this.correspondents?.find(t => t.id == correspondent)
+ this.toggleFilterByItem(correspondent, FILTER_CORRESPONDENT)
+ }
+
+ toggleFilterByDocumentType(documentType: PaperlessDocumentType | number) {
+ if (typeof documentType == 'number') documentType = this.documentTypes?.find(t => t.id == documentType)
+ this.toggleFilterByItem(documentType, FILTER_DOCUMENT_TYPE)
+ }
+
+ private toggleFilterByItem(item: ObjectWithId, filterRuleTypeID: number) {
+ let filterRules = this.filterRules
+ let filterRuleType: FilterRuleType = FILTER_RULE_TYPES.find(t => t.id == filterRuleTypeID)
+ let existingRules = filterRules.filter(rule => rule.type.id == filterRuleType.id)
+ let existingItemRule = existingRules?.find(rule => rule.value == item.id)
+
+ if (existingRules && existingItemRule) { // if exact rule exists just remove
+ filterRules.splice(filterRules.indexOf(existingItemRule), 1)
+ } else if (existingRules.length > 0 && filterRuleType.multi) { // e.g. tags can have multiple
+ filterRules.push({type: filterRuleType, value: item.id})
+ } else if (existingRules.length > 0) { // correspondents & documentTypes can only be one
+ filterRules.find(rule => rule.type.id == filterRuleType.id).value = item.id
+ } else {
+ filterRules.push({type: filterRuleType, value: item.id})
+ }
+
+ this.filterRules = filterRules
+ }
+
+ get dateCreatedBefore(): NgbDateStruct {
+ let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_BEFORE)
+ return createdBeforeRule ? {
+ year: createdBeforeRule.value.substring(0,4),
+ month: createdBeforeRule.value.substring(5,7),
+ day: createdBeforeRule.value.substring(8,10)
+ } : undefined
+ }
+
+ get dateCreatedAfter(): NgbDateStruct {
+ let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_CREATED_AFTER)
+ return createdAfterRule ? {
+ year: createdAfterRule.value.substring(0,4),
+ month: createdAfterRule.value.substring(5,7),
+ day: createdAfterRule.value.substring(8,10)
+ } : undefined
+ }
+
+ get dateAddedBefore(): NgbDateStruct {
+ let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_BEFORE)
+ return addedBeforeRule ? {
+ year: addedBeforeRule.value.substring(0,4),
+ month: addedBeforeRule.value.substring(5,7),
+ day: addedBeforeRule.value.substring(8,10)
+ } : undefined
+ }
+
+ get dateAddedAfter(): NgbDateStruct {
+ let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.type.id == FILTER_ADDED_AFTER)
+ return addedAfterRule ? {
+ year: addedAfterRule.value.substring(0,4),
+ month: addedAfterRule.value.substring(5,7),
+ day: addedAfterRule.value.substring(8,10)
+ } : undefined
+ }
+
+ setDateCreatedBefore(date?: NgbDateStruct) {
+ if (date) this.setDateFilter(date, FILTER_CREATED_BEFORE)
+ else this.clearDateFilter(FILTER_CREATED_BEFORE)
+ }
+
+ setDateCreatedAfter(date?: NgbDateStruct) {
+ if (date) this.setDateFilter(date, FILTER_CREATED_AFTER)
+ else this.clearDateFilter(FILTER_CREATED_AFTER)
+ }
+
+ setDateAddedBefore(date?: NgbDateStruct) {
+ if (date) this.setDateFilter(date, FILTER_ADDED_BEFORE)
+ else this.clearDateFilter(FILTER_ADDED_BEFORE)
+ }
+
+ setDateAddedAfter(date?: NgbDateStruct) {
+ if (date) this.setDateFilter(date, FILTER_ADDED_AFTER)
+ else this.clearDateFilter(FILTER_ADDED_AFTER)
+ }
+
+ setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
+ let filterRules = this.filterRules
+ let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+ let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD
+
+ if (existingRule) {
+ existingRule.value = newValue
+ } else {
+ filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == dateRuleTypeID), value: newValue})
+ }
+
+ this.filterRules = filterRules
+ }
+
+ clearDateFilter(dateRuleTypeID: number) {
+ let filterRules = this.filterRules
+ let existingRule = filterRules.find(rule => rule.type.id == dateRuleTypeID)
+ filterRules.splice(filterRules.indexOf(existingRule), 1)
+ this.filterRules = filterRules
+ }
+}
|