From 15a608a8615713a9261c8173739ef9d515eaa0cc Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Mon, 18 Jul 2016 18:44:29 -0700
Subject: [PATCH] Populate format in input fields

---
 .../conductor-v2/res/templates/time-conductor.html   |  4 ++--
 .../conductor-v2/src/timeSystems/UTCTimeSystem.js    | 12 +++++++++---
 .../conductor-v2/src/ui/TimeConductorController.js   |  7 ++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/platform/features/conductor-v2/res/templates/time-conductor.html b/platform/features/conductor-v2/res/templates/time-conductor.html
index b765dafce66..74c51971a61 100644
--- a/platform/features/conductor-v2/res/templates/time-conductor.html
+++ b/platform/features/conductor-v2/res/templates/time-conductor.html
@@ -16,7 +16,7 @@
                     <span class="l-time-range-input-w start-date">
                         <mct-control key="'datetime-field'"
                                      structure="{
-                                         format: 'utc',
+                                         format: timeSystemModel.format,
                                          validate: tcController.validation.validateStart
                                      }"
                                      ng-model="formModel"
@@ -59,7 +59,7 @@
                           ng-controller="ToggleController as t2">
                         <mct-control key="'datetime-field'"
                                      structure="{
-                                         format: 'utc',
+                                         format: timeSystemModel.format,
                                          validate: tcController.validation.validateEnd
                                      }"
                                      ng-model="formModel"
diff --git a/platform/features/conductor-v2/src/timeSystems/UTCTimeSystem.js b/platform/features/conductor-v2/src/timeSystems/UTCTimeSystem.js
index ee0e89ba3cb..690f0629a4b 100644
--- a/platform/features/conductor-v2/src/timeSystems/UTCTimeSystem.js
+++ b/platform/features/conductor-v2/src/timeSystems/UTCTimeSystem.js
@@ -22,8 +22,7 @@
 
 define([
     './TimeSystem',
-    './LocalClock',
-    '../../../../commonUI/formats/src/UTCTimeFormat'
+    './LocalClock'
 ], function (TimeSystem, LocalClock, UTCTimeFormat) {
     var FIFTEEN_MINUTES = 15 * 60 * 1000,
         DEFAULT_PERIOD = 1000;
@@ -36,13 +35,20 @@ define([
     function UTCTimeSystem ($timeout) {
         TimeSystem.call(this);
 
+        /**
+         * Some metadata, which will be used to identify the time system in
+         * the UI
+         * @type {{key: string, name: string, glyph: string}}
+         */
         this.metadata = {
             'key': 'utc',
             'name': 'UTC',
             'glyph': '\u0043'
         };
 
-        this._formats = [new UTCTimeFormat()];
+        //Time formats are defined as extensions. Include the key
+        // for the corresponding time format here
+        this._formats = ['utc'];
         this._tickSources = [new LocalClock($timeout, DEFAULT_PERIOD)];
     }
 
diff --git a/platform/features/conductor-v2/src/ui/TimeConductorController.js b/platform/features/conductor-v2/src/ui/TimeConductorController.js
index 41485716f6a..5967fbf194a 100644
--- a/platform/features/conductor-v2/src/ui/TimeConductorController.js
+++ b/platform/features/conductor-v2/src/ui/TimeConductorController.js
@@ -72,6 +72,7 @@ define(
         TimeConductorController.prototype.initializeScope = function ($scope) {
             $scope.timeSystemModel = {
                 selected: undefined,
+                format: undefined,
                 options: []
             };
             $scope.modeModel = {
@@ -155,13 +156,17 @@ define(
                 }
                 newMode.initialize();
 
+                var timeSystem = newMode.selectedTimeSystem();
+
                 this.$scope.modeModel.selected = newMode;
 
                 //Synchronize scope with time system on mode
                 this.$scope.timeSystemModel.options = newMode.timeSystems().map(function (timeSystem) {
                     return timeSystem.metadata;
                 });
-                this.$scope.timeSystemModel.selected = newMode.selectedTimeSystem();
+                this.$scope.timeSystemModel.selected = timeSystem;
+                //Use default format
+                this.$scope.timeSystemModel.format = timeSystem.formats()[0];
                 this.setDefaultsFromTimeSystem(newMode.selectedTimeSystem());
             }
         };