ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from nasa/open1272

Browse Source 
[Forms] Change format for date-time
This commit is contained in:
Victor Woeltjen 2015-06-19 15:47:10 -07:00
commit 737cf2b75b
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/forms/res/templates/controls/datetime.html
View File

@ -35,8 +35,8 @@
<span class='field control date'>
<input type='text'
name='date'
placeholder="YYYY-DDD"
ng-pattern="/\d\d\d\d-\d\d\d/"
placeholder="{{format}}"
ng-pattern="/\d\d\d\d-\d\d-\d\d/"
ng-model='datetime.date'
ng-required='ngRequired || partiallyComplete'/>
</span>
@ -80,4 +80,4 @@
</ng-form>
</div>
</div>

7
platform/forms/src/controllers/DateTimeController.js
View File

@ -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;
}
);
);

11
platform/forms/test/controllers/DateTimeControllerSpec.js
View File

@ -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"