diff --git a/awx/ui/static/js/forms/SurveyQuestion.js b/awx/ui/static/js/forms/SurveyQuestion.js
index 50eca4c52f..a0ef474193 100644
--- a/awx/ui/static/js/forms/SurveyQuestion.js
+++ b/awx/ui/static/js/forms/SurveyQuestion.js
@@ -24,250 +24,255 @@ export default
twoColumns: true,
breadcrumbs: false,
- fields: {
- question_name: {
- realName: 'question_text',
- label: 'Name',
- type: 'text',
- addRequired: true,
- editRequired: true,
- column: 1,
- awSurveyQuestion: true
- },
- question_description: {
- realName: 'question_description',
- label: 'Description',
- type: 'text',
- // rows: 2,
- addRequired: false,
- editRequired: false,
- column: 1
- },
- // variable: {
- // label: 'Answer Variable Name',
- // type: 'text',
- // addRequired: true,
- // editRequired: true,
- // column: 1,
- // awPopOver: 'The suggested format for variable names are lowercase, underscore-separated descriptive nouns.
'+
- // 'For example:
foo_bar
\n user_id
\n host_name
' ,
- // dataTitle: 'Answer Variable Name',
- // dataPlacement: 'right',
- // dataContainer: "body"
- // },
- variable: {
- ealName: 'variable',
- type: 'custom',
- control:''+
- '
'+
- '
Please enter an answer variable name.
'+
- '
Please remove the illegal character from the survey question variable name.
'+
- '
This question variable is already in use. Please enter a different variable name.
' +
- '
'+
- '
Type an option on each line.
'+
- 'For example the following input:
Apple
\n Banana
\n Cherry
would be displayed as:
\n'+
- '- Apple
- Banana
- Cherry
',
- dataTitle: 'Multiple Choice Options',
- dataPlacement: 'right',
- dataContainer: "body",
- column: 2
- },
- text_options: {
- realName: 'answer_options',
- type: 'custom',
- control:''+
- '
'+
- '
'+
- '
The minimum length you entered is not a number. Please enter a number.
'+
- '
The minimium length is too high. Please enter a lower number.
'+
- '
The minimum length is too low. Please enter a positive number.
'+
- '
'+
- '
'+
- '
'+
- '
The maximum length you entered is not a number. Please enter a number.
'+
- '
The maximum length is too low. Please enter a number larger than the minimum length you set.
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
The minimum length you entered is not a number. Please enter a number.
'+
- '
The minimium length is too high. Please enter a lower number.
'+
- '
The minimum length is too low. Please enter a positive number.
'+
- '
'+
- '
'+
- '
'+
- '
The maximum length you entered is not a number. Please enter a number.
'+
- '
The maximum length is too low. Please enter a number larger than the minimum length you set.
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
Please enter a valid integer.
'+
- '
Please enter a smaller integer.
'+
- '
'+
- '
'+
- '
'+
- '
Please enter a valid integer.
'+
- '
Please enter a larger integer.
'+
- '
'+
- '
'+
- '
'+
- '
'+
- '
Please enter a valid float.
'+
- '
Please enter a smaller float.
'+
- '
'+
- '
'+
- '
'+
- '
Please enter a valid float.
'+
- '
Please enter a larger float.
'+
-
- '
'+
- '
'+
- // '
'+
- // '
'+
- // '
The answer must be between {{text_min}} to {{text_max}} characters long!
'+
- // '
'+
- '
'+
- '
'+
- '
Please enter a valid integer.
'+
- '
Please enter a value in the range of {{int_min}} to {{int_max}}.
'+
- '
'+
- '
'+
- '
'+
- '
Please enter a valid float.
'+
- '
Please enter a value in the range of {{float_min}} to {{float_max}}!
'+
- '
The suggested format for variable names are lowercase, underscore-separated descriptive nouns.
'+
+ // 'For example:
foo_bar
\n user_id
\n host_name
' ,
+ // dataTitle: 'Answer Variable Name',
+ // dataPlacement: 'right',
+ // dataContainer: "body"
+ // },
+ variable: {
+ ealName: 'variable',
+ type: 'custom',
+ control:''+
+ '
'+
+ '
Please enter an answer variable name.
'+
+ '
Please remove the illegal character from the survey question variable name.
'+
+ '
This question variable is already in use. Please enter a different variable name.
' +
+ '
'+
+ '
Type an option on each line.
'+
+ 'For example the following input:
Apple
\n Banana
\n Cherry
would be displayed as:
\n'+
+ '- Apple
- Banana
- Cherry
',
+ dataTitle: 'Multiple Choice Options',
+ dataPlacement: 'right',
+ dataContainer: "body",
+ column: 2
+ },
+ text_options: {
+ realName: 'answer_options',
+ type: 'custom',
+ control:''+
+ '
'+
+ '
'+
+ '
The minimum length you entered is not a number. Please enter a number.
'+
+ '
The minimium length is too high. Please enter a lower number.
'+
+ '
The minimum length is too low. Please enter a positive number.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
The maximum length you entered is not a number. Please enter a number.
'+
+ '
The maximum length is too low. Please enter a number larger than the minimum length you set.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
'+
+ '
The minimum length you entered is not a number. Please enter a number.
'+
+ '
The minimium length is too high. Please enter a lower number.
'+
+ '
The minimum length is too low. Please enter a positive number.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
The maximum length you entered is not a number. Please enter a number.
'+
+ '
The maximum length is too low. Please enter a number larger than the minimum length you set.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid integer.
'+
+ '
Please enter a smaller integer.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid integer.
'+
+ '
Please enter a larger integer.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid float.
'+
+ '
Please enter a smaller float.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid float.
'+
+ '
Please enter a larger float.
'+
- });
+ '
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid integer.
'+
+ '
Please enter a value in the range of {{int_min}} to {{int_max}}.
'+
+ '
'+
+ '
'+
+ '
'+
+ '
Please enter a valid float.
'+
+ '
Please enter a value in the range of {{float_min}} to {{float_max}}!
'+
+ '
';
for( i = 0; i/g, ">");
choices[i] = scope.serialize(choices[i]);
@@ -364,17 +364,42 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
$('#add_question_btn').focus();
$('#survey_maker_save_btn').removeAttr('disabled');
+ // Sometimes the $event.target returns the anchor element that wraps the icon, and sometimes the icon itself
+ // is returned. So for each icon click event we check to see which target the user clicked, and depending no which one
+ // they clicked, we move up the dom hierarchy to get the index on the question. Ultimatley the object that is passed to
+ // each one of these functions should be the index of the question that the user is trying to perform an action on.
$('#delete-question_'+question.index+'').on('click', function($event){
- scope.deleteQuestion($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ if($event.target.nodeName==="A"){
+ scope.deleteQuestion($event.target.parentElement.parentElement.id.split('_')[1]);
+ }
+ else if($event.target.nodeName === "I"){
+ scope.deleteQuestion($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ }
});
$('#edit-question_'+question.index+'').on('click', function($event){
- scope.editQuestion($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ if($event.target.nodeName==="A"){
+ scope.editQuestion($event.target.parentElement.parentElement.id.split('_')[1]);
+ }
+ else if($event.target.nodeName === "I"){
+ scope.editQuestion($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ }
});
$('#question-up_'+question.index+'').on('click', function($event){
- scope.questionUp($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ if($event.target.nodeName==="A"){
+ scope.questionUp($event.target.parentElement.parentElement.id.split('_')[1]);
+ }
+ else if($event.target.nodeName === "I"){
+ scope.questionUp($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ }
});
$('#question-down_'+question.index+'').on('click', function($event){
- scope.questionDown($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ if($event.target.nodeName==="A"){
+ scope.questionDown($event.target.parentElement.parentElement.id.split('_')[1]);
+ }
+ else if($event.target.nodeName === "I"){
+ scope.questionDown($event.target.parentElement.parentElement.parentElement.id.split('_')[1]);
+ }
+
});
};
}])
@@ -701,6 +726,8 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
};
scope.typeChange = function() {
+ scope.minTextError = false;
+ scope.maxTextError = false;
scope.default = "";
scope.default_multiselect = "";
scope.default_float = "";
@@ -721,13 +748,63 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
scope.survey_question_form.default_int.$setPristine();
scope.survey_question_form.default_textarea.$setPristine();
scope.survey_question_form.choices.$setPristine();
+ scope.survey_question_form.int_min.$setPristine();
+ scope.survey_question_form.int_max.$setPristine();
};
scope.submitQuestion = function(event){
var data = {},
- fld,
+ fld, i,
+ choiceArray,
+ answerArray,
key, elementID;
- Wait('start');
+ // Wait('start');
+ scope.invalidChoice = false;
+ scope.duplicate = false;
+ scope.minTextError = false;
+ scope.maxTextError = false;
+
+ if(scope.type.type==="text"){
+ if(scope.default.trim() !== ""){
+ if(scope.default.trim().length < scope.text_min && scope.text_min !== "" ){
+ scope.minTextError = true;
+ }
+ if(scope.text_max < scope.default.trim().length && scope.text_max !== "" ){
+ scope.maxTextError = true;
+ }
+ }
+ }
+
+ if(scope.type.type==="textarea"){
+ if(scope.default_textarea.trim() !== ""){
+ if(scope.default_textarea.trim().length < scope.textarea_min && scope.textarea_min !== "" ){
+ scope.minTextError = true;
+ }
+ if(scope.textarea_max < scope.default_textarea.trim().length && scope.textarea_max !== "" ){
+ scope.maxTextError = true;
+ }
+ }
+ }
+
+ if(scope.type.type==="multiselect" && scope.default_multiselect.trim() !== ""){
+ choiceArray = scope.choices.split(/\n/);
+ answerArray = scope.default_multiselect.split(/\n/);
+
+ if(answerArray.length>0){
+ for(i=0; i