paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-07-28 18:24:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

some refactoring.

Browse Source
This commit is contained in:
jonaswinkler
2020-12-14 11:22:24 +01:00
parent 98ab79ad5a
commit 02c1d496d6
3 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src-ui/src/app/services/filter-editor-view.service.ts
View File

@@ -16,9 +16,6 @@ import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
providedIn: 'root'
})
export class FilterEditorViewService {
private tags$: Observable<Results<PaperlessTag>>
private correspondents$: Observable<Results<PaperlessCorrespondent>>
private documentTypes$: Observable<Results<PaperlessDocumentType>>
tags: PaperlessTag[] = []
correspondents: PaperlessCorrespondent[]
@@ -27,12 +24,9 @@ export class FilterEditorViewService {
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)
this.tagService.listAll().subscribe(result => this.tags = result.results)
this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
}
clear() {
@@ -43,22 +37,19 @@ export class FilterEditorViewService {
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 && (!text || text.length == 0)) {
filterRules.splice(filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
} else 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})
set titleFilter(title: string) {
let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
if (!existingRule && title) {
this.filterRules.push({type: FILTER_RULE_TYPES.find(t => t.id == FILTER_TITLE), value: title})
} else if (existingRule && !title) {
this.filterRules.splice(this.filterRules.findIndex(rule => rule.type.id == FILTER_TITLE), 1)
} else if (existingRule && title) {
existingRule.value = title
}
this.filterRules = filterRules
}
get filterText(): string {
get titleFilter(): string {
let existingRule = this.filterRules.find(rule => rule.type.id == FILTER_TITLE)
return existingRule ? existingRule.value : ''
}