From 405e2cfb9b1338d7c18d7bf0fc242a33ec65fe40 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 11 Oct 2016 08:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=8D=95=E9=80=89=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 15 ++++++ app/views/poll/_edit_MC.html.erb | 36 +++++++++---- app/views/poll/_poll_content.html.erb | 78 ++++++++++++++++++--------- app/views/poll/_show_MC.html.erb | 28 +++++----- public/stylesheets/css/common.css | 1 + 5 files changed, 113 insertions(+), 45 deletions(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index bc5e5dc9e..d7b2cfa26 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -199,6 +199,21 @@ class PollController < ApplicationController @poll_question.poll_answers.new question_option end end + if params[:question_other_answer] + question = @poll_question.poll_answers.where("answer_text = ''").first + unless question + question_option = { + :answer_position => params[:question_answer].count + 1, + :answer_text => '' + } + @poll_question.poll_answers.new question_option + end + else + question = @poll_question.poll_answers.where("answer_text = ''").first + if question + question.destroy + end + end end @poll_question.save respond_to do |format| diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb index 9209bf61d..08aeacc43 100644 --- a/app/views/poll/_edit_MC.html.erb +++ b/app/views/poll/_edit_MC.html.erb @@ -17,26 +17,44 @@ } -
+
- + />
    <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> -
  • - - - - -
    • -
    + <% if poll_answer.answer_text != '' %> +
  • + + + +
    • +
    + <% else %> +
  • + + + +
    • +
    + <% end %> <% end%>
+
diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb index 40c9a6181..c328c2cb5 100644 --- a/app/views/poll/_poll_content.html.erb +++ b/app/views/poll/_poll_content.html.erb @@ -1,26 +1,56 @@ -<% poll.poll_questions.each do |poll_question|%> -
-
- <% if poll_question.question_type == 1%> - <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 2%> - <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 3%> - <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %> - <% elsif poll_question.question_type == 4%> - <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %> - <% end%> +<% mc_question_list = poll.poll_questions.where("question_type=1") %> +<% mcq_question_list = poll.poll_questions.where("question_type=2") %> +<% single_question_list = poll.poll_questions.where("question_type=3") %> +<% multi_question_list = poll.poll_questions.where("question_type=4") %> +
"> +

单选题

+ <% mc_question_list.each do |poll_question| %> +
+
+ <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %> +
+
- +
"> +

多选题

+ <% mcq_question_list.each do |poll_question| %> +
+
+ <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %> +
+
-
-<% end %> \ No newline at end of file + <% end %> +
+
"> +

单行主观题

+ <% single_question_list.each do |poll_question| %> +
+
+ <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %> +
+ +
+ <% end %> +
+
"> +

多行主观题

+ <% multi_question_list.each do |poll_question| %> +
+
+ <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %> +
+ +
+ <% end %> +
\ No newline at end of file diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb index 901b98541..7209a4d52 100644 --- a/app/views/poll/_show_MC.html.erb +++ b/app/views/poll/_show_MC.html.erb @@ -1,15 +1,12 @@ -
-
- - 第<%= poll_question.question_number%>题： - +
+
+ 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> - [单选题] <%if poll_question.is_necessary == 1%> - * + * <%end%>
@@ -19,15 +16,22 @@
- +
<% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %> <% end %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 3420a994d..79960bfba 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -263,6 +263,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .w520{ width:520px;} .w543{ width:543px;} .w557{ width:557px;} +.w570 {width:570px !important;} .w576{ width:576px;} .w607 {width:607px;} .w664{ width:664px;}
- + <% if poll_answer.answer_text != '' %> + + <% else %> + + + <% end %>