Merge pull request #2181 from alphagov/remove-multiple-question-per-page-code

Remove multiple question per page code

Author: floehopper

app/helpers/current_question_helper.rb

@@ -5,25 +5,17 @@ def calculate_current_question_path(presenter)
     smart_answer_path(attrs)
   end
 
-  def previous_response_key(question_number)
-    if question_number
-      previous_response_key = "previous_response_#{question_number}".to_sym
-    else
-      previous_response_key = :previous_response
-    end
-  end
-
-  def prefill_value_is?(value, question_number = nil)
-    if params[previous_response_key(question_number)]
-      params[previous_response_key(question_number)] == value
+  def prefill_value_is?(value)
+    if params[:previous_response]
+      params[:previous_response] == value
     elsif params[:response]
       params[:response] == value
     end
   end
 
-  def prefill_value_includes?(question, value, question_number = nil)
-    if params[previous_response_key(question_number)]
-      question.to_response(params[previous_response_key(question_number)]).include?(value)
+  def prefill_value_includes?(question, value)
+    if params[:previous_response]
+      question.to_response(params[:previous_response]).include?(value)
     elsif params[:response]
       params[:response].include?(value)
     end
@@ -33,11 +25,11 @@ def default_for_date(value)
     value.blank? ? nil : value.to_i
   end
 
-  def prefill_value_for(question, question_number = nil, attribute = nil)
-    response = if params[previous_response_key(question_number)]
-      question.to_response(params[previous_response_key(question_number)])
+  def prefill_value_for(question, attribute = nil)
+    if params[:previous_response]
+      response = question.to_response(params[:previous_response])
     elsif params[:response]
-      params[:response]
+      response = params[:response]
     end
     if !response.blank? && attribute
       begin

app/presenters/flow_presenter.rb

@@ -43,12 +43,6 @@ def current_state
     @current_state ||= @flow.process(all_responses)
   end
 
-  def collapsed_question_pages
-    collapsed_questions.map do |collapsed_question|
-      OpenStruct.new(questions: [collapsed_question])
-    end
-  end
-
   def collapsed_questions
     @flow.path(all_responses).map do |name|
       presenter_for(@flow.node(name))
@@ -85,10 +79,6 @@ def current_question_number
     current_state.path.size + 1
   end
 
-  def questions
-    (current_node.is_a? QuestionPresenter) ? [current_node] : []
-  end
-
   def current_node
     presenter_for(@flow.node(current_state.current_node))
   end

app/views/smart_answers/_collapsed_question.html.erb

@@ -1,55 +1,19 @@
-<%- if question_page.title -%>
-  <tr class="section">
-    <td class="section-title">
-      <%= question_page.title %>
-    </td>
-    <td>
-    </td>
-    <td class="link-right">
-      <% if question_page.questions.count == 1 %>
-        <%= link_to @presenter.change_collapsed_question_link(number_questions_so_far + 1) do %>
-          Change<span class="visuallyhidden"> answer to "<%=question_page.title%>"</span>
-        <% end %>
-      <% else %>
-        <%= link_to @presenter.change_collapsed_question_link(number_questions_so_far + 1, question_page.questions.count) do %>
-          Change<span class="visuallyhidden"> answer to "<%=question_page.title%>"</span>
-        <% end %>
-      <% end %>
-    </td>
-  </tr>
-<% end %>
-
-<% question_page.questions.each_with_index do |question, question_index|%>
-  <%- if !question_page.title -%>
-    <tr class="section">
-  <% else %>
-    <tr>
-  <% end %>
-    <td class="previous-question-title"><%= question.title %></td>
-    <%- if question.multiple_responses? -%>
-      <td class="previous-question-body"><ul>
-      <%- question.response_labels(@presenter.accepted_responses[number_questions_so_far + question_index]).each do |label| -%>
-        <li><%= label %></li>
-      <%- end -%>
-      </ul></td>
-    <%- else -%>
-      <td class="previous-question-body">
-      <%= question.response_label(@presenter.accepted_responses[number_questions_so_far + question_index]) %></td>
+<tr class="section">
+  <td class="previous-question-title"><%= question.title %></td>
+  <%- if question.multiple_responses? -%>
+    <td class="previous-question-body"><ul>
+    <%- question.response_labels(@presenter.accepted_responses[number_questions_so_far]).each do |label| -%>
+      <li><%= label %></li>
     <%- end -%>
+    </ul></td>
+  <%- else -%>
+    <td class="previous-question-body">
+    <%= question.response_label(@presenter.accepted_responses[number_questions_so_far]) %></td>
+  <%- end -%>
 
-    <%- if !question_page.title -%>
-      <td class="link-right">
-        <% if question_page.questions.count == 1 %>
-          <%= link_to @presenter.change_collapsed_question_link(number_questions_so_far + 1) do %>
-            Change<span class="visuallyhidden"> answer to "<%=question_page.questions.first.title%>"</span>
-          <% end %>
-        <% else %>
-          <%= link_to @presenter.change_collapsed_question_link(number_questions_so_far + 1, question_page.questions.count) do %>
-            <% titles = question_page.questions.map { |question| "\"#{question.title}\"" }.join(",") %>
-            Change<span class="visuallyhidden"> answer to <%=titles%></span>
-          <% end %>
-        <% end %>
-      </td>
+  <td class="link-right">
+    <%= link_to @presenter.change_collapsed_question_link(number_questions_so_far + 1) do %>
+      Change<span class="visuallyhidden"> answer to "<%= question.title %>"</span>
     <% end %>
-  </tr>
-<% end %>
+  </td>
+</tr>

app/views/smart_answers/_content.html.erb

@@ -20,13 +20,7 @@
     <div class="step current">
       <%= form_tag calculate_current_question_path(@presenter), :method => :get %>
         <div class="current-question" id="current-question">
-          <% if @presenter.questions.count > 1 %>
-            <% @presenter.questions.each_with_index do |question, question_index| %>
-              <%= render partial: "current_question", locals: {question: question, number: question_index + 1} %>
-            <% end %>
-          <% else %>
-            <%= render partial: "current_question", locals: {question: @presenter.questions.first, number: nil} %>
-          <% end %>
+          <%= render partial: "current_question", locals: { question: @presenter.current_node } %>
           <div class="next-question">
             <input type="hidden" name="next" value="1" />
             <button type="submit" class="medium button">Next step</button>
@@ -35,5 +29,5 @@
       </form>
     </div>
   <% end %>
-  <%= render "previous_answers", with_title: true %>
+  <%= render "previous_answers" %>
 <% end %>

app/views/smart_answers/_current_question.html.erb

@@ -1,8 +1,5 @@
 <div class="question">
   <h2>
-    <% if number %>
-      <span class="question-number"><%=number%> </span>
-    <% end %>
     <%= question.title %>
   </h2>
   <div class="question-body">
@@ -19,7 +16,7 @@
         </p>
       <% end %>
 
-      <%= render partial: question.partial_template_name, locals: { question: question, number: number } %>
+      <%= render partial: question.partial_template_name, locals: { question: question } %>
 
       <%= question.post_body %>
     </div>

app/views/smart_answers/_date_question.html.erb

@@ -1,18 +1,17 @@
 <fieldset>
-  <% response_prefix = number ? "response_#{number}" : "response" %>
   <% unless question.default_day %>
-    <label for="<%=response_prefix%>_day">Day
-      <%= select_day default_for_date(prefill_value_for(question, number, :day)), prefix: response_prefix, :prompt => '' %>
+    <label for="response_day">Day
+      <%= select_day default_for_date(prefill_value_for(question, :day)), prefix: "response", :prompt => '' %>
     </label>
   <% end %>
   <% unless question.default_month %>
-    <label for="<%=response_prefix%>_month">Month
-      <%= select_month default_for_date(prefill_value_for(question, number, :month)), prefix: response_prefix, prompt: '' %>
+    <label for="response_month">Month
+      <%= select_month default_for_date(prefill_value_for(question, :month)), prefix: "response", prompt: '' %>
     </label>
   <% end %>
   <% unless question.default_year %>
-    <label for="<%=response_prefix%>_year">Year
-      <%= select_year default_for_date(prefill_value_for(question, number, :year)), prefix: response_prefix, prompt: '', :start_year => question.start_date.year, :end_year => question.end_date.year %>
+    <label for="response_year">Year
+      <%= select_year default_for_date(prefill_value_for(question, :year)), prefix: "response", prompt: '', :start_year => question.start_date.year, :end_year => question.end_date.year %>
     </label>
   <% end %>
 </fieldset>

app/views/smart_answers/_multiple_choice_question.html.erb

@@ -3,17 +3,10 @@
 <ul class="<%= style %>">
   <% question.options.each.with_index do |option, i| %>
     <li>
-      <% if number %>
-        <label for="response_<%=number%>_<%= i %>" class="selectable">
-          <%= radio_button_tag "response_#{number}", option.value, prefill_value_is?(option.value, number), id: "response_#{number}_#{i}" %>
-          <%= option.label %>
-        </label>
-      <% else %>
-        <label for="response_<%= i %>" class="selectable">
-          <%= radio_button_tag "response", option.value, prefill_value_is?(option.value), id: "response_#{i}" %>
-          <%= option.label %>
-        </label>
-      <% end %>
+      <label for="response_<%= i %>" class="selectable">
+        <%= radio_button_tag "response", option.value, prefill_value_is?(option.value), id: "response_#{i}" %>
+        <%= option.label %>
+      </label>
     </li>
  <% end %>
 </ul>

app/views/smart_answers/_postcode_question.html.erb

@@ -1,4 +1,3 @@
-<% identifier = number ? "response_#{number}" : "response" %>
-<label for="<%= identifier %>"><%= question.hint %>
-  <%= text_field_tag(identifier, prefill_value_for(question, number)) %>
+<label for="response"><%= question.hint %>
+  <%= text_field_tag("response", prefill_value_for(question)) %>
 </label>

app/views/smart_answers/_previous_answers.html.erb

@@ -1,24 +1,19 @@
 <% if @presenter.current_question_number > 1 %>
-  <div class="previous-answers <%= "previous-answers-top" unless with_title %>">
+  <div class="previous-answers">
     <div class="done-questions">
       <article>
-          <% if with_title %>
-            <h3 class="previous-answers-title">
-              Previous answers
-            </h3>
-          <% end %>
+          <h3 class="previous-answers-title">
+            Previous answers
+          </h3>
           <%= link_to "Start again", smart_answer_path(params[:id]), :class => "start-right" %>
         <table>
           <tbody>
-            <% number_questions_so_far = 0 %>
-            <% @presenter.collapsed_question_pages.each do |question_page| %>
-              <%= render partial: "collapsed_question", locals: {question_page: question_page, number_questions_so_far: number_questions_so_far} %>
-              <% number_questions_so_far += question_page.questions.count %>
+            <% @presenter.collapsed_questions.each_with_index do |question, number_questions_so_far| %>
+              <%= render partial: "collapsed_question", locals: {question: question, number_questions_so_far: number_questions_so_far} %>
             <% end %>
           </tbody>
         </table>
       </article>
     </div>
   </div>
 <% end %>
-

app/views/smart_answers/_salary_question.html.erb

@@ -1,11 +1,10 @@
 <fieldset>
-  <% response_prefix = number ? "response_#{number}" : "response" %>
   <label for="response_amount">
-    &pound; <%= text_field_tag(response_prefix+"[amount]", nil, size: 5, value: prefill_value_for(question, number, :amount)) %>
+    &pound; <%= text_field_tag("response[amount]", nil, size: 5, value: prefill_value_for(question, :amount)) %>
   </label>
   <label for="response_period">
-  per <select name="<%=response_prefix%>[period]">
-    <%= options_for_select %w{week month year}, prefill_value_for(question, number, :period) %>
+  per <select name="response[period]">
+    <%= options_for_select %w{week month year}, prefill_value_for(question, :period) %>
   </select>
   </label>
 </fieldset>

app/views/smart_answers/_text_question.html.erb

@@ -1,4 +1,3 @@
-<% identifier = number ? "response_#{number}" : "response" %>
-<label for="<%= identifier %>"><%= question.hint %>
-  <%= text_field_tag(identifier, prefill_value_for(question)) %>
+<label for="response"><%= question.hint %>
+  <%= text_field_tag("response", prefill_value_for(question)) %>
 </label>