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

NgbDate comparison error

Browse Source
This commit is contained in:
Michael Shamoon 2020-12-12 02:14:15 -08:00
parent 02871e1e22
commit 2a57f9d6e5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts
View File

@ -3,7 +3,7 @@ import { FilterRule } from 'src/app/data/filter-rule';
import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { FilterRuleType, FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
import { ObjectWithId } from 'src/app/data/object-with-id'; import { ObjectWithId } from 'src/app/data/object-with-id';
import { FilterDropdownComponent } from '../filter-dropdown.component' import { FilterDropdownComponent } from '../filter-dropdown.component'
import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
@Component({ @Component({
selector: 'app-filter-dropdown-date', selector: 'app-filter-dropdown-date',
@ -53,10 +53,11 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent {
} }
dateSelected(date:NgbDateStruct) { dateSelected(date:NgbDateStruct) {
let isAfter = this.dateAfter == date let isAfter = NgbDate.from(this.dateAfter).equals(date)
let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1) let filterRuleType = this.filterRuleTypes.find(rt => rt.filtervar.indexOf(isAfter ? 'gt' : 'lt') > -1)
if (filterRuleType) { if (filterRuleType) {
let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,0)}-${date.day.toString().padStart(2,0)}`, type: filterRuleType} let dateFilterRule:FilterRule = {value: `${date.year}-${date.month.toString().padStart(2,'0')}-${date.day.toString().padStart(2,'0')}`, type: filterRuleType}
this.selected.emit(dateFilterRule) this.selected.emit(dateFilterRule)
} }
} }