From fcf09c31238c70cdb6a5a742d6c7b7b80f2442fe Mon Sep 17 00:00:00 2001
From: Winbobob <zhu6@ncsu.edu>
Date: Sun, 23 Aug 2015 18:25:37 -0400
Subject: [PATCH] Fix bug: instructor cannot add questions from view.

---
 app/controllers/questionnaires_controller.rb  |   7 +
 .../_add_and_delete_question_script.html.erb  | 279 ------------------
 .../questionnaires/_questionnaire.html.erb    |  22 +-
 app/views/questionnaires/new.html.erb         |   6 -
 config/routes.rb                              |   1 +
 5 files changed, 28 insertions(+), 287 deletions(-)
 delete mode 100644 app/views/questionnaires/_add_and_delete_question_script.html.erb

diff --git a/app/controllers/questionnaires_controller.rb b/app/controllers/questionnaires_controller.rb
index 94862a93072..a0b24e251d7 100644
--- a/app/controllers/questionnaires_controller.rb
+++ b/app/controllers/questionnaires_controller.rb
@@ -202,6 +202,13 @@ def toggle_access
     redirect_to :controller => 'tree_display', :action => 'list'
   end
 
+  #Zhewei: This method is used to add new questions when creating or editing questionnaire.
+  def add_new_questions
+    (1..params[:question][:total_num].to_i).each do |i|
+      Object.const_get(params[:question][:type]).create(id: Question.last.id+1, txt: 'Edit question content here', weight: 1, questionnaire_id: params[:id], seq: 0, type: params[:question][:type], break_before: true)
+    end
+    redirect_to edit_questionnaire_path(params[:id].to_sym)
+  end
   #=========================================================================================================
   #Separate methods for quiz questionnaire
   #=========================================================================================================
diff --git a/app/views/questionnaires/_add_and_delete_question_script.html.erb b/app/views/questionnaires/_add_and_delete_question_script.html.erb
deleted file mode 100644
index 3f32554bac4..00000000000
--- a/app/views/questionnaires/_add_and_delete_question_script.html.erb
+++ /dev/null
@@ -1,279 +0,0 @@
-<script type="text/javascript">
-  num_questions = <%= [@questionnaire.questions.length,1].max %>;
-num_choices = 1;
-choice_id = 1;
-
-var aMail = new Array();
-<% questionnaires = Questionnaire.where(type: @questionnaire.type) %>
-<% for que in questionnaires %>
- <% all_questions = Question.where(questionnaire_id: que.id).map {|n| n.txt} %>
-<% for q in all_questions %>
- aMail.push(<%= q.to_json.html_safe %>);
-<% end %>
-<% end %>
-aMail.sort();
-
-function deleteQuestions(){
-  var checkedObjArray = new Array();
-  var deleteCount = 0;
-  var tbl = document.getElementById("questions_table");
-  var numChecks = 0;
-  for(i=0; i<document.forms[0].elements.length; i++){
-    if(document.forms[0].elements[i].type=="checkbox" &&
-       document.forms[0].elements[i].id.substring(0,12)=="question_chk"){
-         numChecks++;
-         if(document.forms[0].elements[i].checked==true){
-           tbl.deleteRow(numChecks);
-           numChecks = 0;
-           deleteQuestions();
-         }
-       }
-  }
-}
-
-function addQuestions(){
-  <% if @questionnaire.type == "QuizQuestionnaire" %>
- numQuestionsToAdd = 1;
-  <% else %>
- numQuestionsToAdd = parseInt(document.getElementById("numQuestionsToAdd").value);
-  <% end %>
-    for(i=0; i<numQuestionsToAdd; i++){
-
-
-
-      addQuestion("","","");
-    }
-}
-
-function addQuestion(in_str, parameter_str, type_str){
-  qtype =  document.getElementById("section").value;
-    table = document.getElementById("questions_table");
-    var row = table.insertRow(-1);
-    id = num_questions;
-    <% if @questionnaire.type != 'QuizQuestionnaire' %>
- column = document.createElement("td");
-    column.innerHTML = "<center><input type=checkbox id='question_chk" + num_questions + "'></center>";
-    row.appendChild(column);
-  <% end %>
-    column = document.createElement("td");
-    column.innerHTML = "<center><input type=checkbox id='question_chk" + num_questions + "'></center>";
-    row.appendChild(column);
-
-    column = document.createElement("td");
-    column.innerHTML = "<input  onkeyup='Complete(this, event)' id=new_question_" + id + "_txt name=new_question[" + id + "][txt] size=70 type=text value='" + in_str + "'>";
-    row.appendChild(column);
-
-    column = document.createElement("td");
-
-    if (qtype == "Custom"){
-      gradingTypes = "<select id=question_" + id + "_true_false name=question_type["+id+"][type]>"
-
-      <% for type in Question::GRADING_TYPES_CUSTOM %>
- gradingTypes += '<option value=' + '<%= type[0].to_s %>' + '>' + '<%= type[0].to_s %>' + '</option>';
-
-    <% end %>
-        //gradingTypes += "<option selected=selected value="+type_str+">"+type_str+"</option>";
-        //document.getElementById("question_" + id + "_true_false").defaultSelected("TextField");
-    }else{
-      gradingTypes = "<select id=question_" + id + "_true_false name=new_question[" + id + "][true_false]>";
-      <% for type in Question::GRADING_TYPES %>
- <%= ("gradingTypes += '<option value=" + type[1].to_s + ">" + type[0].to_s + "</option>';").html_safe %>
-    <% end %>
-    }
-    gradingTypes += "</select>"
-    column.innerHTML = gradingTypes;
-    row.appendChild(column);
-
-    if (qtype == "Custom"){
-      column = document.createElement("td");
-        column.innerHTML = "<input id=new_question" + id + "_txt name=question_type["+id+"][parameters] size=30 type=text value='"+parameter_str+"' />";
-        row.appendChild(column);
-    }
-
-    column = document.createElement("td");
-    weights = "<select id=new_question_" + id + "_weight name=new_question[" + id +"][weight]>";
-  <% for weight in Question::WEIGHTS %>
- <%= ("weights += '<option value=" + weight[1].to_s + ">" + weight[0].to_s + "</option>';").html_safe %>
-<% end %>
-    weights = weights + "</select>";
-    column.innerHTML = weights;
-    row.appendChild(column);
-    <% if @questionnaire.type == 'QuizQuestionnaire' %>  //add choices in the view if it is a quiz questionnaire
-        <% if @questionnaire.quiz_question_type == "Multiple Choice - radio" %> // if the question is multiple choice - radio
-            for(i = 1; i < 5; i++) {
-              var row_for_choices = table.insertRow(-1);
-              cid = i;
-              column = document.createElement("td");
-              column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40     type=text/>";
-              row_for_choices.appendChild(column);
-            }
-    column = document.createElement("td");
-    weights = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<select id=new_choices_" + cid + "_weight name=new_choices[" + id + "][" + cid + "][weight]>";
-    //Listing the options for a quiz questionnaire
-    <% for weight in Question::ANSWERS %>
-      <%= "weights += '<option value=".html_safe + weight[1].to_s + ">".html_safe + weight[0].to_s + "</option>';".html_safe%>
-    <% end %>
-
-    weights = weights + "</select>";
-    column.innerHTML = weights;
-    row_for_choices.appendChild(column);
-    <% elsif @questionnaire.quiz_question_type == "Multiple Choice - checked" %>   // if the question is multiple choice - checked
- for(i = 1; i < 5; i++) {
-   var row_for_choices = table.insertRow(-1);
-        cid = i;
-        column = document.createElement("td");
-        column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40     type=text/>";
-        row_for_choices.appendChild(column);
-
-        column = document.createElement("td");
-        weights = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<select id=new_choices_" + cid + "_weight name=new_choices[" + id + "][" + cid + "][weight]>";
-        //Listing the options for a quiz questionnaire
-        <% for weight in Question::ANSWERS_MCQ_CHECKED %>
- <%= "weights += '<option value=".html_safe + weight[1].to_s + ">".html_safe + weight[0].to_s + "</option>';".html_safe%>
-        <% end %>
-
-        weights = weights + "</select>";
-        column.innerHTML = weights;
-        row_for_choices.appendChild(column);
- }
-    <% elsif @questionnaire.quiz_question_type == "Essay" %>   // if the question is essay
- column = document.createElement("td");
-    cid = 1;
-    column.innerHTML = "&nbsp;&nbsp;&nbsp;&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40 type=text/>";
-    row.appendChild(column);
-
-    for(i = 1; i < 1; i++) {
-      var row_for_choices = table.insertRow(-1);
-        cid = i;
-        //column = document.createElement("td");
-        //column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40     type=text/>";
-        //row_for_choices.appendChild(column);
-
-        column = document.createElement("td");
-        //Listing the options for a quiz questionnaire
-
-
-        weights = weights + "</select>";
-        column.innerHTML = weights;
-        row_for_choices.appendChild(column);
-    }
-    <% elsif @questionnaire.quiz_question_type == "True False" %>   // if the question is true/false
- for(i = 1; i <3; i++) {
-   var row_for_choices = table.insertRow(-1);
-        cid = i;
-        column = document.createElement("td");
-        if(i == 1)
-          //column.innerHTML = "<b>TRUE</b>";
-            column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40 type=text readonly value='TRUE' />";
-        else
-          //column.innerHTML = "<b>FALSE</b>";
-            column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40 type=text readonly value='FALSE' />";
-
-        row_for_choices.appendChild(column);
- }
-    column = document.createElement("td");
-    weights = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<select id=new_choices_" + cid + "_weight name=new_choices[" + id + "][" + cid + "][weight]>";
-    //Listing the options for a quiz questionnaire
-    <% for weight in Question::ANSWERS_TRUE_FALSE %>
-      <%= "weights += '<option value=".html_safe + weight[1].to_s + ">".html_safe + weight[0].to_s + "</option>';".html_safe%>
-    <% end %>
-
-    weights = weights + "</select>";
-    column.innerHTML = weights;
-    row_for_choices.appendChild(column);
-    <% else %> //default
- for(i = 1; i < 5; i++) {
-   var row_for_choices = table.insertRow(-1);
-        cid = i;
-        column = document.createElement("td");
-        column.innerHTML = "&nbsp;&nbsp;&nbsp;" + i + ".&nbsp; <input id=new_choices_" + cid + "_txt name=new_choices[" + id + "][" + cid + "][txt] size=40     type=text/>";
-        row_for_choices.appendChild(column);
- }
-    column = document.createElement("td");
-    weights = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<select id=new_choices_" + cid + "_weight name=new_choices[" + id + "][" + cid + "][weight]>";
-    //Listing the options for a quiz questionnaire
-    <% for weight in Question::ANSWERS %>
- <%  %>
-    <%#= "weights += '<option value=" + weight[1].to_s + ">" + weight[0].to_s + "</option>';"%>
-    <% end %>
-
-    weights = weights + "</select>";
-    column.innerHTML = weights;
-    row_for_choices.appendChild(column);
-    <% end %>   //end of if @questionnaire.quiz_question_type
-    <% else %>  //not quiz questionnaire
- column = document.createElement("td");
-    gradingTypes = "<select id=question_" + id + "_true_false name=new_question[" + id + "][true_false]>";
-    <% for type in Question::GRADING_TYPES %>
-      <%= "gradingTypes += '<option value=".html_safe + type[1].to_s + ">".html_safe + type[0].to_s + "</option>';".html_safe%>
-    <% end %>
-    gradingTypes += "</select>"
-    column.innerHTML = gradingTypes;
-    row.appendChild(column);
-
-    column = document.createElement("td");
-    weights = "<select id=new_question_" + id + "_weight name=new_question[" + id + 		"][weight]>";
-
-    <% for weight in Question::WEIGHTS %>
- <%= "weights += '<option value=".html_safe + weight[1].to_s + ">".html_safe + weight[0].to_s + "</option>';".html_safe%>
-    <% end %>
-    weights = weights + "</select>";
-    column.innerHTML = weights;
-    row.appendChild(column);
-    <% end %>
-    num_questions = num_questions + 1;
-}
-
-function Complete(obj, evt) {
-  if ((!obj) || (!evt) || (aMail.length == 0)) {
-    return;
-  }
-
-    if (obj.value.length == 0) {
-      return;
-    }
-
-    var elm = (obj.setSelectionRange) ? evt.which : evt.keyCode;
-
-    if ((elm < 32) || (elm >= 33 && elm <= 46) || (elm >= 112 && elm <= 123)) {
-      return;
-    }
-
-    var txt = obj.value;
-    elm = txt.split("?");
-    txt = elm.pop();
-    txt = txt.replace(/^\s*/, "");
-
-    if (txt.length == 0) {
-      return;
-    }
-
-    if (obj.createTextRange) {
-      var rng = document.selection.createRange();
-        if (rng.parentElement() == obj) {
-          elm = rng.text;
-            var ini = obj.value.lastIndexOf(elm);
-        }
-    } else if (obj.setSelectionRange) {
-      var ini = obj.selectionStart;
-    }
-
-    for (var i = 0; i < aMail.length; i++) {
-      elm = aMail[i].toString();
-
-        if (elm.toLowerCase().indexOf(txt.toLowerCase()) == 0) {
-          obj.value += elm.substring(txt.length, elm.length);
-            break;
-        }
-    }
-
-    if (obj.createTextRange) {
-      rng = obj.createTextRange();
-        rng.moveStart("character", ini);
-        rng.moveEnd("character", obj.value.length);
-        rng.select();
-    } else if (obj.setSelectionRange) {
-      obj.setSelectionRange(ini, obj.value.length);
-    }
-}
-</script>
diff --git a/app/views/questionnaires/_questionnaire.html.erb b/app/views/questionnaires/_questionnaire.html.erb
index 6a27c75a33f..abdb4458ea7 100644
--- a/app/views/questionnaires/_questionnaire.html.erb
+++ b/app/views/questionnaires/_questionnaire.html.erb
@@ -80,8 +80,26 @@
     <table id="question_actions_table">
       <tr>
         <td>
-          <input type="button" value="Add" onclick="addQuestions()">
-          <input id="numQuestionsToAdd" type="text" value="1" size=1> more question(s)
+        <!--Zhewei: the reason why we put an empty form_tag here: https://github.com/expertiza/expertiza/blob/53212b6967e9b2d6362d91846bc268ecf1750c6b/app/views/sign_up_sheet/_add_signup_topics_staggered.html.erb-->
+          <%= form_tag :action => 'add_new_questions' do %>
+          <% end %> 
+          <%= form_tag :action => 'add_new_questions', :id => params[:id] do %>
+            <%= submit_tag 'Add' %>
+            <%= text_field 'question', 'total_num', :size => 1, :value => "1" %> more 
+            <%= select "question", "type", 
+                {"Criterion" =>"Criterion",
+                 "Scale"=>"Scale",
+                 "Dropdown"=>"Dropdown",
+                 "MultipleChoice"=>"MultipleChoice",
+                 "Checkbox"=>"Checkbox",
+                 "TextArea"=>"TextArea",
+                 "TextField"=>"TextField",
+                 "UploadFile"=>"UploadFile",
+                 "SectionHeader"=>"SectionHeader",
+                 "TableHeader"=>"TableHeader",
+                 "ColumnHeader"=>"ColumnHeader",
+                 } %> question(s)
+           <% end %> 
         </td>
       </tr>
     </table>
diff --git a/app/views/questionnaires/new.html.erb b/app/views/questionnaires/new.html.erb
index 15b395de234..0d818c97d46 100644
--- a/app/views/questionnaires/new.html.erb
+++ b/app/views/questionnaires/new.html.erb
@@ -1,12 +1,6 @@
-  <%= render :partial => 'add_and_delete_question_script' %>
   <%= form_tag :action => 'create' do %>
     <%= render :partial => 'questionnaire' %>
     <%= submit_tag "Create #{@questionnaire.display_type.downcase}", :name=>"save" %>
-
-    <script>
-      for (var x = 1; x <= 5; x++) {
-        addQuestion(",",",",",");}
-    </script>
   <% end %>
   <br />
   <a href="javascript:window.history.back()">Back</a>
diff --git a/config/routes.rb b/config/routes.rb
index c41fdb74280..2fbdc8645cc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -254,6 +254,7 @@
       get :delete
       post :create_quiz_questionnaire
       post :update_quiz
+      post :add_new_questions
     end
   end