From 6c34f291ce262b0a8b24f76e2fec50ee160d2783 Mon Sep 17 00:00:00 2001
From: Glenn Vorhes <gavorhes@wisc.edu>
Date: Mon, 10 Oct 2016 15:29:01 -0500
Subject: [PATCH] fix date convert
---
dist/util/dateConvert.d.ts | 4 ++--
dist/util/dateConvert.js | 4 ++--
dist/util/dateConvert.js.map | 2 +-
src/util/dateConvert.ts | 9 +++++----
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dist/util/dateConvert.d.ts b/dist/util/dateConvert.d.ts
index db0945b..410a41a 100644
--- a/dist/util/dateConvert.d.ts
+++ b/dist/util/dateConvert.d.ts
@@ -3,10 +3,10 @@
* @param {Date} dte to convert
* @returns {string} the formatted date string
*/
-export declare function dateToYyyyMmDdHhMmSs(dte: any): string;
+export declare function dateToYyyyMmDdHhMmSs(dte: Date): string;
/**
* Given a date return a string in the format YYYYmmdd_hh0000
* @param {Date} dte the input date
* @returns {string} the formatted date string
*/
-export declare function dateToYyyyMmDdHh000(dte: any): string;
+export declare function dateToYyyyMmDdHh000(dte: Date): string;
diff --git a/dist/util/dateConvert.js b/dist/util/dateConvert.js
index f18d076..489cba6 100644
--- a/dist/util/dateConvert.js
+++ b/dist/util/dateConvert.js
@@ -18,7 +18,7 @@ nm.leadingPad = leadingPad;
* @returns {string} the formatted date string
*/
function dateToYyyyMmDdHhMmSs(dte) {
- var yr = dte.getYear() + 1900;
+ var yr = dte.getFullYear();
var month = leadingPad(dte.getMonth() + 1);
var day = leadingPad(dte.getDate());
var hrs = leadingPad(dte.getHours());
@@ -34,7 +34,7 @@ nm.dateToYyyyMmDdHhMmSs = dateToYyyyMmDdHhMmSs;
* @returns {string} the formatted date string
*/
function dateToYyyyMmDdHh000(dte) {
- var yr = dte.getYear() + 1900;
+ var yr = dte.getFullYear();
var month = leadingPad(dte.getMonth() + 1);
var day = leadingPad(dte.getDate());
var hrs = leadingPad(dte.getHours());
diff --git a/dist/util/dateConvert.js.map b/dist/util/dateConvert.js.map
index 0644dac..a4e2b7d 100644
--- a/dist/util/dateConvert.js.map
+++ b/dist/util/dateConvert.js.map
@@ -1 +1 @@
-{"version":3,"file":"dateConvert.js","sourceRoot":"","sources":["../../src/util/dateConvert.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,wBAAoB,WAAW,CAAC,CAAA;AAChC,IAAI,EAAE,GAAG,iBAAO,CAAC,kBAAkB,CAAC,CAAC;AAErC,oBAAoB,KAAK;IACrB,IAAI,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;IAC7B,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,EAAE,CAAC,UAAU,GAAG,UAAU,CAAC;AAE3B;;;;GAIG;AACH,8BAAqC,GAAG;IACpC,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;IAC9B,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACpC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;IACvC,IAAI,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;IAExC,MAAM,CAAI,EAAE,SAAI,KAAK,SAAI,GAAG,SAAI,GAAG,SAAI,GAAG,SAAI,IAAM,CAAC;AACzD,CAAC;AATe,4BAAoB,uBASnC,CAAA;AAED,EAAE,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;AAG/C;;;;GAIG;AACH,6BAAoC,GAAG;IACnC,IAAI,EAAE,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;IAC9B,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACpC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAErC,MAAM,CAAC,KAAG,EAAE,GAAG,KAAK,GAAG,GAAG,SAAI,GAAG,SAAM,CAAC;AAC5C,CAAC;AAPe,2BAAmB,sBAOlC,CAAA;AAED,EAAE,CAAC,mBAAmB,GAAG,mBAAmB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"dateConvert.js","sourceRoot":"","sources":["../../src/util/dateConvert.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,wBAAoB,WAAW,CAAC,CAAA;AAChC,IAAI,EAAE,GAAG,iBAAO,CAAC,kBAAkB,CAAC,CAAC;AAErC,oBAAoB,KAAK;IACrB,IAAI,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;IAC7B,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC;AAClB,CAAC;AAED,EAAE,CAAC,UAAU,GAAG,UAAU,CAAC;AAE3B;;;;GAIG;AACH,8BAAqC,GAAS;IAC1C,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAC3B,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACpC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;IACvC,IAAI,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;IAExC,MAAM,CAAI,EAAE,SAAI,KAAK,SAAI,GAAG,SAAI,GAAG,SAAI,GAAG,SAAI,IAAM,CAAC;AACzD,CAAC;AATe,4BAAoB,uBASnC,CAAA;AAED,EAAE,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;AAG/C;;;;GAIG;AACH,6BAAoC,GAAS;IAEzC,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAC3B,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IACpC,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAErC,MAAM,CAAC,KAAG,EAAE,GAAG,KAAK,GAAG,GAAG,SAAI,GAAG,SAAM,CAAC;AAC5C,CAAC;AARe,2BAAmB,sBAQlC,CAAA;AAED,EAAE,CAAC,mBAAmB,GAAG,mBAAmB,CAAC"}
\ No newline at end of file
diff --git a/src/util/dateConvert.ts b/src/util/dateConvert.ts
index c08f635..ddee680 100644
--- a/src/util/dateConvert.ts
+++ b/src/util/dateConvert.ts
@@ -21,8 +21,8 @@ nm.leadingPad = leadingPad;
* @param {Date} dte to convert
* @returns {string} the formatted date string
*/
-export function dateToYyyyMmDdHhMmSs(dte) {
- let yr = dte.getYear() + 1900;
+export function dateToYyyyMmDdHhMmSs(dte: Date): string {
+ let yr = dte.getFullYear();
let month = leadingPad(dte.getMonth() + 1);
let day = leadingPad(dte.getDate());
let hrs = leadingPad(dte.getHours());
@@ -40,8 +40,9 @@ nm.dateToYyyyMmDdHhMmSs = dateToYyyyMmDdHhMmSs;
* @param {Date} dte the input date
* @returns {string} the formatted date string
*/
-export function dateToYyyyMmDdHh000(dte) {
- let yr = dte.getYear() + 1900;
+export function dateToYyyyMmDdHh000(dte: Date): string {
+
+ let yr = dte.getFullYear();
let month = leadingPad(dte.getMonth() + 1);
let day = leadingPad(dte.getDate());
let hrs = leadingPad(dte.getHours());
--
GitLab