From e448d2c05f51a45c56579dd6f9856e058ac762cc Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 28 Aug 2015 17:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 ++ app/helpers/poll_helper.rb | 10 -- app/views/users/_course_homework.html.erb | 21 ++-- app/views/users/_course_message.html.erb | 112 ++++++++++++--------- app/views/users/_course_news.html.erb | 104 ++++++++++--------- app/views/users/_course_poll.html.erb | 20 ++-- app/views/users/_project_issue.html.erb | 92 +++++++++-------- app/views/users/_project_message.html.erb | 115 +++++++++++++--------- app/views/users/_user_activities.html.erb | 59 +++++++++++ 9 files changed, 336 insertions(+), 207 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 709426d41..7f93345b4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2493,4 +2493,14 @@ int main(int argc, char** argv){ return 0; }".html_safe end + + #判断用户是否已经提交了问卷 + def has_commit_poll?(poll_id,user_id) + pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) + if pu.nil? + false + else + true + end + end end diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb index 22ee21936..170e1b92c 100644 --- a/app/helpers/poll_helper.rb +++ b/app/helpers/poll_helper.rb @@ -37,16 +37,6 @@ module PollHelper pv.vote_text end end - - #判断用户是否已经提交了问卷 - def has_commit_poll?(poll_id,user_id) - pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id) - if pu.nil? - false - else - true - end - end #统计答题百分比，统计结果保留两位小数 def statistics_result_percentage(e, t) diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 0cb3aa25e..88a00e8ab 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,16 +4,16 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
- <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %> +
+ <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
@@ -21,7 +21,16 @@
截止时间：<%= format_date(activity.end_time) %>
-
（作业描述）<%= activity.description.html_safe %>
+
+ 作业描述：<%= activity.description.html_safe %> +
+
- <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <% if activity.parent_id.nil? %> + <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
-
时间：<%= format_date(activity.created_on) %>
+
发帖时间：<%= format_date(activity.created_on) %>
-
（描述） + + +
帖子描述： <% if activity.parent_id.nil? %> <%= activity.content.to_s.html_safe%> <% else %> @@ -44,20 +47,26 @@
-
-
+ + <% activity= activity.parent_id.nil? ? activity:activity.parent%> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
+
    + <% activity.children.reorder("created_on desc").each do |reply|%> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
    +
    <%= reply.content.html_safe %>
    +
    +
    +
    • + <% end %> +
-
<%#= reply.content.html_safe %>
-
-
-
- <%# end %> - <%# end %> -
--> + <% end %> + diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index ce85e0cad..aaa8fa672 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -1,5 +1,5 @@
-
+
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -9,17 +9,18 @@ <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %> <% else %> <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> - <% end %> TO - <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <% end %> TO + <%= link_to activity.course.name.to_s+" | 课程通知", course_path(activity.course), :class => "newsBlue ml15", :style => "word-break:break-all" %>
-
- <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey", :style=>"word-break:break-all" %> +
+ <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey", :style => "word-break:break-all" %>
发布时间：<%= format_date(activity.created_on) %>
-
（通知描述）<%= activity.description.html_safe %>
- -
<%#= render :partial => 'course_news_reply',:locals => { :contest => @contest, :journals => @jour, :state => false}%> -
- <%#= form_tag({:controller => 'comments', :action => 'create', :id => activity}, :id => "add_reply_form") do %> - -
- 取消 -
-
- 发送 + + <% replies_all_i = 0 %> + <% unless activity.comments.empty? %> +
+
    + <% activity.comments.reorder("created_on desc").each do |comment| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if comment.try(:author).try(:realname) == ' ' %> + <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(comment.created_on) %> + <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> + +
    +
    <%= comment.comments.html_safe %>
    +
    +
    +
    • + <% end %> +
-
- <%# end %> + <% end %>
- <%# activity.comments.reorder("created_on desc").each do |comment| unless activity.comments.nil?%> -
-
- <%#= link_to image_tag(url_to_avatar(comment.author), :width => "45", :height => "45"), user_path(comment.author_id), :alt => "用户头像" %> -
-
-
- <%# if comment.try(:author).try(:realname) == ' ' %> - <%#= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#=format_date(comment.created_on)%> - <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> - <!–删除–> -
-
<%#= comment.comments.html_safe %>
-
-
-
- <%# end %> - <%# end %> -
-->
\ No newline at end of file diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb index 0c93e7627..bc0fee3a8 100644 --- a/app/views/users/_course_poll.html.erb +++ b/app/views/users/_course_poll.html.erb @@ -1,4 +1,4 @@ -<%# has_commit = has_commit_poll?(activity.id ,User.current)%> +<% has_commit = has_commit_poll?(activity.id ,User.current)%> <% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
@@ -14,21 +14,21 @@ <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %> + <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
- <%#= link_to activity.polls_name.to_s+"(问卷名称)", %> - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(activity.id), :class => "polls_title polls_title_w fl c_dblue"%> - <%# else %> - <%= link_to poll_name+"(问卷名称)", poll_path(activity.id), :class => "postGrey"%> - <%# end %> + <%#= link_to activity.polls_name.to_s/*+"(问卷名称)"*/, %> + <% if has_commit %> + <%= link_to poll_name, poll_result_poll_path(activity.id), :class => "postGrey"%> + <% else %> + <%= link_to poll_name, poll_path(activity.id), :class => "postGrey"%> + <% end %>
-
时间：<%= format_date(activity.created_at) %>
+
发布时间：<%= format_date(activity.published_at) %>
-
（问卷描述）<%=activity.polls_description.to_s%>
+
问卷描述：<%=activity.polls_description.to_s%>
- <%= link_to activity.subject.to_s+"(缺陷标题)", issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> - <%=activity.status.name %> + <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey", :style=>"word-break:break-all" %> + <%= get_issue_priority(activity.priority_id)[1] %>
指派给   @@ -28,7 +28,7 @@
时间：<%=format_date(activity.created_on) %>
-
（缺陷描述）<%=activity.description.html_safe %>
+
缺陷描述：<%= activity.description.html_safe %>
<% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> @@ -70,15 +70,21 @@
-
-
+ + <% replies_all_i = 0 %> + <% unless activity.journals.empty? %> +
+
    + <% activity.journals.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:user).try(:realname) == ' ' %> + <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <%# else %> + <%#= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> - #<!–删除–> -
    - <%# if reply.details.any? %> - <%# details_to_strings(reply.details).each do |string| %> -
    <%#=string %>
    - <%# end %> - <%# else %> -
    <%#=reply.notes.html_safe %>
    - <%# end %> -
    -
    -
- <%# end %> - <%# end %> -
--> + + + <% if reply.details.any? %> + <% details_to_strings(reply.details).each do |string| %> +
<%= string %>
+ <% end %> + <% else %> +
<%= reply.notes.html_safe %>
+ <% end %> + +
+ + <% end %> + + + <% end %> + \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 57b021467..d46823211 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -11,20 +11,26 @@ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %> <% end %> TO - <%= link_to activity.project.name.to_s+"(项目讨论区)", project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%> + <%= link_to activity.project.name.to_s+" | 项目讨论区",project_path(activity.project), :class => "newsBlue ml15 mr5", :style=>"word-break:break-all"%>
<% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> + <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe+"(帖子标题)", project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> + <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey", :style=>"word-break:break-all"%> <% end %>
时间：<%= format_date(activity.created_on) %>
-
（描述）<%= activity.content.html_safe %>
+
帖子描述： + <% if activity.parent_id.nil? %> + <%= activity.content.to_s.html_safe%> + <% else %> + <%= activity.parent.content.to_s.html_safe%> + <% end %> +
- -
+ + <% activity= activity.parent_id.nil? ? activity : activity.parent %> + <% replies_all_i = 0 %> + <% unless activity.children.empty? %> +
+
    + <% activity.children.reorder("created_on desc").each do |reply| %> + <% replies_all_i=replies_all_i+1 %> +
  • +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %> +
    +
    +
    + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> + <% end %> + <%= format_date(reply.created_on) %> + <%= link_to( + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => 'replyGrey fr ml10' + ) if reply.course_destroyable_by?(User.current) %> + +
    +
    <%= reply.content.html_safe %>
    +
    +
    +
    • + <% end %> +
-
-
- <%# if reply.try(:author).try(:realname) == ' ' %> - <%#= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# else %> - <%#= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> - <%# end %> - <%#= format_date(reply.created_on) %> - <%#= link_to( - l(:button_delete), - {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => 'replyGrey fr ml10' - ) if reply.course_destroyable_by?(User.current) %> - # <!–删除–> -
-
<%#= reply.content.html_safe %>
-
-
-
- <%# end %> - <%# end %> - --> - + <% end %> + + \ No newline at end of file diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 97f7b4c6f..1cfeb7ed8 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -1,5 +1,64 @@ <% user_activities.each do |user_activity| unless user_activities.nil? %> + <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %> <% case user_activity.container_type.to_s %> <% when 'Course' %>