diff --git a/platform/forms/res/templates/controls/datetime.html b/platform/forms/res/templates/controls/datetime.html index 6dae89eb8a..8c61fb9861 100644 --- a/platform/forms/res/templates/controls/datetime.html +++ b/platform/forms/res/templates/controls/datetime.html @@ -35,8 +35,8 @@ @@ -80,4 +80,4 @@ - \ No newline at end of file + diff --git a/platform/forms/src/controllers/DateTimeController.js b/platform/forms/src/controllers/DateTimeController.js index c026e98935..e37e3a8f71 100644 --- a/platform/forms/src/controllers/DateTimeController.js +++ b/platform/forms/src/controllers/DateTimeController.js @@ -26,7 +26,7 @@ define( function () { "use strict"; - var DATE_FORMAT = "YYYY-DDD"; + var DATE_FORMAT = "YYYY-MM-DD"; /** * Controller for the `datetime` form control. @@ -92,6 +92,9 @@ define( $scope.$watch("datetime.min", update); $scope.$watch("datetime.sec", update); + // Expose format string for placeholder + $scope.format = DATE_FORMAT; + // Initialize forms values updateDateTime( ($scope.ngModel && $scope.field) ? @@ -102,4 +105,4 @@ define( return DateTimeController; } -); \ No newline at end of file +); diff --git a/platform/forms/test/controllers/DateTimeControllerSpec.js b/platform/forms/test/controllers/DateTimeControllerSpec.js index 230d6a7a33..d2b0be4e7c 100644 --- a/platform/forms/test/controllers/DateTimeControllerSpec.js +++ b/platform/forms/test/controllers/DateTimeControllerSpec.js @@ -47,7 +47,7 @@ define( it("converts date-time input into a timestamp", function () { mockScope.ngModel = {}; mockScope.field = "test"; - mockScope.datetime.date = "2014-332"; + mockScope.datetime.date = "2014-11-28"; mockScope.datetime.hour = 22; mockScope.datetime.min = 55; mockScope.datetime.sec = 13; @@ -63,7 +63,7 @@ define( // as required. mockScope.ngModel = {}; mockScope.field = "test"; - mockScope.datetime.date = "2014-332"; + mockScope.datetime.date = "2014-11-28"; mockScope.datetime.hour = 22; mockScope.datetime.min = 55; // mockScope.datetime.sec = 13; @@ -85,6 +85,11 @@ define( expect(mockScope.ngModel.test).toBeUndefined(); }); + + it("exposes date-time format for placeholder", function () { + expect(mockScope.format).toEqual(jasmine.any(String)); + expect(mockScope.format.length).toBeGreaterThan(0); + }); it("initializes form fields with values from ng-model", function () { mockScope.ngModel = { test: 1417215313000 }; mockScope.field = "test"; @@ -94,7 +99,7 @@ define( } }); expect(mockScope.datetime).toEqual({ - date: "2014-332", + date: "2014-11-28", hour: "22", min: "55", sec: "13"