From 2a57f9d6e578dcaa99e55f0e041aa07608600c14 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 12 Dec 2020 02:14:15 -0800 Subject: [PATCH] NgbDate comparison error --- .../filter-dropdown-date/filter-dropdown-date.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts index baadcc4e6..2973a25eb 100644 --- a/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-dropdown/filter-dropdown-date/filter-dropdown-date.component.ts @@ -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 { ObjectWithId } from 'src/app/data/object-with-id'; import { FilterDropdownComponent } from '../filter-dropdown.component' -import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; +import { NgbDate, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'app-filter-dropdown-date', @@ -53,10 +53,11 @@ export class FilterDropdownDateComponent extends FilterDropdownComponent { } 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) 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) } }