ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 05:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format updates when time system selected

Browse Source
This commit is contained in:
Henry 2016-08-01 17:11:01 -07:00
parent ce5d0ef5bd
commit a75ea67b8c
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/localTimeSystem/bundle.js
View File

@ -33,7 +33,7 @@ define([
"extensions": {
"formats": [
{
"key": "local",
"key": "local-format",
"implementation": LocalTimeFormat
}
],

10
example/localTimeSystem/src/LocalTimeFormat.js
View File

@ -26,11 +26,11 @@ define([
moment
) {
var DATE_FORMAT = "YYYY-MM-DD hh:mm:ss.SSS",
var DATE_FORMAT = "YYYY-MM-DD h:mm:ss.SSS a",
DATE_FORMATS = [
DATE_FORMAT,
"YYYY-MM-DD hh:mm:ss",
"YYYY-MM-DD hh:mm",
"YYYY-MM-DD h:mm:ss a",
"YYYY-MM-DD h:mm a",
"YYYY-MM-DD"
];
@ -67,8 +67,8 @@ define([
return [
[".SSS", function(m) { return m.milliseconds(); }],
[":ss", function(m) { return m.seconds(); }],
["hh:mm", function(m) { return m.minutes(); }],
["hh", function(m) { return m.hours(); }],
["hh:mma", function(m) { return m.minutes(); }],
["hha", function(m) { return m.hours(); }],
["ddd DD", function(m) {
return m.days() &&
m.date() != 1;

4
example/localTimeSystem/src/LocalTimeSystem.js
View File

@ -42,11 +42,11 @@ define([
*/
this.metadata = {
'key': 'local',
'name': 'Local 12 hour',
'name': 'Local',
'glyph': '\u0043'
};
this._formats = ['utc'];
this._formats = ['local-format'];
this._tickSources = [new LocalClock($timeout, DEFAULT_PERIOD)];
}

2
main.js
View File

@ -105,8 +105,6 @@ define([
'./platform/search/bundle',
'./platform/status/bundle',
'./platform/commonUI/regions/bundle'
//'./examples/localTimeSystem/bundle'
//'./example/msl/bundle'
], function (Main, legacyRegistry) {
return {
legacyRegistry: legacyRegistry,

7
platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
View File

@ -212,10 +212,12 @@ define(
this.$scope.timeSystemModel.options = this.selectedMode.timeSystems().map(function (timeSystem) {
return timeSystem.metadata;
});
this.$scope.timeSystemModel.selected = timeSystem;
this.setTimeSystem(timeSystem);
/*this.$scope.timeSystemModel.selected = timeSystem;
//Use default format
this.$scope.timeSystemModel.format = timeSystem.formats()[0];
this.setDeltasFromTimeSystem(timeSystem);
this.setDeltasFromTimeSystem(timeSystem); */
}
};
@ -260,6 +262,7 @@ define(
TimeConductorController.prototype.setTimeSystem = function (newTimeSystem) {
if (newTimeSystem && newTimeSystem !== this.$scope.timeSystemModel.selected) {
this.$scope.timeSystemModel.selected = newTimeSystem;
this.$scope.timeSystemModel.format = newTimeSystem.formats()[0];
var mode = this.selectedMode;
mode.selectedTimeSystem(newTimeSystem);
this.setDeltasFromTimeSystem(newTimeSystem);