From 2193fcc49e03801945171ed0b66b1da8a05388c0 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 30 Jul 2015 14:03:07 +0200 Subject: [PATCH] AutoCommit Don Jul 30 14:03:07 CEST 2015 --- app/models/survey/question.rb | 2 ++ app/views/survey/questions/_answeredquestion.html.erb | 11 ++++++++--- app/views/survey/questions/_question.html.erb | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/survey/question.rb b/app/models/survey/question.rb index 0316f43..00a16c1 100644 --- a/app/models/survey/question.rb +++ b/app/models/survey/question.rb @@ -14,6 +14,7 @@ class Survey::Question < ActiveRecord::Base def do_answer(choice_ids, user) cid=choice_ids.map{|c|c.to_i} + unless cid.empty? Survey::Answer.where(user_id: user.id, choice_id: self.choice_ids).delete_all cid.each do |c| if self.choice_ids.include?(c) @@ -21,6 +22,7 @@ class Survey::Question < ActiveRecord::Base a.save end end + end end end diff --git a/app/views/survey/questions/_answeredquestion.html.erb b/app/views/survey/questions/_answeredquestion.html.erb index cdde42c..2e24d4d 100644 --- a/app/views/survey/questions/_answeredquestion.html.erb +++ b/app/views/survey/questions/_answeredquestion.html.erb @@ -1,4 +1,9 @@
<%= answeredquestion.title%> -<% answeredquestion.choices.each do |c| %> -<%= c.to_s %><%= answeredquestion.answers.where(choice_id: c.id).count %>n -<% end %> + +
diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index f654025..524a06d 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -1,7 +1,7 @@
<%= question.title%> <%= semantic_form_for question, url: answer_survey_question_path do |f| %> <%= f.input :selected, as: :check_boxes, collection: question.choices, label: false %> - +<%= f.input :selected, as: :radio, collection: question.choices, label: false %> <%= f.action :submit, :as => :input %> <% end %>