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

个人主页调整

This commit is contained in:
daiao 2017-07-24 14:49:37 +08:00
parent 8c9723f17f
commit 0892eb1472
6 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/controllers/users_controller.rb
View File

@ -2026,12 +2026,26 @@ class UsersController < ApplicationController
@blog_list = @blog_list.limit(3)
watch_query = User.watched_by(@user.id);
@user_watchlist_count = watch_query.count();
@user_watchlist = watch_query.order("#{Watcher.table_name}.id desc").limit(12);
@user_watchlist = watch_query.order("#{Watcher.table_name}.id desc").limit(12)
fan_query = @user.watcher_users;
@user_fanlist_count = fan_query.count();
@user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12);
@user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12)
# 我创建的实训数
@create_num = (@user == User.current ? Shixun.where(:user_id => @user).count : Shixun.where(:status => [2, 3], :user_id => @user).count)
# 我合作的实训数
coop_id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id) # 合作者的实训id
@cooperative_num = (@user == User.current ? Shixun.where(:id => coop_id).count : Shixun.where(:status => [2, 3], :id => coop_id).count)
# 我挑战的实训数
ch_id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
@challenge_num = (@user == User.current ? Shixun.where(:id => ch_id).count : Shixun.where(:status => [2, 3], :id => ch_id))
# 我的所有课程数
@all_courses_count = @user.courses.not_deleted_not_end.count
# 我创建的课程数
@create_courses_count = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).count
# 我参与的课程数
@join_courses_count = @user.courses.not_deleted_not_end.where("tea_id != #{@user.id}").count
=begin
# 合作者及创建者
ids = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}")
# 已挑战过
@ -2040,11 +2054,10 @@ class UsersController < ApplicationController
ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank?
id = ids + ids2
id = id.uniq
=end
if @user == User.current
@shixuns = Shixun.where(:user_id => @user).order("created_at desc")
@shixuns = Shixun.where(:id => id).order("created_at desc")
else
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
@shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc")
end
@limit = 5
@is_remote = true
@ -2215,12 +2228,22 @@ class UsersController < ApplicationController
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
end
elsif params[:filter] == "cooperative"
# 合作者的实训id
id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id)
if @user == User.current
@shixuns = Shixun.where(:id => id).order("created_at desc")
else
@shixuns = Shixun.where(:status => [2, 3], :id => id).order("created_at desc")
end
elsif params[:filter] == "all"
# 合作者及创建者
ids = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id}")
# 已挑战过
ids2 = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})")
ids = ids.map{|shixun| shixun.shixun_id} unless ids.blank?
# 我创建的id
create_id = Shixun.where(:user_id => @user).pluck(:id)
id = ids - create_id
ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank?
id = ids + ids2
id = id.uniq
if @user == User.current
@shixuns = Shixun.where(:id => id).order("created_at desc")
else
@ -2238,6 +2261,8 @@ class UsersController < ApplicationController
@courses = @user.courses.not_deleted_not_end.where(:tea_id => @user.id).order("updated_at desc")
elsif params[:filter] == "join"
@courses = @user.courses.not_deleted_not_end.where("tea_id != #{@user.id}").order("updated_at desc")
elsif params[:filter] == "all"
@courses = @user.courses.not_deleted_not_end.order("updated_at desc")
end
@limit = 5
@is_remote = true

1
app/models/shixun_member.rb
View File

@ -1,4 +1,5 @@
class ShixunMember < ActiveRecord::Base
# role 实训角色： 1 创建者 2 合作者
attr_accessible :shixun_id, :user_id, :role
belongs_to :shixun
belongs_to :user

2
app/views/layouts/_logined_header.html.erb
View File

@ -16,8 +16,8 @@
</div>
<ul class="fl innner-nav">
<li><%= link_to "实训分类", shixuns_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "实训课堂", courses_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "实训套件", subjects_path, :class => "new-nav-a font-16" %></li>
<li><%= link_to "实训课堂", courses_path, :class => "new-nav-a font-16" %></li>
<!-- <li><%#= link_to "论坛", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>-->
<!-- <li><%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>-->

2
app/views/users/shixuns_or_courses_filter.js.erb
View File

@ -1,7 +1,5 @@
<% if params[:index] == "shixun" %>
$("#my_shixuns_list").html("<%= j ( render :partial => "my_homepage_shixuns_list") %>");
$("#user_shixun_count").html(" <%= @shixuns_count %>");
<% elsif params[:index] == "course" %>
$("#my_courses_list").html("<%= j (render :partial => "my_homepage_courses_list") %>");
$("#user_course_count").html(" <%= @courses_count %>");
<% end %>

25
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="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="course_filtrate fl course_filtrate_bg" data-remote="true"><%= str %>创建的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="course_filtrate fl" data-remote="true"><%= str %>合作的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="course_filtrate fl" data-remote="true"><%= str %>挑战的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "all") %>" data-remote="true" 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><%= @create_num %></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><%= @cooperative_num %></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><%= @challenge_num %></span></a>
</div>
</ul>
<div class="lesson clearfix" id="my_shixuns_list">
@ -246,6 +246,23 @@
</div>
<div class="passageway mt15" id="user_homepage_course_show">
<div class="hascon">
<ul id="edu-user-tab-nav">
<li class="edu-user-tab-hover new-tab-nav">
<a href="javascript:void(0);" class="font-16 tab_type"><%= str %>的课堂 </a>
</li>
<div style="margin-top: 5px;margin-left: 50px;float: left">
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "all") %>" class="course_filtrate fl course_filtrate_bg" data-remote="true">全部&nbsp;<span><%= @all_courses_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "manage") %>" class="course_filtrate fl" data-remote="true"><%= str %>管理的&nbsp;<span><%= @create_courses_count %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "course", :filter => "join") %>" class="course_filtrate fl" data-remote="true"><%= str %>参与的&nbsp;<span><%= @join_courses_count %></span></a>
</div>
</ul>
<div class="lesson clearfix" id="my_courses_list">
<%#= render :partial => "my_homepage_courses_list" %>
</div>
</div>
<%#= render :partial => "my_homepage_course_show" %>
</div>

2
app/views/users/user_show_course_list.js.erb
View File

@ -1 +1 @@
$("#user_homepage_course_show").html("<%= j(render :partial => "my_homepage_course_show") %>");
$("#my_courses_list").html("<%= j(render :partial => "my_homepage_courses_list") %>");