summary page rebuild

2016-08-09 23:17:35 -05:00
parent 084a1a2326
commit 76bb21a150
17 changed files with 141 additions and 258 deletions
--- a/app/views/quiz/_answer_errors.html.erb
+++ b/app/views/quiz/_answer_errors.html.erb
@ -1,4 +1,4 @@
-<% if flash[:answer_error] == question.question_id && answer.present? %>
+<% if flash[:error] == question.question_id && answer.try(:errors) %>
  <% answer.errors.messages[:answer].each do |message| %>
    <div class="error"><%= message %></div>
  <% end %>
--- a/app/views/quiz/_checkbox.html.erb
+++ b/app/views/quiz/_checkbox.html.erb
@ -1,18 +1,18 @@
-<%
-  question.input_options.each_with_index do | option, i |
-  option_id = "#{question.question_id}_#{i}"
+<% question.input_options.each_with_index do | option, i |
+    option_id = "#{question.question_id}_#{i}"

-  checkbox_html = {class: 'checkbox',
-                      id: "answer_#{option_id}",
-                    name: "answer[checkbox][]",
-                 checked: Array(question.answer).include?(option)
-                  }
-  answers = answer.try(:answer) || answer
-%>
-  <div class="form-group-multiples">
-    <%= form.check_box(:answer, checkbox_html, option, '') %>
-    <%= form.label(option_id, option) %>
-  </div>
+    checkbox_html = {class: 'checkbox',
+                        id: "answer_#{option_id}",
+                      name: "answer[checkbox][]",
+                   checked: Array(question.answer).include?(option),
+                      data: { last: Array(question.answer).include?(option) ? 'checked' : '' }
+                    }
+    answers = answer.try(:answer) || answer
+  %>
+    <div class="form-group-multiples">
+      <%= form.check_box(:answer, checkbox_html, option, '') %>
+      <%= form.label(option_id, option) %>
+    </div>
 <% end %>

 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
--- a/app/views/quiz/_live_code.html.erb
+++ b/app/views/quiz/_live_code.html.erb
@ -5,7 +5,6 @@
                    name: "answer[#{question.input_type}][later]",
                 checked: Array(question.answer).include?('finish-later')
                  }
-  disabled = local_assigns.fetch :disable_input, false
  answers = answer.try(:answer) || answer
 %>

@ -31,17 +30,17 @@
 <div id="answer<%= question.question_id %>" data-id="live-coder-answer" style="display: none;">
  <div class="code-input">
    <label for="answer_live_code_html">HTML</label>
-    <%= text_area_tag 'answer[live_code][html]', (answers['html']), { disabled: disabled, 'data-id' => 'code-html', class: 'code-answer code-html' } %>
+    <%= text_area_tag 'answer[live_code][html]', (answers['html']), { data: {id: 'code-html', last: answers['html'] }, class: 'code-answer code-html' } %>
  </div>

  <div class="code-input">
    <label for="answer_live_code_css">CSS</label>
-    <%= text_area_tag 'answer[live_code][css]', (answers['css']), { disabled: disabled, 'data-id' => 'code-css', class: 'code-answer code-css' } %>
+    <%= text_area_tag 'answer[live_code][css]', (answers['css']), { data: {id: 'code-css', last: answers['css']}, class: 'code-answer code-css' } %>
  </div>

  <div class="code-input">
    <label for="answer_live_code_js">JS</label>
-    <%= text_area_tag 'answer[live_code][js]', (answers['js']), { disabled: disabled, 'data-id' => 'code-js', class: 'code-answer code-js' } %>
+    <%= text_area_tag 'answer[live_code][js]', (answers['js']), { data: {id: 'code-js', last: answers['js']}, class: 'code-answer code-js' } %>
  </div>

  <div class="results" data-id="results"></div>
--- a/app/views/quiz/_live_code_text.html.erb
+++ b/app/views/quiz/_live_code_text.html.erb
@ -5,7 +5,6 @@
                    name: "answer[#{question.input_type}][later]",
                 checked: Array(question.answer).include?('finish-later')
                  }
-  disabled = local_assigns.fetch :disable_input, false
  answers = answer.try(:answer) || answer
 %>

@ -30,21 +29,21 @@

 <div id="answer<%= question.question_id %>" data-id="live-coder-answer" style="display: none;">
  <label for="answer_live_code_text">Reasoning</label>
-  <%= text_area_tag 'answer[live_code_text][text]', (answers['text']) %>
+  <%= text_area_tag 'answer[live_code_text][text]', (answers['text']), {data: {last: answers['text']}} %>

  <div class="code-input">
    <label for="answer_live_code_html">HTML</label>
-    <%= text_area_tag 'answer[live_code_text][html]', (answers['html']), { disabled: disabled, 'data-id' => 'code-html', class: 'code-answer code-html' } %>
+    <%= text_area_tag 'answer[live_code_text][html]', (answers['html']), { data: {id: 'code-html', last: answers['html']}, class: 'code-answer code-html' } %>
  </div>

  <div class="code-input">
    <label for="answer_live_code_css">CSS</label>
-    <%= text_area_tag 'answer[live_code_text][css]', (answers['css']), { disabled: disabled, 'data-id' => 'code-css', class: 'code-answer code-css' } %>
+    <%= text_area_tag 'answer[live_code_text][css]', (answers['css']), { data: {id: 'code-css', last: answers['css']}, class: 'code-answer code-css' } %>
  </div>

  <div class="code-input">
    <label for="answer_live_code_js">JS</label>
-    <%= text_area_tag 'answer[live_code_text][js]', (answers['js']), { disabled: disabled, 'data-id' => 'code-js', class: 'code-answer code-js' } %>
+    <%= text_area_tag 'answer[live_code_text][js]', (answers['js']), { data: {id: 'code-js', last: answers['js']}, class: 'code-answer code-js' } %>
  </div>

  <div class="results" data-id="results"></div>
--- a/app/views/quiz/_radio.html.erb
+++ b/app/views/quiz/_radio.html.erb
@ -1,13 +1,12 @@
-<%
-  question.input_options.each do | option |
-  option_id = "#{option.parameterize}_#{question.to_i}"
-  radio_html = {class: 'radio', id: option_id}
-  answers = answer.try(:answer) || answer
-%>
-  <div class="form-group-multiples">
-    <%= radio_button_tag('answer[radio]', option, (question.answer == option), radio_html) %>
-    <%= label_tag(option_id, option) %>
-  </div>
+<% question.input_options.each do | option |
+    option_id = "#{option.parameterize}_#{question.to_i}"
+    radio_html = {class: 'radio', id: option_id, data: {last: (question.answer == option) ? 'checked' : '' }}
+    answers = answer.try(:answer) || answer
+  %>
+    <div class="form-group-multiples">
+      <%= radio_button_tag('answer[radio]', option, (question.answer == option), radio_html) %>
+      <%= label_tag(option_id, option) %>
+    </div>
 <% end %>

 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
--- a/app/views/quiz/_text.html.erb
+++ b/app/views/quiz/_text.html.erb
@ -1,11 +1,10 @@
 <%
-  hidden = params[:action] == 'summary' ? 'hidden' : ''
  answers = answer.try(:answer) || answer
 %>

 <label for="answer_text">Enter answer here</label>
-<textarea id="answer_text" name="answer[text]" rows="10"><%= answers %></textarea>
+<%= text_area_tag 'answer[text]', answers, {rows: 10, data: { last: answers } } %>

-<div class="chars <%= hidden %>">Characters remaining: <span></span></div>
+<div class="chars <%= params[:action] == 'summary' ? 'hidden' : '' %>">Characters remaining: <span></span></div>

 <%= render partial: "quiz/answer_errors", locals: {question: question, answer: answer} %>
--- a/app/views/quiz/summary.html.erb
+++ b/app/views/quiz/summary.html.erb
@ -14,14 +14,14 @@
  <hr>

  <% @quiz.each do |question| %>
-    <%= form_for(:answer, url: post_answer_path(answer_id: question.answer_id), html:{class: 'summary-form'}) do |form| %>
-      <article class="answer-sec <%= question.input_type %>-type" data-qid="<%= question.question_id %>">
+    <%= form_for(:answer, remote: true, url: post_answer_path(answer_id: question.answer_id), html:{class: 'summary-form'}) do |form| %>
+      <article class="answer-sec">
        <div class="question-heading">
          <div class="question-title">
            <h3><%= question.question %></h3>
          </div>
          <div class="answer-buttons">
-            <a href="<%= question_path(question.question_id) %>" class="tertiary-btn button-edit" data-answerId="<%= question.answer_id %>" data-questionId="<%= question.question_id %>">Edit</a>
+            <a href="<%= question_path(question.question_id) %>" class="tertiary-btn button-edit">Edit</a>
            <button class="tertiary-btn button-save">Save</button>
            <button class="tertiary-btn button-cancel">Cancel</button>
          </div>
@ -35,7 +35,8 @@
          <fieldset disabled class="answer-block">
            <%= hidden_field_tag 'answer[question_id]', question.question_id %>
            <%= hidden_field_tag 'answer[answer_id]', question.answer_id %>
-            <%= render partial: question.input_type, locals: {question: question, form: form, answer: question.answer, disable_input: true} %>
+            <%= hidden_field_tag 'submit', true %>
+            <%= render partial: question.input_type, locals: {question: question, form: form, answer: question.answer} %>
          </fieldset>
        </div>
      </article>
--- a/app/views/review/view.html.erb
+++ b/app/views/review/view.html.erb
@ -7,7 +7,7 @@
  </p>

  <% @quiz.each do |question| %>
-    <%= form_for(:answer, url: post_summary_path, html:{id: 'summary-form'}) do |form| %>
+    <%= form_for(:answer, url: '#never-post', html:{id: 'summary-form'}) do |form| %>
      <article class="answer-sec <%= question.input_type %>-type" data-qid="<%= question.question_id %>">
        <div class="question-heading">
          <div class="question-title">
@ -20,7 +20,6 @@
            <%= image_tag question.attachment %>
          <% end %>
          <fieldset disabled class="answer-block">
-            <%= hidden_field_tag 'answer[question_id]', question.question_id %>
            <%= render partial: "quiz/#{question.input_type}", locals: {question: question, answer: question.answer, form: form} %>
          </fieldset>
        </div>