From 3acec4b7c10c082c25b1f4e79cadc8b5e1adc013 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 10:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=80=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb                | 8 +++++---
 app/views/poll/_choice_show.html.erb      | 2 +-
 app/views/poll/statistics_result.html.erb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 55418faf2..36b5deccb 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -48,15 +48,16 @@ module PollHelper
     end
   end
   
-  #统计答题百分比
+  #统计答题百分比，统计结果保留两位小数
   def statistics_result_percentage(e, t)
     e = e.to_f
     t = t.to_f
     t == 0 ? 0 : format("%.2f", e*100/t)
   end
   
-  def options_show p
-    case p
+  #页面体型显示
+  def options_show pq
+    case pq
     when 1
       "单选题"
     when 2
@@ -65,4 +66,5 @@ module PollHelper
       "问答题"
     end
   end
+  
 end
\ No newline at end of file
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index 16971d5ad..4ccc5b938 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -19,7 +19,7 @@
       <% end %>
         <tr class="table_bluebg">
           <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
-          <td class="td42"><%= poll_question.poll_votes.count %></td>
+          <td class="td42"><%= @poll.users.count %></td>
           <td class="td287">&nbsp; </td>
         </tr>
      </tbody>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index 057314a9c..3ef29eb48 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -27,7 +27,7 @@
 		  <div class="cl"></div>
 		  <div class="ur_buttons"></div>
 		  <div class="cl"></div>
-		  </div>
+	  </div>
     </div>
   </body>
 </html>