paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed manual date formatting/parsing

Browse Source
This commit is contained in:
jonaswinkler 2020-12-14 22:46:50 +01:00
parent cf619d9d31
commit 45848f5e34
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src-ui/src/app/components/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 { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; import { NgbDateParserFormatter, NgbDateStruct } 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';
@ -21,7 +21,8 @@ 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[] = []
@ -76,7 +77,6 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
debounceTime(400), debounceTime(400),
distinctUntilChanged() distinctUntilChanged()
).subscribe(title => { ).subscribe(title => {
this.setTitleRule(title) this.setTitleRule(title)
}) })
} }
@ -168,38 +168,22 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
get dateCreatedBefore(): NgbDateStruct { get dateCreatedBefore(): NgbDateStruct {
let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE) let createdBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_BEFORE)
return createdBeforeRule ? { return createdBeforeRule ? this.dateParser.parse(createdBeforeRule.value) : null
year: +createdBeforeRule.value.substring(0,4),
month: +createdBeforeRule.value.substring(5,7),
day: +createdBeforeRule.value.substring(8,10)
} : undefined
} }
get dateCreatedAfter(): NgbDateStruct { get dateCreatedAfter(): NgbDateStruct {
let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER) let createdAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_CREATED_AFTER)
return createdAfterRule ? { return createdAfterRule ? this.dateParser.parse(createdAfterRule.value) : null
year: +createdAfterRule.value.substring(0,4),
month: +createdAfterRule.value.substring(5,7),
day: +createdAfterRule.value.substring(8,10)
} : undefined
} }
get dateAddedBefore(): NgbDateStruct { get dateAddedBefore(): NgbDateStruct {
let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE) let addedBeforeRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_BEFORE)
return addedBeforeRule ? { return addedBeforeRule ? this.dateParser.parse(addedBeforeRule.value) : null
year: +addedBeforeRule.value.substring(0,4),
month: +addedBeforeRule.value.substring(5,7),
day: +addedBeforeRule.value.substring(8,10)
} : undefined
} }
get dateAddedAfter(): NgbDateStruct { get dateAddedAfter(): NgbDateStruct {
let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER) let addedAfterRule: FilterRule = this.filterRules.find(fr => fr.rule_type == FILTER_ADDED_AFTER)
return addedAfterRule ? { return addedAfterRule ? this.dateParser.parse(addedAfterRule.value) : null
year: +addedAfterRule.value.substring(0,4),
month: +addedAfterRule.value.substring(5,7),
day: +addedAfterRule.value.substring(8,10)
} : undefined
} }
setDateCreatedBefore(date?: NgbDateStruct) { setDateCreatedBefore(date?: NgbDateStruct) {
@ -225,7 +209,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) { setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) {
let filterRules = this.filterRules let filterRules = this.filterRules
let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID) let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID)
let newValue = `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}` // YYYY-MM-DD let newValue = this.dateParser.format(date)
if (existingRule) { if (existingRule) {
existingRule.value = newValue existingRule.value = newValue