From 590fe2d30571b8696473eedc35c2a593ca0072b1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 17 Mar 2021 17:05:59 -0400 Subject: [PATCH] LP1904036 Date util class Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- .../src/app/share/date-select/date-select.component.ts | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.ts b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.ts index b66a26188e..bd6e681753 100644 --- a/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.ts +++ b/Open-ILS/src/eg2/src/app/share/date-select/date-select.component.ts @@ -1,6 +1,7 @@ import {Component, OnInit, Input, Output, ViewChild, EventEmitter, forwardRef} from '@angular/core'; import {NgbDateStruct} from '@ng-bootstrap/ng-bootstrap'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms'; +import {DateUtil} from '@eg/share/util/date'; /** * RE: displaying locale dates in the input field: @@ -46,7 +47,7 @@ export class DateSelectComponent implements OnInit, ControlValueAccessor { if (this.current == null) { return null; } if (!this.isValidDate(this.current)) { return null; } const ymd = `${this.current.year}-${String(this.current.month).padStart(2, '0')}-${String(this.current.day).padStart(2, '0')}`; - const date = this.localDateFromYmd(ymd); + const date = DateUtil.localDateFromYmd(ymd); const iso = date.toISOString(); return iso; } @@ -54,7 +55,7 @@ export class DateSelectComponent implements OnInit, ControlValueAccessor { if (this.current == null) { return null; } if (!this.isValidDate(this.current)) { return null; } const ymd = `${this.current.year}-${String(this.current.month).padStart(2, '0')}-${String(this.current.day).padStart(2, '0')}`; - const date = this.localDateFromYmd(ymd); + const date = DateUtil.localDateFromYmd(ymd); return date; } @@ -72,7 +73,7 @@ export class DateSelectComponent implements OnInit, ControlValueAccessor { ngOnInit() { if (this.initialYmd) { - this.initialDate = this.localDateFromYmd(this.initialYmd); + this.initialDate = DateUtil.localDateFromYmd(this.initialYmd); } else if (this.initialIso) { this.initialDate = new Date(this.initialIso); @@ -99,7 +100,7 @@ export class DateSelectComponent implements OnInit, ControlValueAccessor { onDateSelect(evt) { const ymd = `${evt.year}-${String(evt.month).padStart(2, '0')}-${String(evt.day).padStart(2, '0')}`; - const date = this.localDateFromYmd(ymd); + const date = DateUtil.localDateFromYmd(ymd); const iso = date.toISOString(); this.onChangeAsDate.emit(date); this.onChangeAsYmd.emit(ymd); @@ -107,14 +108,6 @@ export class DateSelectComponent implements OnInit, ControlValueAccessor { this.propagateChange(date); } - // Create a date in the local time zone with selected YMD values. - // TODO: Consider moving this to a date service... - localDateFromYmd(ymd: string): Date { - const parts = ymd.split('-'); - return new Date( - Number(parts[0]), Number(parts[1]) - 1, Number(parts[2])); - } - reset() { this.current = { year: null, -- 2.11.0