diff --git a/app/models/form_field.server.model.js b/app/models/form_field.server.model.js index db99d3ae..d9dbbe33 100644 --- a/app/models/form_field.server.model.js +++ b/app/models/form_field.server.model.js @@ -28,6 +28,7 @@ function validateFormFieldType(value) { 'checkbox', 'hidden', 'yes_no', + 'natural' ]; if (validTypes.indexOf(value) > -1) { diff --git a/public/modules/forms/directives/field.client.directive.js b/public/modules/forms/directives/field.client.directive.js index 1d379d2b..251868d6 100644 --- a/public/modules/forms/directives/field.client.directive.js +++ b/public/modules/forms/directives/field.client.directive.js @@ -28,7 +28,8 @@ angular.module('forms').directive('fieldDirective', function($http, $compile) { 'legal', 'statement', 'rating', - 'yes_no' + 'yes_no', + 'natural' ]; if (__indexOf.call(supported_fields, type) >= 0) { return templateUrl += type + '.html'; @@ -48,6 +49,14 @@ angular.module('forms').directive('fieldDirective', function($http, $compile) { defaultDate: 0, }; } + //Set only if we have a natural lang processing field + else if(scope.field.fieldType === 'natural'){ + + //Fires when field is changed + scope.$watch('scope.field', function(newValue, oldValue) { + + }); + } // GET template content from path var templateUrl = getTemplateUrl(scope.field); diff --git a/public/modules/forms/directives/submit-form.client.directive.js b/public/modules/forms/directives/submit-form.client.directive.js index 2d9a0866..75bb1194 100644 --- a/public/modules/forms/directives/submit-form.client.directive.js +++ b/public/modules/forms/directives/submit-form.client.directive.js @@ -29,6 +29,8 @@ angular.module('forms').directive('formDirective', ['$http', '$timeout', 'timeCo }; $scope.reloadForm = function(){ + timeCounter.stopClock(); + timeCounter.startClock(); $scope.form.submitted = false; $scope.form.form_fields = _.chain($scope.form.form_fields).map(function(field){ field.fieldValue = ''; diff --git a/public/modules/forms/services/form-fields.client.service.js b/public/modules/forms/services/form-fields.client.service.js index 5ca80d05..359120b7 100644 --- a/public/modules/forms/services/form-fields.client.service.js +++ b/public/modules/forms/services/form-fields.client.service.js @@ -63,6 +63,10 @@ angular.module('forms').service('FormFields', [ name : 'statement', value : 'Statement' }, + { + name : 'natural', + value : 'Natural Language Input' + }, ]; } diff --git a/public/modules/forms/views/directiveViews/field/natural.html b/public/modules/forms/views/directiveViews/field/natural.html new file mode 100644 index 00000000..90eb5173 --- /dev/null +++ b/public/modules/forms/views/directiveViews/field/natural.html @@ -0,0 +1,18 @@ +
+

{{field.title}} *(required)

+
+ +
+
+
+ +
+