paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

typing

Browse Source
This commit is contained in:
jonaswinkler
2020-12-27 13:10:43 +01:00
parent 0ffbae3b62
commit 67df51a910
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts
View File

@@ -1,10 +1,8 @@
import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, Output, ElementRef, ViewChild } from '@angular/core';
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 { FilterPipe } from 'src/app/pipes/filter.pipe'; import { FilterPipe } from 'src/app/pipes/filter.pipe';
import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component'; import { ToggleableItem, ToggleableItemState } from './toggleable-dropdown-button/toggleable-dropdown-button.component';
import { MatchingModel } from 'src/app/data/matching-model';
export enum FilterableDropdownType { export enum FilterableDropdownType {
Filtering = 'filtering', Filtering = 'filtering',
@@ -24,7 +22,7 @@ export class FilterableDropdownComponent {
filterText: string filterText: string
@Input() @Input()
set items(items: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) { set items(items: MatchingModel[]) {
if (items) { if (items) {
this._toggleableItems = items.map(i => { this._toggleableItems = items.map(i => {
return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count} return {item: i, state: ToggleableItemState.NotSelected, count: i.document_count}
@@ -45,13 +43,13 @@ export class FilterableDropdownComponent {
} }
@Input() @Input()
set itemsSelected(itemsSelected: (PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[]) { set itemsSelected(itemsSelected: MatchingModel[]) {
this.toggleableItems.forEach(i => { this.toggleableItems.forEach(i => {
i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected i.state = (itemsSelected.find(is => is.id == i.item.id)) ? ToggleableItemState.Selected : ToggleableItemState.NotSelected
}) })
} }
get itemsSelected() :(PaperlessTag | PaperlessCorrespondent | PaperlessDocumentType)[] { get itemsSelected(): MatchingModel[] {
return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item) return this.toggleableItems.filter(ti => ti.state == ToggleableItemState.Selected).map(ti => ti.item)
} }

6
src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts
View File

@@ -1,10 +1,8 @@
import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
import { PaperlessTag } from 'src/app/data/paperless-tag'; import { MatchingModel } from 'src/app/data/matching-model';
import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
export interface ToggleableItem { export interface ToggleableItem {
item: PaperlessTag | PaperlessDocumentType | PaperlessCorrespondent, item: MatchingModel,
state: ToggleableItemState, state: ToggleableItemState,
count: number count: number
} }

5
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
View File

@@ -4,7 +4,7 @@ import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent';
import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'; import { PaperlessDocumentType } from 'src/app/data/paperless-document-type';
import { Subject, Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import { NgbDateParserFormatter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
import { DocumentTypeService } from 'src/app/services/rest/document-type.service'; import { DocumentTypeService } from 'src/app/services/rest/document-type.service';
import { TagService } from 'src/app/services/rest/tag.service'; import { TagService } from 'src/app/services/rest/tag.service';
import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
@@ -42,8 +42,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
constructor( constructor(
private documentTypeService: DocumentTypeService, private documentTypeService: DocumentTypeService,
private tagService: TagService, private tagService: TagService,
private correspondentService: CorrespondentService, private correspondentService: CorrespondentService
private dateParser: NgbDateParserFormatter
) { } ) { }
tags: PaperlessTag[] = [] tags: PaperlessTag[] = []