diff --git a/src/game/lib/util/date_util.js b/src/game/lib/util/date_util.js index 25b9a37..8f99c9e 100644 --- a/src/game/lib/util/date_util.js +++ b/src/game/lib/util/date_util.js @@ -1,16 +1,41 @@ function DateUtil() { } + +DateUtil.getFullYear = function(date) { + return date.getFullYear(); +} + +DateUtil.getFullMonth = function(date) { + return StringUtil.getNumberStartWithZero(date.getMonth() + 1, 2) +} + +DateUtil.getFullDate = function(date) { + return StringUtil.getNumberStartWithZero(date.getDate(), 2); +} + +DateUtil.getFullHours = function(date) { + return StringUtil.getNumberStartWithZero(date.getHours(), 2); +} + +DateUtil.getFullMinutes = function(date) { + return StringUtil.getNumberStartWithZero(date.getMinutes(), 2); +} + +DateUtil.getFullSeconds = function(date) { + return StringUtil.getNumberStartWithZero(date.getSeconds(), 2); +} + + DateUtil.getYYYYMMDD = function(date) { // return date.toISOString().slice(0,10); - var yymmdd = date.getFullYear() + "-" - + ("0" + (date.getMonth() + 1)).slice(-2) + "-" - + ("0" + date.getDate()).slice(-2); - return yymmdd; + return DateUtil.getFullYear(date) + "-" + + DateUtil.getFullMonth(date) + "-" + + DateUtil.getFullDate(date); } DateUtil.getHHMMSS = function(date) { - return StringUtil.getNumberStartWithZero(date.getHours(), 2) + ":" - + StringUtil.getNumberStartWithZero(date.getMinutes(), 2) + ":" - + StringUtil.getNumberStartWithZero(date.getSeconds(), 2); + return DateUtil.getFullHours(date) + ":" + + DateUtil.getFullMinutes(date) + ":" + + DateUtil.getFullSeconds(date); } \ No newline at end of file diff --git a/test/tdd.js b/test/tdd.js index e53e3d3..6cc90bd 100644 --- a/test/tdd.js +++ b/test/tdd.js @@ -2,13 +2,29 @@ // DateUtil QUnit.test( "DateUtil", function( assert ) { - var datetime = new Date("2019-06-04T16:15:00"); - var date = datetime.getFullYear() + "-" - + ("0" + (datetime.getMonth() + 1)).slice(-2) + "-" - + ("0" + datetime.getDate()).slice(-2); - var time = ("0" + datetime.getHours()).slice(-2) + ":" - + ("0" + datetime.getMinutes()).slice(-2) + ":" - + ("0" + datetime.getSeconds()).slice(-2); + var datetime = new Date("2019-06-04T16:15:03"); + + var dateTimeText = "2019-06-04T16:00:00"; + var datetimeHour = new Date(dateTimeText); + var roundedDateTimeText = DateUtil.getYYYYMMDD(datetime) + "T" + datetime.getHours() + ":00:00"; + var roundedDateTime = new Date(roundedDateTimeText); + assert.equal(datetimeHour - roundedDateTime, 0, "DateUtil - roundedDateTime"); + + + var date = DateUtil.getFullYear(datetime) + "-" + + DateUtil.getFullMonth(datetime) + "-" + + DateUtil.getFullDate(datetime); + var time = DateUtil.getFullHours(datetime) + ":" + + DateUtil.getFullMinutes(datetime) + ":" + + DateUtil.getFullSeconds(datetime); + + assert.equal(DateUtil.getFullYear(datetime), "2019", "DateUtil - getFullYear"); + assert.equal(DateUtil.getFullMonth(datetime), "06", "DateUtil - getFullMonth"); + assert.equal(DateUtil.getFullDate(datetime), "04", "DateUtil - getFullDate"); + + assert.equal(DateUtil.getFullHours(datetime), "16", "DateUtil - getFullHours"); + assert.equal(DateUtil.getFullMinutes(datetime), "15", "DateUtil - getFullMinutes"); + assert.equal(DateUtil.getFullSeconds(datetime), "03", "DateUtil - getFullSeconds"); assert.equal(DateUtil.getYYYYMMDD(datetime), date, "DateUtil - getYYYYMMDD"); assert.equal(DateUtil.getHHMMSS(datetime), time, "DateUtil - getHHMMSS");