consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes for Poll Question Answer ordering

Browse Source
This commit is contained in:
Bertocq
2017-10-11 12:05:20 +02:00
parent 5ff0047c9f
commit 34c278db74
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/polls_controller.rb
View File

@@ -15,6 +15,7 @@ class PollsController < ApplicationController
def show def show
@questions = @poll.questions.for_render.sort_for_list @questions = @poll.questions.for_render.sort_for_list
@token = poll_voter_token(@poll, current_user) @token = poll_voter_token(@poll, current_user)
@poll_questions_answers = Poll::Question::Answer.where(question: @poll.questions)
@answers_by_question_id = {} @answers_by_question_id = {}
poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id)) poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id))

5
app/models/poll/question/answer.rb
View File

@@ -25,11 +25,10 @@ class Poll::Question::Answer < ActiveRecord::Base
end end
def set_order def set_order
next_position = self.class.last_position(question_id) + 1 self.given_order = self.class.last_position(question_id) + 1
self.given_order = next_position
end end
def self.last_position(question_id) def self.last_position(question_id)
where(question_id: question_id).maximum("given_order") || 0 where(question_id: question_id).maximum('given_order') || 0
end end
end end

6
app/views/polls/show.html.erb
View File

@@ -79,7 +79,7 @@
<div class="expanded poll-more-info-answers"> <div class="expanded poll-more-info-answers">
<div class="row padding"> <div class="row padding">
<% @poll.questions.map(&:question_answers).flatten.each do |answer| %> <% @poll_questions_answers.each do |answer| %>
<div class="small-12 medium-6 column end" id="answer_<%= answer.id %>" <div class="small-12 medium-6 column end" id="answer_<%= answer.id %>"
data-toggler="medium-6 answer-divider"> data-toggler="medium-6 answer-divider">
@@ -128,7 +128,7 @@
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
@@ -138,4 +138,4 @@
<div class="tabs-panel is-active" id="tab-comments"> <div class="tabs-panel is-active" id="tab-comments">
<%= render "comments" %> <%= render "comments" %>
</div> </div>
</div> </div>

4
spec/features/admin/poll/questions/answers/answers_spec.rb
View File

@@ -43,8 +43,8 @@ feature 'Answers' do
scenario 'Update' do scenario 'Update' do
question = create(:poll_question) question = create(:poll_question)
answer = create(:poll_question_answer, question: question, title: "Answer title", given_order: 1) answer = create(:poll_question_answer, question: question, title: "Answer title", given_order: 2)
answer2 = create(:poll_question_answer, question: question, title: "Another title", given_order: 2) answer2 = create(:poll_question_answer, question: question, title: "Another title", given_order: 1)
visit admin_answer_path(answer) visit admin_answer_path(answer)

6
spec/features/polls/answers_spec.rb
View File

@@ -9,8 +9,8 @@ feature 'Answers' do
scenario "Index" do scenario "Index" do
question = create(:poll_question) question = create(:poll_question)
answer1 = create(:poll_question_answer, question: question, given_order: 1) answer1 = create(:poll_question_answer, question: question, given_order: 2)
answer2 = create(:poll_question_answer, question: question, given_order: 2) answer2 = create(:poll_question_answer, question: question, given_order: 1)
visit admin_question_path(question) visit admin_question_path(question)
@@ -56,4 +56,4 @@ feature 'Answers' do
true true
end end
end end

8
spec/features/polls/polls_spec.rb
View File

@@ -80,8 +80,8 @@ feature 'Polls' do
scenario "Question answers appear in the given order" do scenario "Question answers appear in the given order" do
question = create(:poll_question, poll: poll) question = create(:poll_question, poll: poll)
answer1 = create(:poll_question_answer, title: 'First', question: question, given_order: 1) answer1 = create(:poll_question_answer, title: 'First', question: question, given_order: 2)
answer2 = create(:poll_question_answer, title: 'Second', question: question, given_order: 2) answer2 = create(:poll_question_answer, title: 'Second', question: question, given_order: 1)
visit poll_path(poll) visit poll_path(poll)
@@ -92,8 +92,8 @@ feature 'Polls' do
scenario "More info answers appear in the given order" do scenario "More info answers appear in the given order" do
question = create(:poll_question, poll: poll) question = create(:poll_question, poll: poll)
answer1 = create(:poll_question_answer, title: 'First', question: question, given_order: 1) answer1 = create(:poll_question_answer, title: 'First', question: question, given_order: 2)
answer2 = create(:poll_question_answer, title: 'Second', question: question, given_order: 2) answer2 = create(:poll_question_answer, title: 'Second', question: question, given_order: 1)
visit poll_path(poll) visit poll_path(poll)