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 11:09:39 +08:00
parent e14deeb4dd 9487ce1245
commit e8f3bd4dbb
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/poll_helper.rb
View File

@ -48,15 +48,16 @@ module PollHelper
end end
end end
#统计答题百分比 #统计答题百分比，统计结果保留两位小数
def statistics_result_percentage(e, t) def statistics_result_percentage(e, t)
e = e.to_f e = e.to_f
t = t.to_f t = t.to_f
t == 0 ? 0 : format("%.2f", e*100/t) t == 0 ? 0 : format("%.2f", e*100/t)
end end
def options_show p #页面体型显示
case p def options_show pq
case pq
when 1 when 1
"单选题" "单选题"
when 2 when 2
@ -65,4 +66,5 @@ module PollHelper
"问答题" "问答题"
end end
end end
end end

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

@ -19,7 +19,7 @@
<% 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_question.poll_votes.count %></td> <td class="td42"><%= @poll.users.count %></td>
<td class="td287">&nbsp; </td> <td class="td287">&nbsp; </td>
</tr> </tr>
</tbody> </tbody>

4
app/views/poll/show.html.erb
View File

@ -180,7 +180,7 @@
} }
</script> </script>
<input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>> <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
</div> </div>
</li><!--单行输入 end--> </li><!--单行输入 end-->
<% elsif pq.question_type == 4 %> <% elsif pq.question_type == 4 %>
@ -222,7 +222,7 @@
}); });
} }
</script> </script>
<div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div> <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id).html_safe %></div>
</div> </div>
</div> </div>
</li><!--多行输入 end--> </li><!--多行输入 end-->