ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-02 16:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/timestamps-776'

Browse Source
This commit is contained in:
Pete Richards 2016-03-24 13:09:32 -07:00
commit cd7ff8ad85
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/formats/src/UTCTimeFormat.js
View File

@ -28,9 +28,10 @@ define([
) { ) {
"use strict"; "use strict";
var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss", var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSS",
DATE_FORMATS = [ DATE_FORMATS = [
DATE_FORMAT, DATE_FORMAT,
"YYYY-MM-DD HH:mm:ss",
"YYYY-MM-DD HH:mm", "YYYY-MM-DD HH:mm",
"YYYY-MM-DD" "YYYY-MM-DD"
]; ];
@ -48,7 +49,7 @@ define([
} }
UTCTimeFormat.prototype.format = function (value) { UTCTimeFormat.prototype.format = function (value) {
return moment.utc(value).format(DATE_FORMAT); return moment.utc(value).format(DATE_FORMAT) + "Z";
}; };
UTCTimeFormat.prototype.parse = function (text) { UTCTimeFormat.prototype.parse = function (text) {

6
platform/commonUI/formats/test/UTCTimeFormatSpec.js
View File

@ -40,6 +40,12 @@ define(
expect(moment.utc(formatted).valueOf()).toEqual(timestamp); expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
}); });
it("displays with millisecond precision", function () {
var timestamp = 12345670789,
formatted = format.format(timestamp);
expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
});
it("validates time inputs", function () { it("validates time inputs", function () {
expect(format.validate("1977-05-25 11:21:22")).toBe(true); expect(format.validate("1977-05-25 11:21:22")).toBe(true);
expect(format.validate("garbage text")).toBe(false); expect(format.validate("garbage text")).toBe(false);