Merge branch 'rails4' of https://github.com/expertiza/expertiza into …

…rails4

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

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
   #=========================================================================================================

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>

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>

config/routes.rb

@@ -254,6 +254,7 @@
       get :delete
       post :create_quiz_questionnaire
       post :update_quiz
+      post :add_new_questions
     end
   end