Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

个人主页问题

This commit is contained in:
huang 2017-07-23 18:11:02 +08:00
parent 141c96cf95
commit 8835df6d28
3 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/controllers/users_controller.rb
View File

@ -503,9 +503,9 @@ class UsersController < ApplicationController
# 初始化/更新 点击按钮时间, 24小时内显示系统消息
update_onclick_time
# 全部设为已读
# if params[:viewed] == "all"
# if params[:viewed] == "all"
# update_message_viewed(@user)
# end
# end
# @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
courses = @user.courses.where("is_delete = 1")
course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
@ -587,24 +587,24 @@ class UsersController < ApplicationController
# 消息设置为已读
def update_message_viewed
if User.current.id == @user.id
course_querys = CourseMessage.where("user_id =? and viewed =?", @user.id, 0)
forge_querys = ForgeMessage.where("user_id =? and viewed =?", @user.id, 0)
user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", @user.id, 0)
forum_querys = MemoMessage.where("user_id =? and viewed =?", @user.id, 0)
org_querys = OrgMessage.where("user_id=? and viewed=0", @user.id)
at_querys = AtMessage.where("user_id=? and viewed=0", @user.id)
contest_querys = ContestMessage.where(:user_id => @user.id, :viewed => 0)
blog_querys = BlogMessage.where(:user_id => @user.id, :viewed => 0)
applied_querys = AppliedMessage.where("user_id=? and viewed =?", @user.id, 0)
course_querys.update_all(:viewed => true) unless course_querys.nil?
forge_querys.update_all(:viewed => true) unless forge_querys.nil?
user_querys.update_all(:viewed => true) unless user_querys.nil?
forum_querys.update_all(:viewed => true) unless forum_querys.nil?
org_querys.update_all(:viewed => true) unless org_querys.nil?
at_querys.update_all(:viewed => true) unless at_querys.nil?
contest_querys.update_all(:viewed => true) unless contest_querys.nil?
blog_querys.update_all(:viewed => true) unless blog_querys.nil?
applied_querys.update_all(:viewed => true) unless applied_querys.nil?
course_querys = CourseMessage.where("user_id =? and viewed =?", @user.id, 0)
forge_querys = ForgeMessage.where("user_id =? and viewed =?", @user.id, 0)
user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", @user.id, 0)
forum_querys = MemoMessage.where("user_id =? and viewed =?", @user.id, 0)
org_querys = OrgMessage.where("user_id=? and viewed=0", @user.id)
at_querys = AtMessage.where("user_id=? and viewed=0", @user.id)
contest_querys = ContestMessage.where(:user_id => @user.id, :viewed => 0)
blog_querys = BlogMessage.where(:user_id => @user.id, :viewed => 0)
applied_querys = AppliedMessage.where("user_id=? and viewed =?", @user.id, 0)
course_querys.update_all(:viewed => true) unless course_querys.nil?
forge_querys.update_all(:viewed => true) unless forge_querys.nil?
user_querys.update_all(:viewed => true) unless user_querys.nil?
forum_querys.update_all(:viewed => true) unless forum_querys.nil?
org_querys.update_all(:viewed => true) unless org_querys.nil?
at_querys.update_all(:viewed => true) unless at_querys.nil?
contest_querys.update_all(:viewed => true) unless contest_querys.nil?
blog_querys.update_all(:viewed => true) unless blog_querys.nil?
applied_querys.update_all(:viewed => true) unless applied_querys.nil?
end
redirect_to user_path(@user)
end
@ -2041,22 +2041,9 @@ class UsersController < ApplicationController
id = ids + ids2
id = id.uniq
=end
# 这部分代码还需要优化
id_new = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
ids_new = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}")
ids2 = ids_new.map{|shixun| shixun.shixun_id} unless ids_new.blank?
# 我创建的id
create_id_new = Shixun.where(:user_id => @user).pluck(:id)
id2 = ids2 - create_id_new
if @user == User.current
@challenge_count = Shixun.where(:id => id_new).count
@create_count = Shixun.where(:user_id => @user).count
@cooperative_count = @shixuns = Shixun.where(:id => id2).count
@shixuns = Shixun.where(:user_id => @user).order("created_at desc")
else
@challenge_count = Shixun.where(:status => [2, 3], :id => id_new).count
@create_count = Shixun.where(:status => [2, 3], :user_id => @user).count
@cooperative_count = Shixun.where(:status => [2, 3], :id => id2).count
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
end
@limit = 5
@ -2267,10 +2254,7 @@ class UsersController < ApplicationController
def user_show_course_list
@courses = @user.courses.not_deleted_not_end.order("updated_at desc")
@courses_manage_count = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).count
@courses_join_count = @user.courses.not_deleted_not_end.where("tea_id != #{@user.id}").count
@courses = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).order("updated_at desc")
@courses_count = @courses.count
@limit = 5
@is_remote = true
@ -4507,7 +4491,7 @@ class UsersController < ApplicationController
private
def show_system_message
# 系统消息总显示在最前面,显示周期30天
# 系统消息总显示在最前面,显示周期30天
@system_messages = SystemMessage.where("created_at > ?", Time.now - 86400 * 30)
end

6
app/views/users/_my_homepage_course_show.html.erb
View File

@ -6,9 +6,9 @@
</li>
<div style="margin-top: 5px;margin-left: 50px;float: left">
<a href="" class="course_filtrate fl course_filtrate_bg">全部&nbsp;<span><%= @courses_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "manage") %>" class="course_filtrate fl" data-remote="true">我管理的&nbsp;<span id="user_course_count"> <%= @courses_manage_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "join") %>" class="course_filtrate fl" data-remote="true">我参与的&nbsp;<span id="user_course_count"><%= @courses_join_count %></span></a>
<!--<a href="" class="course_filtrate fl course_filtrate_bg">全部&nbsp;<span><%#= @courses_count %></span></a>-->
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "manage") %>" class="course_filtrate fl" data-remote="true">我管理的&nbsp;<span id="user_course_count"> <%#= @courses_manage_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "join") %>" class="course_filtrate fl" data-remote="true">我参与的&nbsp;<span id="user_course_count"><%#= @courses_join_count %></span></a>
</div>
</ul>
<div class="lesson clearfix" id="my_courses_list">

8
app/views/users/show.html.erb
View File

@ -233,10 +233,10 @@
</li>
<div style="margin-top: 5px;margin-left: 50px;float:left;">
<a href="" class="course_filtrate fl course_filtrate_bg">全部&nbsp;<span><%= @shixuns_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="course_filtrate fl" data-remote="true"><%= str %>创建的&nbsp;<span id="user_course_count"><%= @create_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="course_filtrate fl" data-remote="true"><%= str %>合作的&nbsp;<span id="user_course_count"><%= @cooperative_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="course_filtrate fl" data-remote="true"><%= str %>挑战的&nbsp;<span id="user_course_count"><%= @challenge_count %></span></a>
<!--<a href="" class="course_filtrate fl course_filtrate_bg">全部&nbsp;<span><%#= @shixuns_count %></span></a>-->
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="course_filtrate fl" data-remote="true"><%= str %>创建的&nbsp;<span id="user_course_count"><%#= @create_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="course_filtrate fl" data-remote="true"><%= str %>合作的&nbsp;<span id="user_course_count"><%#= @cooperative_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="course_filtrate fl" data-remote="true"><%= str %>挑战的&nbsp;<span id="user_course_count"><%#= @challenge_count %></span></a>
</div>
</ul>
<div class="lesson clearfix" id="my_shixuns_list">