ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-16 14:18:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Time Conductor] Validate numeric date-time fields

Browse Source 
Allow injection of a validator for numeric values of
the date-time fields, to allow for these to be displayed
as invalid in cases where the text itself may be parsed
but the resulting value is not valid (e.g. when start
is greater than end.)

https://github.com/nasa/openmctweb/issues/325
This commit is contained in:
Victor Woeltjen
2016-01-11 15:18:26 -08:00
parent 019e04f9ab
commit 07c407edea
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/templates/controls/datetime-field.html
View File

@ -24,7 +24,7 @@
<input type="text" <input type="text"
ng-model="textValue" ng-model="textValue"
ng-blur="restoreTextValue(); ngBlur()" ng-blur="restoreTextValue(); ngBlur()"
ng-class="{ error: textInvalid }"> ng-class="{ error: textInvalid, test: valueInvalid }">
</input> </input>
<a class="ui-symbol icon icon-calendar" <a class="ui-symbol icon icon-calendar"
ng-if="structure.format === 'utc' || !structure.format" ng-if="structure.format === 'utc' || !structure.format"

19
platform/commonUI/general/src/controllers/DateTimeFieldController.js
View File

@ -26,6 +26,10 @@ define(
function () { function () {
'use strict'; 'use strict';
function ACCEPT() {
return true;
}
/** /**
* Controller to support the date-time entry field. * Controller to support the date-time entry field.
* *
@ -44,7 +48,8 @@ define(
* format has been otherwise specified * format has been otherwise specified
*/ */
function DateTimeFieldController($scope, formatService, defaultFormat) { function DateTimeFieldController($scope, formatService, defaultFormat) {
var formatter = formatService.getFormat(defaultFormat); var formatter = formatService.getFormat(defaultFormat),
validate = ACCEPT;
function updateFromModel(value) { function updateFromModel(value) {
// Only reformat if the value is different from user // Only reformat if the value is different from user
@ -59,10 +64,12 @@ define(
} }
function updateFromView(textValue) { function updateFromView(textValue) {
var newValue;
$scope.textInvalid = !formatter.validate(textValue); $scope.textInvalid = !formatter.validate(textValue);
if (!$scope.textInvalid) { if (!$scope.textInvalid) {
$scope.ngModel[$scope.field] = newValue = formatter.parse(textValue);
formatter.parse(textValue); $scope.valueInvalid = !validate(newValue);
$scope.ngModel[$scope.field] = newValue;
$scope.lastValidValue = $scope.textValue; $scope.lastValidValue = $scope.textValue;
} }
} }
@ -82,6 +89,10 @@ define(
updateFromModel($scope.ngModel[$scope.field]); updateFromModel($scope.ngModel[$scope.field]);
} }
function setValidator(newValidator) {
validate = newValidator || ACCEPT;
}
function restoreTextValue() { function restoreTextValue() {
$scope.textValue = $scope.lastValidValue; $scope.textValue = $scope.lastValidValue;
updateFromView($scope.textValue); updateFromView($scope.textValue);
@ -95,7 +106,7 @@ define(
$scope.$watch('ngModel[field]', updateFromModel); $scope.$watch('ngModel[field]', updateFromModel);
$scope.$watch('pickerModel.value', updateFromPicker); $scope.$watch('pickerModel.value', updateFromPicker);
$scope.$watch('textValue', updateFromView); $scope.$watch('textValue', updateFromView);
$scope.$watch('structure.validate', setValidator);
} }
return DateTimeFieldController; return DateTimeFieldController;