adding updated survey maker with no survey name or survey description

awx/ui/static/js/forms/SurveyMaker.js

@@ -40,17 +40,20 @@ angular.module('SurveyMakerFormDefinition', [])
         fields: {
             survey_name: {
                 type: 'custom',
-                control: '<div class="row"><div class="col-sm-6"><div class="form-group">'+
+                control: '<div class="row">'+
-                    '<label for="survey_name"><span class="label-text prepend-asterisk">Survey Name</span></label><div>'+
+                    //     '<div class="col-sm-6">
-                    '<input type="text" ng-model="survey_name" name="survey_name" id="survey_maker_survey_name" class="form-control ng-pristine ng-invalid ng-invalid-required" required="">'+
+                    //         <div class="form-group">'+
-                    '<div class="error ng-hide" id="survey_maker-survey_name-required-error" ng-show="survey_maker_form.survey_name.$dirty &amp;&amp; survey_maker_form.survey_name.$error.required">A value is required!</div>'+
+                    //             '<label for="survey_name"><span class="label-text prepend-asterisk">Survey Name</span></label>
-                    '<div class="error api-error ng-binding" id="survey_maker-survey_name-api-error" ng-bind="survey_name_api_error"></div>'+
+                    //                 <div>'+
-                    '</div></div></div>'+
+                    //                     '<input type="text" ng-model="survey_name" name="survey_name" id="survey_maker_survey_name" class="form-control ng-pristine ng-invalid ng-invalid-required" required="" capitalize>'+
-                    '<div class="col-sm-6"><div class="form-group">'+
+                    //                         '<div class="error ng-hide" id="survey_maker-survey_name-required-error" ng-show="survey_maker_form.survey_name.$dirty &amp;&amp; survey_maker_form.survey_name.$error.required">A value is required!</div>'+
-                    '<label for="survey_description"><span class="label-text">Survey Description</span></label><div>'+
+                    //                         '<div class="error api-error ng-binding" id="survey_maker-survey_name-api-error" ng-bind="survey_name_api_error"></div>'+
-                    '<input type="text" ng-model="survey_description" name="survey_description" id="survey_maker_survey_description" class="form-control ng-pristine ng-valid">'+
+                    // '</div></div></div>'+
-                    '<div class="error api-error ng-binding" id="survey_maker-survey_description-api-error" ng-bind="survey_description_api_error"></div>'+
+                    // '<div class="col-sm-6"><div class="form-group">'+
-                    '</div></div></div>'+
+                    // '<label for="survey_description"><span class="label-text">Survey Description</span></label><div>'+
+                    // '<input type="text" ng-model="survey_description" name="survey_description" id="survey_maker_survey_description" class="form-control ng-pristine ng-valid">'+
+                    // '<div class="error api-error ng-binding" id="survey_maker-survey_description-api-error" ng-bind="survey_description_api_error"></div>'+
+                    // '</div></div></div>'+
                     '<div class="col-sm-12"><label for="survey"><span class="label-text prepend-asterisk">Questions</span></label>'+
                     '<div id="survey_maker_question_area"></div><div id="finalized_questions"></div>'+
                     '<button style="display:none" type="button" class="btn btn-sm btn-primary" id="add_question_btn" ng-click="addNewQuestion()" aw-tool-tip="Create a new question" data-placement="top" data-original-title="" title="" disabled><i class="fa fa-plus fa-lg"></i>  Add Question</button>'+
@@ -90,7 +93,7 @@ angular.module('SurveyMakerFormDefinition', [])
             // save: {
             //     ngClick: 'formSave()', //$scope.function to call on click, optional
             //     ngDisabled: true //Disable when $pristine or $invalid, optional
-            // },
+            // }
             // reset: {
             //     ngClick: 'formReset()',
             //     ngDisabled: true //Disabled when $pristine

awx/ui/static/js/forms/SurveyQuestion.js

@@ -16,7 +16,7 @@ angular.module('SurveyQuestionFormDefinition', [])
 
         addTitle: 'Add Question',
         // editTitle: '{{ survey_name }}',
-        name: 'question_unique',
+        name: 'survey_question',
         well: true,
         twoColumns: true,
 
@@ -152,8 +152,9 @@ angular.module('SurveyQuestionFormDefinition', [])
                 // checked: true,
                 addRequired: false,
                 editRequired: false,
-                column: 2
+                column: 2,
-                // trueValue: true
+                // trueValue: true,
+                // falseValue: false
                 // label: 'Answer required or optional',
                 // type: 'custom',
                 // column: 2,
@@ -183,9 +184,9 @@ angular.module('SurveyQuestionFormDefinition', [])
         // },
         },
         buttons: {
-            submit_quesiton: {
+            submit_question: {
                 ngClick: 'submitQuestion()',
-                ngDisabled: true,
+                ngDisabled: '!question_name || !variable || !type',
                 'class': 'btn btn-sm btn-primary',
                 label: 'Add Question'
             }

awx/ui/static/js/helpers/Survey.js

@@ -16,16 +16,18 @@
 angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', 'ListGenerator', 'ModalDialog',
     'GeneratorHelpers'])
 
-    .factory('ShowSurveyModal', ['Wait', 'CreateDialog', function(Wait, CreateDialog) {
+    .factory('ShowSurveyModal', ['Wait', 'CreateDialog', 'Empty', '$compile' ,
+        function(Wait, CreateDialog, Empty, $compile) {
         return function(params) {
             // Set modal dimensions based on viewport width
 
-            var buttons,
+            var scope = params.scope,
-                scope = params.scope,
                 callback = params.callback,
-                title = params.title;
+                mode = (params.mode) ? params.mode : "survey-maker",
-
+                title = params.title,
-            buttons = [{
+                element,
+                target = (mode==='survey-taker') ? 'password-modal' : "survey-modal-dialog",
+                buttons = [{
                 "label": "Cancel",
                 "onClick": function() {
                     $(this).dialog('close');
@@ -34,21 +36,25 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 "class": "btn btn-default",
                 "id": "survey-close-button"
             },{
-                "label": "Save",
+                "label": (mode==='survey-taker') ? "Launch" : "Save" ,
                 "onClick": function() {
                     setTimeout(function(){
                         scope.$apply(function(){
-                            scope.saveSurvey();
+                            if(mode==='survey-taker'){
+                                scope.$emit('SurveyTakerCompleted');
+                            } else{
+                                scope.saveSurvey();
+                            }
                         });
                     });
                 },
-                "icon": "fa-check",
+                "icon":  (mode==='survey-taker') ? "fa-rocket" : "fa-check",
                 "class": "btn btn-primary",
                 "id": "survey-save-button"
             }];
 
             CreateDialog({
-                id: 'survey-modal-dialog',
+                id: target,
                 title: title,
                 scope: scope,
                 buttons: buttons,
@@ -56,14 +62,23 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 height: 725,
                 minWidth: 400,
                 onClose: function() {
-                    $('#survey-modal-dialog #form-container').empty();
+                    $('#'+target).empty();
                 },
                 onOpen: function() {
                     Wait('stop');
-                    //  $('#surveyName').focus();
+                    if(mode!=="survey-taker"){
-                    // $('#rrule_nlp_description').dblclick(function() {
+                        $('#survey-save-button').attr('ng-disabled', "survey_questions.length<1 ");
-                    //     setTimeout(function() { scope.$apply(function() { scope.showRRule = (scope.showRRule) ? false : true; }); }, 100);
+                        element = angular.element(document.getElementById('survey-save-button'));
-                    // });
+                        $compile(element)(scope);
+
+                    }
+                    if(mode==="survey-taker"){
+                        $('#survey-save-button').attr('ng-disabled',  "survey_taker_form.$invalid");
+                        element = angular.element(document.getElementById('survey-save-button'));
+                        $compile(element)(scope);
+
+                    }
+
                 },
                 callback: callback
             });
@@ -151,7 +166,8 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
 
     .factory('AddSurvey', ['$location', '$routeParams', 'SchedulerInit', 'ShowSurveyModal', 'Wait', 'GetBasePath', 'Empty',
         'SchedulePost', 'GenerateForm', 'SurveyMakerForm',
-    function($location, $routeParams, SchedulerInit, ShowSurveyModal, Wait, GetBasePath, Empty, SchedulePost, GenerateForm, SurveyMakerForm) {
+    function($location, $routeParams, SchedulerInit, ShowSurveyModal, Wait, GetBasePath, Empty,
+        SchedulePost, GenerateForm, SurveyMakerForm) {
         return function(params) {
             var scope = params.scope,
                 // callback= params.callback,
@@ -177,14 +193,14 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
             generator.inject(form, { id: 'survey-modal-dialog' , mode: 'add', related: false, scope: scope, breadCrumbs: false });
             ShowSurveyModal({ title: "Add Survey", scope: scope, callback: 'DialogReady' });
 
-            if (scope.removeScheduleSaved) {
+            // if (scope.removeScheduleSaved) {
-                scope.removeScheduleSaved();
+            //     scope.removeScheduleSaved();
-            }
+            // }
-            scope.removeScheduleSaved = scope.$on('ScheduleSaved', function() {
+            // scope.removeScheduleSaved = scope.$on('ScheduleSaved', function() {
-                Wait('stop');
+            //     Wait('stop');
-                $('#survey-modal-dialog').dialog('close');
+            //     $('#survey-modal-dialog').dialog('close');
-                scope.$emit('surveySaved');
+            //     scope.$emit('surveySaved');
-            });
+            // });
 
 
         };
@@ -218,6 +234,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 scope.survey_description = "";
                 scope.survey_questions = [];
                 Wait('stop');
+                scope.survey_exists = false;
                 $('#job_templates_delete_survey_btn').hide();
                 $('#job_templates_edit_survey_btn').hide();
                 $('#job_templates_create_survey_btn').show();
@@ -271,6 +288,10 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
 
             html = "";
 
+            // if(scope.survey_questions.length>0){
+            //     $('#survey-save-button').removeAttr('disabled')
+            // }
+
             question.index = index;
 
             if(!$('#question_'+question.index+':eq(0)').is('div')){
@@ -278,11 +299,10 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 $('#finalized_questions').append(html);
             }
 
-
+            required = (question.required===true) ? "prepend-asterisk" : "";
-            required = (question.required) ? "prepend-asterisk" : "";
             html = '<div class="col-xs-12 '+required+'"><b>'+question.question_name+'</b></div>\n';
             if(!Empty(question.question_description)){
-                html += '<div class="col-xs-12"><i>'+question.question_description+'</i></div>\n';
+                html += '<div class="col-xs-12 description"><i>'+question.question_description+'</i></div>\n';
             }
             defaultValue = (question.default) ? question.default : "";
 
@@ -336,6 +356,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
 
             $('#add_question_btn').show();
             $('#add_question_btn').removeAttr('disabled');
+            $('#add_question_btn').focus();
             $('#survey_maker_save_btn').removeAttr('disabled');
 
             $('#delete-question_'+question.index+'').on('click', function($event){
@@ -353,6 +374,86 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
         };
     }])
 
+ .factory('SurveyTakerQuestion', ['GetBasePath','Rest', 'Wait', 'ProcessErrors', '$compile', 'Empty',
+    function(GetBasePath, Rest, Wait, ProcessErrors, $compile, Empty) {
+        return function(params) {
+
+            var scope = params.scope,
+                // id = params.id,
+                question = params.question,
+                index = params.index,
+                requiredAsterisk,
+                requiredClasses,
+                element, choices, i, checked,
+                max, min, defaultValue,
+
+            html = "";
+
+            // if(scope.survey_questions.length>0){
+            //     $('#survey-save-button').removeAttr('disabled')
+            // }
+
+            question.index = index;
+            question[question.variable] = question.default;
+            scope[question.variable] = question.default;
+
+
+            if(!$('#question_'+question.index+':eq(0)').is('div')){
+                html+='<div id="question_'+question.index+'" class="survey_taker_question_final row"></div>';
+                $('#survey_taker_finalized_questions').append(html);
+            }
+
+            requiredAsterisk = (question.required===true) ? "prepend-asterisk" : "";
+            requiredClasses = (question.required===true) ? "ng-pristine ng-invalid-required ng-invalid" : "";
+
+            html = '<div class="col-xs-12 '+requiredAsterisk+'"><b>'+question.question_name+'</b></div>\n';
+            if(!Empty(question.question_description)){
+                html += '<div class="col-xs-12 description"><i>'+question.question_description+'</i></div>\n';
+            }
+            defaultValue = (question.default) ? question.default : "";
+
+            if(question.type === 'text' ){
+                html+='<div class="row">'+
+                    '<div class="col-xs-8">'+
+                    '<input type="text" ng-model="'+question.variable+'" '+         //placeholder="'+defaultValue+'"
+                            'class="form-control '+requiredClasses+' final" required="" >'+
+                    '</div></div>';
+            }
+            if(question.type === "textarea"){
+                html+='<div class="row">'+
+                    '<div class="col-xs-8">'+
+                    '<textarea ng-model="'+question.variable+'" class="form-control '+requiredClasses+' final" required="" rows="3" >'+//defaultValue+
+                            '</textarea>'+
+                    '</div></div>';
+            }
+            if(question.type === 'multiplechoice' || question.type === "multiselect"){
+                choices = question.choices.split(/\n/);
+                element = (question.type==="multiselect") ? "checkbox" : 'radio';
+
+                for( i = 0; i<choices.length; i++){
+                    checked = (!Empty(question.default) && question.default.indexOf(choices[i].trim())!==-1) ? "checked" : "";
+                    html+='<label class="'+element+'-inline  final">'+
+                    '<input type="'+element+'" name="'+question.variable+ ' " id="" value=" '+choices[i]+' " '+checked+' >' +choices[i]+
+                    '</label>';
+                }
+
+            }
+            if(question.type === 'integer' || question.type === "float"){
+                min = (question.min) ? question.min : "";
+                max = (question.max) ? question.max : "" ;
+                html+='<div class="row">'+
+                    '<div class="col-xs-8">'+
+                    '<input type="number" class="final" name="'+question.variable+'" min="'+min+'" max="'+max+'" value="'+defaultValue+'">'+
+                    '</div></div>';
+
+            }
+            $('#question_'+question.index).append(html);
+
+            element = angular.element(document.getElementById('question_'+question.index));
+            $compile(element)(scope);
+
+        };
+    }])
 
      .factory('EditQuestion', ['GetBasePath','Rest', 'Wait', 'ProcessErrors', '$compile', 'GenerateForm', 'SurveyQuestionForm',
     function(GetBasePath, Rest, Wait, ProcessErrors, $compile, GenerateForm, SurveyQuestionForm) {
@@ -371,6 +472,11 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
             // $('#new_question .aw-form-well').remove();
             GenerateForm.inject(form, { id: 'question_'+index, mode: 'edit' , 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(form.fields[fld].type === 'select'){
                     for (i = 0; i < scope.answer_types.length; i++) {
                         if (scope.survey_questions[index][fld] === scope.answer_types[i].type) {
@@ -393,17 +499,19 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 element;
 
             element = $('.question_final:eq('+index+')');
-            // element.attr('id', 'question_'+index);
             element.remove();
             scope.survey_questions.splice(index, 1);
             scope.reorder();
+            if(scope.survey_questions.length<1){
+                $('#survey-save-button').attr('disabled', 'disabled');
+            }
         };
     })
 
     .factory('SurveyControllerInit', ['$location', 'DeleteSurvey', 'EditSurvey', 'AddSurvey', 'GenerateForm', 'SurveyQuestionForm', 'Wait', 'Alert',
-            'GetBasePath', 'Rest', 'ProcessErrors' , '$compile', 'FinalizeQuestion', 'EditQuestion', 'DeleteQuestion',
+            'GetBasePath', 'Rest', 'ProcessErrors' , '$compile', 'FinalizeQuestion', 'EditQuestion', 'DeleteQuestion', 'SurveyTakerQuestion',
         function($location, DeleteSurvey, EditSurvey, AddSurvey, GenerateForm, SurveyQuestionForm, Wait, Alert,
-            GetBasePath, Rest, ProcessErrors, $compile, FinalizeQuestion, EditQuestion, DeleteQuestion) {
+            GetBasePath, Rest, ProcessErrors, $compile, FinalizeQuestion, EditQuestion, DeleteQuestion, SurveyTakerQuestion) {
         return function(params) {
             var scope = params.scope,
                 // parent_scope = params.parent_scope,
@@ -447,8 +555,21 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
             scope.addQuestion = function(){
                 GenerateForm.inject(SurveyQuestionForm, { id:'new_question', mode: 'add' , scope:scope, breadCrumbs: false});
                 scope.required = true; //set the required checkbox to true via the ngmodel attached to scope.required.
+                // $('#survey_question_submit_question_btn').attr('ng-disabled', "!question_name || !variable || !type && (type===multiplechoice || !choices)");
+                // element = angular.element(document.getElementById('survey_question_submit_question_btn'));
+                // // element.html(html);
+
+                // $compile(element)(scope);
             };
 
+            scope.addNewQuestion = function(){
+                // $('#add_question_btn').on("click" , function(){
+                scope.addQuestion();
+                $('#survey_question_question_name').focus();
+                $('#add_question_btn').attr('disabled', 'disabled');
+                $('#add_question_btn').hide();
+            // });
+            };
             scope.editQuestion = function(index){
                 EditQuestion({
                     index: index,
@@ -531,6 +652,16 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 }
             };
 
+            scope.surveyTakerQuestion= function(data, index){
+                SurveyTakerQuestion({
+                    scope: scope,
+                    question: data,
+                    id: id,
+                    index: index
+                    //callback?
+                });
+            };
+
             scope.finalizeQuestion= function(data, index){
                 FinalizeQuestion({
                     scope: scope,
@@ -541,13 +672,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 });
             };
 
-            scope.addNewQuestion = function(){
+
-            // $('#add_question_btn').on("click" , function(){
-                scope.addQuestion();
-                $('#add_question_btn').attr('disabled', 'disabled');
-                $('#add_question_btn').hide();
-            // });
-            };
             scope.submitQuestion = function(){
                 var form = SurveyQuestionForm,
                 data = {},
@@ -560,6 +685,9 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
 
                 try {
                     for (fld in form.fields) {
+                        if(fld==='required'){
+                            data[fld] = (scope[fld]===true) ? true : false;
+                        }
                         if(scope[fld]){
                             if(fld === "type"){
                                 data[fld] = scope[fld].type;
@@ -608,9 +736,13 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
                 Wait('start');
                 if(scope.mode==="add"){
                     $('#survey-modal-dialog').dialog('close');
+                    scope.survey_name = "";
+                    scope.survey_description = "";
                     scope.$emit('SurveySaved');
                 }
                 else{
+                    scope.survey_name = "";
+                    scope.survey_description = "";
                     url = GetBasePath('job_templates') + id + '/survey_spec/';
                     Rest.setUrl(url);
                     Rest.post({ name: scope.survey_name, description: scope.survey_description, spec: scope.survey_questions })

awx/ui/static/less/survey-maker.less

@@ -42,15 +42,35 @@
     position: relative;
     .final{
         margin-left: 15px;
+        margin-top: 5px;
+    }
+    .description{
+        margin-left: 15px;
     }
-
 }
 
+/*
+*.survey_taker_question_final{
+*   padding-top: 10px;
+*   border-top: 1px dashed;
+*  border-color: rgb(204,204,204);
+*  .final{
+*      margin-left: 30px;
+*      margin-bottom: 10px;
+*      margin-top: 5px;
+*  }
+*  .description{
+*      margin-left: 15px;
+*  }
+* }
+*/
+
 #new_question{
     margin-top: 5px;
 }
-question_actions{
+
-    opacity: 1.0;
+#survey_taker_description{
+    padding-bottom: 15px;
 }
 
 #add_question_btn{