From 8091a41cc22ff6ece7e8d41db38a0176f1216994 Mon Sep 17 00:00:00 2001 From: josee666 Date: Thu, 30 Apr 2020 14:44:36 -0400 Subject: [PATCH] fix(TimeFilter): calendar year range, don't reset year range in UI (igo2 #359) (#619) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(timeFilter) bug #359 * fix(time-filter-form) withdraw comment Co-authored-by: Josée Martel --- .../time-filter-form.component.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts index ebe7e56a4..d0dd13d9e 100644 --- a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts +++ b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts @@ -127,6 +127,7 @@ export class TimeFilterFormComponent implements OnInit { constructor() {} ngOnInit() { + if (this.startDate === undefined) { const utcmin = new Date(this.min); this.startDate = new Date( @@ -189,9 +190,24 @@ export class TimeFilterFormComponent implements OnInit { } else { this.year = new Date(this.min).getFullYear() + 1; } - } else { - // TODO: FIX THIS for ALL OTHER TYPES STYLES OR RANGE. + + } else if (this.isRange && this.style === TimeFilterStyle.CALENDAR && this.type === TimeFilterType.YEAR) { + if (timeFromWms) { + this.startYear = parseInt(timeFromWms.substr(0, 4), 10); + this.endYear = parseInt(timeFromWms.substr(5, 4), 10); + const newStartListYears: any[] = []; + const newEndListYears: any[] = []; + for (let i = this.initStartYear; i < this.endYear; i++) { + newStartListYears.push(i); + } + for (let i = this.startYear + 1; i <= this.initEndYear; i++) { + newEndListYears.push(i); + } + this.startListYears = newStartListYears; + this.endListYears = newEndListYears; + } } + // TODO: FIX THIS for ALL OTHER TYPES STYLES OR RANGE. } handleDateChange(event: any) {