diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 36b5deccb..47612f825 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -62,8 +62,10 @@ module PollHelper
"单选题"
when 2
"多选题"
+ when 3
+ "单行主观"
else
- "问答题"
+ "多行主观"
end
end
diff --git a/app/views/poll/_quiz_answers.html.erb b/app/views/poll/_quiz_answers.html.erb
new file mode 100644
index 000000000..f2cfff5cc
--- /dev/null
+++ b/app/views/poll/_quiz_answers.html.erb
@@ -0,0 +1,18 @@
+
+
+
+
+ <%= l(:label_answer) %> |
+
+ <% poll_question.poll_votes.each do |poll_vote| %>
+
+ <%= poll_vote.vote_text %>dddd |
+
+ <% end %>
+
+ <%= l(:label_poll_answer_valid_result) %> <%= l(:label_answer_total) %><%= poll_question.poll_votes.count %> |
+
+
+
+
+
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index 3ef29eb48..a33daacfb 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -10,14 +10,18 @@
<%= @poll.polls_name %> <%= l(:label_poll) %>
- <% @poll_questions.each do |poll_question| %>
+ <% @poll_questions.each do |poll_question| %>
-
第<%= poll_question.question_number %>题:<%= poll_question.question_title %> [<%= options_show(poll_question.question_type) %>]
- <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+ <% if poll_question.question_type == 1 || poll_question.question_type == 2 %>
+ <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+ <% else %>
+ <%= render :partial =>'quiz_answers', :locals =>{ :poll_question => poll_question } %>
+ <% end %>
<% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5fe8a6560..7f7d00ba3 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2262,5 +2262,7 @@ zh:
label_poll_proportion: 比例
label_poll_valid_commit: 本题有效填写人次
label_poll_result: 问卷调查_问卷统计
-
+ label_answer: 答案
+ label_poll_answer_valid_result: 以上为有效问答题答案!
+ label_answer_total: 总计:
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index b238eedd8..0476f4291 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -68,6 +68,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
.td327{ width:300px; padding-left:5px;}
.td42{ width:42px; text-align:center;}
.td287{ width:259px;padding-left:5px; }
+.td111{ width:601px;padding-left:5px; }
.Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
.Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
.ur_progress_text{ color:#3a3a3a;}