1.Use more reasonable partial names related to questionnaires;

2.Remove duplicate code.

app/controllers/questionnaires_controller.rb

@@ -111,15 +111,6 @@ def create_questionnaire
     end
   end
 
-  def select_questionnaire_type
-    @questionnaire = Object.const_get(params[:questionnaire][:type]).new(params[:questionnaire])
-    @questionnaire.private = params[:questionnaire][:private]
-    @questionnaire.min_question_score = params[:questionnaire][:min_question_score]
-    @questionnaire.max_question_score = params[:questionnaire][:max_question_score]
-    @questionnaire.id = params[:questionnaire][:id]
-    @questionnaire.display_type = params[:questionnaire][:display_type]
-  end
-
   def create
     @questionnaire = Object.const_get(params[:questionnaire][:type]).new(params[:questionnaire])
     if (session[:user]).role.name == "Teaching Assistant"
@@ -164,6 +155,28 @@ def update
     end
   end
 
+  # Remove a given questionnaire
+  def delete
+    @questionnaire = Questionnaire.find(params[:id])
+
+    if @questionnaire
+      begin
+        name = @questionnaire.name
+
+        @questionnaire.assignments.each{
+          | assignment |
+          raise "The assignment #{assignment.name} uses this questionnaire. Do you want to <A href='../assignment/delete/#{assignment.id}'>delete</A> the assignment?"
+        }
+        @questionnaire.destroy
+        undo_link("Questionnaire \"#{name}\" has been deleted successfully. ")
+      rescue
+        flash[:error] = $!
+      end
+    end
+
+    redirect_to :action => 'list', :controller => 'tree_display'
+  end
+
   def edit_advice  ##Code used to be in this class, was removed.  I have not checked the other class.
     redirect_to :controller => 'advice', :action => 'edit_advice'
   end

app/views/questionnaires/_questionnaire.html.erb

@@ -9,12 +9,13 @@
     </td>
   </tr>
 </table>
-
-<% if @questionnaire.type == 'QuizQuestionnaire' %>        <!--handle a questionnaire differently if it is a quiz-->
+<br/>
+<% if @questionnaire.type == 'QuizQuestionnaire' %>        
+<!--handle a questionnaire differently if it is a quiz-->
   <table id="questions_table">
     <% if $disp_flag != 1 %>
       <tr>
-        <td align=left width=300>1111Questions:</td>
+        <td align=left width=300>Questions:</td>
         <%  if @questionnaire.type != 'QuizQuestionnaire' %><td align=left>weight</td><%end%>
 
       </tr>
@@ -65,7 +66,7 @@
     <% end %>
   </table>
 <% else %>
-     <table>
+    <table>
        <tr>
          <td>Min question score:</td>
          <td><%= text_field 'questionnaire', 'min_question_score', :size=> 1 %>&nbsp;&nbsp;</td>
@@ -75,9 +76,7 @@
          <td><%= select(:questionnaire, :private, [ ['no', false],['yes',  true]])%>
          </td>
        </tr>
-     </table>
-     <br/>
-
+    </table>
     <table id="question_actions_table">
       <tr>
         <td>
@@ -89,8 +88,8 @@
         <td ><input type="button" value="Delete selected questions" onclick= "deleteQuestions()"></td>
       </tr>
     </table>
+    <hr/>
      <table id="questions_table">
-       <%# if @questionnaire.questions.length > 0 %>
        <tr>
          <td align=left width=30>Delete</td>
          <td align=center width=30>Seq</td>

app/views/questionnaires/edit.html.erb

@@ -1,4 +1,3 @@
-<%#= render :partial => 'scripts' %>
 <h1>Edit <%= @questionnaire.display_type %></h1>
 
 <% if @questionnaire.type == "QuizQuestionnaire" %>
@@ -18,9 +17,6 @@
     <%= submit_tag "Save #{@questionnaire.display_type.downcase} questionnaire", :name=>"save" %>
     <input style="margin-left:36em" type="submit" name="view_advice" value="Edit/View advice"/>
 
-
-    <%# if @questionnaire.section != "Custom" %>
-
     <h4>Import/Export (from/to CSV format)</h4>
     <input type="file" name="csv" />
     <font size="-1"&nbsp;&nbsp; Format: {question}, {'Numeric' | 'True/False'}, {1-5} ></font>
@@ -30,7 +26,6 @@
 
     <%= submit_tag "Export questions to CSV", :name=>"export" %>
 
-    <%# end %>
     <br />
   <% end %>
   <br />

app/views/questionnaires/new.html.erb

@@ -1,21 +1,12 @@
-<div id="Selection">
-  <table><tr>
-      <td>Select Questionnaire Type</td>
-      <td>
-        <%= form_tag :action => 'select_questionnaire_type'  do %>
-          <%= hidden_field 'questionnaire', 'id' %>
-          <%= hidden_field 'questionnaire', 'private' %>
-          <%= hidden_field 'questionnaire', 'type' %>
-          <%= hidden_field 'questionnaire', 'display_type' %>
-          <%= hidden_field 'questionnaire', 'min_question_score' %>
-          <%= hidden_field 'questionnaire', 'max_question_score' %>
-          <%= select 'questionnaire' , 'section' ,
-            [['Regular',"Regular"], ['Extra Credit', "Extra"],['Custom Rubric', "Custom"]] %>
-          <%= submit_tag "Select", :name=>"select_questionnaire_type" %>
-        <% end %>
-      </td>
+  <%= render :partial => 'add_and_delete_question_script' %>
+  <%= form_tag :action => 'create' do %>
+    <%= render :partial => 'questionnaire' %>
+    <%= submit_tag "Create #{@questionnaire.display_type.downcase}", :name=>"save" %>
 
-
-    </tr>
-  </table>
-</div>
+    <script>
+      for (var x = 1; x <= 5; x++) {
+        addQuestion(",",",",",");}
+    </script>
+  <% end %>
+  <br />
+  <a href="javascript:window.history.back()">Back</a>

app/views/questionnaires/new_quiz.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'javascript' %>
+<%= render :partial => 'new_quiz_script' %>
 <h1>New <%= @questionnaire.display_type %></h1>
 <% if @questionnaire.type == "QuizQuestionnaire" %>    <!--handle a questionnaire differently if it is a quiz-->
     <%= form_tag :action => 'create_quiz_questionnaire', :pid => @participant_id, :aid => @assignment_id do %>