diff --git a/awx/ui/static/js/controllers/SurveyMaker.js b/awx/ui/static/js/controllers/SurveyMaker.js
deleted file mode 100644
index fa03ce401b..0000000000
--- a/awx/ui/static/js/controllers/SurveyMaker.js
+++ /dev/null
@@ -1,629 +0,0 @@
-/************************************
- * Copyright (c) 2014 AnsibleWorks, Inc.
- *
- *
- * SurveyMaker.js
- *
- * Controller functions for the survey maker
- *
- */
-/**
- * @ngdoc function
- * @name controllers.function:SurveyMaker
- * @description This controller's for the survey maker page.
- * The survey maker interacts with the job template page, and the two go hand in hand. The scenarios are:
- * New job template - add new survey
- * New job template - edit new survey
- * Edit existing job template - add new survey
- * Edit Existing job template - edit existing survey
- *
- * Adding a new survey to any page takes the user to the Add New Survey page
- * Adding a new survey to a new job template saves the survey to session memory (navigating to survey maker forces us to save JT in memory temporarily)
- * Adding a new survey to an existing job template send the survey to the API
- * Editing an existing survey takes the user to the Edit Survey page
- * Editing a survey attached to a new job template saves the survey to session memory (saves the job template in session memory)
- * Editing a survey attached to an existing job template saves the survey to the API
- *
- * The variables in local memory are cleaned out whenever the user navigates to a page (other than the Survey Maker page)
-*/
-'use strict';
-
-function SurveyMakerAdd($scope, $rootScope, $compile, $location, $log, $routeParams, SurveyMakerForm,
- GenerateForm, Rest, Alert, ProcessErrors, LoadBreadCrumbs, ClearScope, GetBasePath,
- ReturnToCaller, Wait, SurveyQuestionForm, Store) {
-
- ClearScope();
-
- // Inject dynamic view
- var generator = GenerateForm,
- form = SurveyMakerForm,
- base = $location.path().replace(/^\//, '').split('/')[0],
- id = $location.path().replace(/^\//, '').split('/')[1];
-
- $scope.survey_questions=[];
- $scope.Store = Store;
- $scope.answer_types=[
- {name: 'Text' , type: 'text'},
- {name: 'Textarea', type: 'textarea'},
- {name: 'Multiple Choice (single select)', type: 'multiplechoice'},
- {name: 'Multiple Choice (multiple select)', type: 'multiselect'},
- {name: 'JSON', type: 'json'},
- {name: 'Integer', type: 'integer'},
- {name: 'Float', type: 'number'}
- ];
-
-
- generator.inject(form, { mode: 'add', related: false, scope: $scope});
- generator.reset();
- // LoadBreadCrumbs();
- // LoadBreadCrumbs({
- // path: '/job_templates/' + id + '/survey',
- // title: 'jared rocks', // $scope.job_id + ' - ', //+ data.summary_fields.job_template.name,
- // altPath: '/job_templates/' + id + '/survey',
- // });
-
- $scope.addQuestion = function(){
-
- GenerateForm.inject(SurveyQuestionForm, {mode:'modal', id:'new_question', scope:$scope, breadCrumbs: false});
- };
- $scope.addQuestion();
-
-// $('#question_shadow').mouseenter(function(){
-// $('#question_shadow').css({
-// "opacity": "1",
-// "border": "1px solid",
-// "border-color": "rgb(204,204,204)",
-// "border-radius": "4px"
-// });
-// $('#question_add_btn').show();
-// });
-
-// $('#question_shadow').mouseleave(function(){
-// $('#question_shadow').css({
-// "opacity": ".4",
-// "border": "1px dashed",
-// "border-color": "rgb(204,204,204)",
-// "border-radius": "4px"
-// });
-// $('#question_add_btn').hide();
-// })
-
-
- // $('#question_shadow').on("click" , function(){
- // // var survey_width = $('#survey_maker_question_area').width()-10,
- // // html = "";
-
- // // $('#add_question_btn').attr('disabled', 'disabled')
- // // $('#survey_maker_question_area').append(html);
- // addQuestion();
- // $('#question_shadow').hide();
- // $('#question_shadow').css({
- // "opacity": ".4",
- // "border": "1px dashed",
- // "border-color": "rgb(204,204,204)",
- // "border-radius": "4px"
- // });
- // });
- $scope.finalizeQuestion= function(data, labels){
- var key,
- html = '';
-
- for (key in data) {
- html+='
'+data[key]+'
\n';
- }
-
- html+='
';
-
- for (key in data) {
- html+='
'+data[key]+'
\n';
- }
-
- html+='
'+
'
'+
- '
'+
- '
This is not valid integer!
'+
+ '
'+
+ '
This is not valid float!
'+
'
'+
'
'+
- '
'+
- '
This is not valid integer!
'+
+ '
'+
+ '
This is not valid float!
'+
'
'+
'
This is not valid integer!
'+
' The value must be in range {{int_min}} to {{int_max}}!
'+
- // 'value = {{default_int}}
'+
- // 'value.$valid = {{survey_question_form.default_int.$valid}}'+
'',
-
- // ''+
- // '
This is not valid integer!
',
-
-
- // '',
-
-
-
-
-
-
-
- //
- //
- //
A value is required!
- //
- //
'+
+ '
'+
+ '
'+
+ '
This is not valid float!
'+
+ '
The value must be in range {{float_min}} to {{float_max}}!
'+
+ '
'+question.question_description+'
\n';
}
- defaultValue = (question.default) ? question.default : "";
+ // defaultValue = (question.default) ? question.default : "";
if(question.type === 'text' ){
+ defaultValue = (question.default) ? question.default : "";
html+='';
}
if(question.type === "textarea"){
+ defaultValue = (question.default) ? question.default : (question.default_textarea) ? question.default_textarea: "" ;
html+=''+
'
'+
'
'+
@@ -321,7 +323,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
if(question.type === 'multiplechoice' || question.type === "multiselect"){
choices = question.choices.split(/\n/);
element = (question.type==="multiselect") ? "checkbox" : 'radio';
-
+ question.default = (question.default) ? question.default : (question.default_multiselect) ? question.default_multiselect : "" ;
for( i = 0; i
'+
@@ -330,13 +332,23 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
}
}
- if(question.type === 'integer' || question.type === "float"){
- min = (question.min) ? question.min : "";
- max = (question.max) ? question.max : "" ;
- numberValidation = (question.type==="integer") ? "integer" : 'float';
+ if(question.type === 'integer'){
+ min = (!Empty(question.min)) ? question.min : "";
+ max = (!Empty(question.max)) ? question.max : "" ;
+ defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_int)) ? question.default_int : "" ;
html+='';
+
+ }
+ if(question.type === "float"){
+ min = (!Empty(question.min)) ? question.min : "";
+ max = (!Empty(question.max)) ? question.max : "" ;
+ defaultValue = (!Empty(question.default)) ? question.default : (!Empty(question.default_float)) ? question.default_float : "" ;
+ html+='';
}
@@ -462,7 +474,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
var scope = params.scope,
index = params.index,
- element, fld, i,
+ element, fld, i, pre,
form = SurveyQuestionForm;
$('#add_question_btn').hide();
@@ -473,9 +485,12 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
// $('#new_question .aw-form-well').remove();
GenerateForm.inject(form, { id: 'question_'+index, mode: 'edit' , related: false, scope:scope, breadCrumbs: false});
for(fld in form.fields){
- if( fld === 'answer_options_number'){
- $('#answer_min').val(scope.survey_questions[index].min);
- $('#answer_max').val(scope.survey_questions[index].max);
+ if( fld === 'float_options' || fld === 'int_options'){
+ pre = fld.substr(0, fld.indexOf('_'));
+ scope[pre+'_min'] = scope.survey_questions[index].min;
+ scope[pre+'_max'] = scope.survey_questions[index].max;
+ // $('#'+pre+'_min').val(scope.survey_questions[index].min);
+ // $('#'+pre+'_max').val(scope.survey_questions[index].max);
}
if( fld === 'default_int' || fld === 'default_float'){
$("#"+fld ).val(scope.survey_questions[index].default);
@@ -554,9 +569,13 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
});
};
scope.addQuestion = function(){
+
GenerateForm.inject(form, { id:'new_question', mode: 'add' , scope:scope, related: false, breadCrumbs: false});
scope.required = true; //set the required checkbox to true via the ngmodel attached to scope.required.
-
+ scope.int_min = null;
+ scope.int_max = null;
+ scope.float_min = null;
+ scope.float_max = null;
};
scope.addNewQuestion = function(){
@@ -673,9 +692,9 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
scope.submitQuestion = function(){
var form = SurveyQuestionForm,
data = {},
- labels={},
- min= "min",
- max = "max",
+ // labels={},
+ // min= "min",
+ // max = "max",
fld, key, elementID;
//generator.clearApiErrors();
Wait('start');
@@ -688,40 +707,25 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
if(scope[fld]){
if(fld === "type"){
data[fld] = scope[fld].type;
- // if(scope[fld].type==="textarea"){
- // data["default"] = scope.default_textarea;
- // }
- // if(scope[fld].type==="multiselect"){
- // data["default"] = scope.default_multiselect;
- // }
+
if(scope[fld].type === 'float'){
- data[min] = $('#answer_min').val();
- data[max] = $('#answer_max').val();
- labels[min]= "Min";
- labels[max]= "Max";
- // data["default"] = $('#default_float').val(); //scope.default_float;
+ data.min = scope.float_min;
+ data.max = scope.float_max;
+ data.default = scope.default_float;
+
}
if(scope[fld].type==="integer" ){
- data[min] = $('#answer_min').val();
- data[max] = $('#answer_max').val();
- labels[min]= "Min";
- labels[max]= "Max";
- // data["default"] = $('#default_int').val(); //scope.default_int;
+ data.min = scope.int_min;
+ data.max = scope.int_max;
+ data.default = scope.default_int;
+
}
}
else{
data[fld] = scope[fld];
- if( fld === 'default_int' || fld === 'default_float' ){
- data['default'] = $('#'+fld).val();
- }
- if(fld==="default_textarea" ){
- data['default'] = scope.default_textarea;
- }
- if(fld==="default_multiselect"){
- data['default'] = scope.default_multiselect;
- }
+
}
- labels[fld] = form.fields[fld].label;
+
}
}
Wait('stop');
diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js
index 33569afb31..4e4fa4f733 100644
--- a/awx/ui/static/lib/ansible/directives.js
+++ b/awx/ui/static/lib/ansible/directives.js
@@ -141,6 +141,25 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
};
}])
+
+ .directive('smartFloat', function() {
+ var FLOAT_REGEXP = /^\-?\d+((\.|\,)\d+)?$/;
+ return {
+ require: 'ngModel',
+ link: function(scope, elm, attrs, ctrl) {
+ ctrl.$parsers.unshift(function(viewValue) {
+ if (FLOAT_REGEXP.test(viewValue)) {
+ ctrl.$setValidity('float', true);
+ return parseFloat(viewValue.replace(',', '.'));
+ } else {
+ ctrl.$setValidity('float', false);
+ return undefined;
+ }
+ });
+ }
+ };
+ })
+
// integer Validate that input is of type integer. Taken from Angular developer
// guide, form examples. Add min and max directives, and this will check
// entered values is within the range.