jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll

This commit is contained in:
sw 2015-01-17 15:01:04 +08:00
parent 2f9e658697 98b44d4903
commit 2a8a8ab3f2
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/poll_helper.rb
View File

@ -55,6 +55,11 @@ module PollHelper
t == 0 ? 0 : format("%.2f", e*100/t) t == 0 ? 0 : format("%.2f", e*100/t)
end end
#多选的时候查询去重
def total_answer id
total = PollVote.find_by_sql("SELECT distinct(user_id) FROM `poll_votes` where poll_question_id = #{id}").count
end
#页面体型显示 #页面体型显示
def options_show pq def options_show pq
case pq case pq

6
app/views/poll/_choice_show.html.erb
View File

@ -12,14 +12,14 @@
<td class="td42"><%= poll_answer.poll_votes.count %> </td> <td class="td42"><%= poll_answer.poll_votes.count %> </td>
<td class="td287"> <td class="td287">
<div class="Bar"> <div class="Bar">
<span style="width:<%= statistics_result_percentage(poll_answer.poll_votes.count, @poll.users.count) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span> <span style="width:<%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
</div> </div>
<%= statistics_result_percentage(poll_answer.poll_votes.count, @poll.users.count) %>%</td> <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%</td>
</tr> </tr>
<% end %> <% end %>
<tr class="table_bluebg"> <tr class="table_bluebg">
<td class="td327"><%= l(:label_poll_valid_commit) %> </td> <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
<td class="td42"><%= @poll.users.count %></td> <td class="td42"><%= total_answer(poll_question.id) %></td>
<td class="td287">&nbsp; </td> <td class="td287">&nbsp; </td>
</tr> </tr>
</tbody> </tbody>

2
config/locales/zh.yml
View File

@ -2262,7 +2262,7 @@ zh:
label_poll_proportion: 比例 label_poll_proportion: 比例
label_poll_valid_commit: 本题有效填写人次 label_poll_valid_commit: 本题有效填写人次
label_poll_result: 问卷调查_问卷统计 label_poll_result: 问卷调查_问卷统计
label_answer: 答案 label_answer: 答案：
label_poll_answer_valid_result: 以上为有效问答题答案！ label_poll_answer_valid_result: 以上为有效问答题答案！
label_answer_total: 总计： label_answer_total: 总计：

12
public/stylesheets/polls.css
View File

@ -42,7 +42,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
/*问卷页面*/ /*问卷页面*/
.polls_box{ border:1px solid #dcdcdc; padding:15px 30px;} .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}
.ur_page_title{ font-size:16px; text-align:center; color:#353535;word-break: break-all; word-wrap: break-word;} .ur_page_title{ font-size:16px; text-align:center; color:#353535; word-break:break-all; word-wrap:break-word;}
.ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; } .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
.ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;} .ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;}
.ur_title{ padding:20px 0px ; float:left; width:604px; word-break: break-all; word-wrap: break-word;} .ur_title{ padding:20px 0px ; float:left; width:604px; word-break: break-all; word-wrap: break-word;}
@ -60,15 +60,15 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
.ur_progress_text{ text-align:center; font-size:14px;} .ur_progress_text{ text-align:center; font-size:14px;}
/*问卷结果*/ /*问卷结果*/
.title_index{ color:#62bcd7;} .title_index{ color:#62bcd7; }
.ur_title_result{ padding-top:20px;} .ur_title_result{ padding-top:20px; word-break:break-all; word-wrap:break-word;}
.ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;} .ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
.ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;} .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
.table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;} .table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}
.td327{ width:601px; padding-left:5px;} .td327{ width:601px; padding-left:5px; word-break:break-all; word-wrap:break-word; }
.td42{ width:42px; text-align:center;} .td42{ width:42px; text-align:center;}
.td287{ width:259px;padding-left:5px; } .td287{ width:259px;padding-left:5px; text-align:center; }
.td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word } .td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word; }
.Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; } .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; } .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
.ur_progress_text{ color:#3a3a3a;} .ur_progress_text{ color:#3a3a3a;}