个人首页的课程社区

app/controllers/users_controller.rb

@@ -1919,6 +1919,74 @@ class UsersController < ApplicationController
 
   # 课程社区
   def course_community
+    if params[:course_id] != nil
+      join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
+                                                 params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
+      join_course_messages.update_all(:viewed => true)
+    end
+    shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+    course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
+    principal_types = "JournalsForMessage"
+    container_type = ''
+    act_type = ''
+
+    if params[:type].present?
+      case params[:type]
+        when "course_homework"
+          container_type = 'Course'
+          act_type = 'HomeworkCommon'
+        when "course_news"
+          container_type = 'Course'
+          act_type = 'News'
+        when "course_message"
+          container_type = 'Course'
+          act_type = 'Message'
+        when "course_poll"
+          container_type = 'Course'
+          act_type = 'Poll'
+        when "course_journals"
+          container_type = 'Course'
+          act_type = 'JournalsForMessage'
+        when "user_journals"
+          container_type = 'Principal'
+          act_type = 'JournalsForMessage'
+        when "current_user"
+          container_type = 'Principal'
+          act_type = 'Principal'
+        when "all"
+          container_type = 'all'
+          act_type = 'all'
+      end
+    end
+    if container_type != '' && container_type != 'all'
+      if container_type == 'Course'
+        sql = "container_type = '#{container_type}' and container_id in #{user_course_ids} and act_type = '#{act_type}'"
+      elsif container_type == 'Principal' && act_type == 'JournalsForMessage'
+        sql = "container_type = '#{container_type}' and act_type= '#{act_type}' and container_id = #{@user.id}"
+      elsif container_type == 'Principal' && act_type == 'Principal'
+        sql = "user_id = #{@user.id} and (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})"
+      end
+      if User.current != @user
+        sql += " and user_id = #{@user.id}"
+      end
+    else
+      if User.current != @user
+        blog_ids = "("+@user.blog.id.to_s+")"
+      else
+        blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+      end
+      sql = "(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})" +
+          "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+          "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})"
+      if container_type != 'all' && User.current != @user
+        sql = "user_id = #{@user.id} and(" + sql + ")"
+      end
+    end
+    @user_activities_count = UserActivity.where("#{sql}").order('updated_at desc').count
+    @user_activities = UserActivity.where("#{sql}").order('updated_at desc').limit(10).offset(@page * 10)
+    @type = params[:type]
     respond_to do |format|
       format.js
       format.html {render :layout => 'base_course_community'}
@@ -3580,7 +3648,7 @@ class UsersController < ApplicationController
     # @syllabus = paginateHelper @syllabus,@limit
 
     respond_to do |format|
-      format.html {render :layout => 'new_base_user'}
+      format.html {render :layout => 'base_course_community'}
     end
   end
 

app/helpers/application_helper.rb

@@ -2791,6 +2791,37 @@ module ApplicationHelper
     end
     technical_title
   end
+  # 用户项目总数
+  def user_project_count
+    @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_project_total = @my_projects.count
+  end
+
+  # 用户的课程总数
+  def user_course_count
+    @my_course_count = @user.syllabuses.count
+
+    sy_courses = @user.courses.visible.not_deleted
+    syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
+    syllabus_members = SyllabusMember.where("user_id = #{@user.id}")
+    syllabus_member_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|syl_mem| syl_mem.syllabus_id}.join(',') + ")"
+    @join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{@user.id}")
+    @my_joined_course_count = @join_syllabuses.count
+
+    @user_course_total = @my_joined_course_count + @my_course_count
+  end
+
+  # 用户发布的issue数
+  def issues_author_is_self_count
+    @issues = Issue.where( :author_id => @user.id )
+    @issues_author_is_self_count = @issues.count
+  end
+
+  # 用户收到的issue数
+  def issues_assigned_is_self_count
+    @issues = Issue.where( :assigned_to_id => @user.id )
+    @issues_assigned_is_self_count = @issues.count
+  end
 
   def get_user_roll user
     technical_title = ""

app/helpers/users_helper.rb

@@ -53,39 +53,6 @@ module UsersHelper
 
   end
 
-
-  # 用户项目总数
-  def user_project_count
-    @my_projects = @user.projects.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
-    @my_project_total = @my_projects.count
-  end
-
-  # 用户的课程总数
-  def user_course_count
-    @my_course_count = @user.syllabuses.count
-
-    sy_courses = @user.courses.visible.not_deleted
-    syllabus_ids = sy_courses.empty? ? '(-1)' : "(" + sy_courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")"
-    syllabus_members = SyllabusMember.where("user_id = #{@user.id}")
-    syllabus_member_ids = syllabus_members.empty? ? "(-1)" : "(" + syllabus_members.map{|syl_mem| syl_mem.syllabus_id}.join(',') + ")"
-    @join_syllabuses = Syllabus.where("(id in #{syllabus_ids} or id in #{syllabus_member_ids}) and user_id != #{@user.id}")
-    @my_joined_course_count = @join_syllabuses.count
-
-    @user_course_total = @my_joined_course_count + @my_course_count
-  end
-
-  # 用户发布的issue数
-  def issues_author_is_self_count
-    @issues = Issue.where( :author_id => @user.id )
-    @issues_author_is_self_count = @issues.count
-  end
-
-  # 用户收到的issue数
-  def issues_assigned_is_self_count
-    @issues = Issue.where( :assigned_to_id => @user.id )
-    @issues_assigned_is_self_count = @issues.count
-  end
-
   def get_resource_type type
     case type
       when 'Course'

app/views/layouts/base_course_community.html.erb

@@ -44,10 +44,54 @@
   <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft mt10" id="LSide">
-
-        <%# 更新访问数,刷新的时候更新访问次数 %>
-        <%  update_visiti_count @user %>
-        <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+      <div class="user_leftnav ">
+        <% if hidden_unproject_infos %>
+            <ul class="users_accordion mb10">
+              <li id="user_01" class="user_icons_course">
+                <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %>
+                <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %></font>
+                <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
+                <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
+                  <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
+                </div>
+              </li>
+              <% if is_current_user %>
+                  <li id="user_02"  class="user_icons_new">
+                    <%= link_to "新建课程", new_syllabus_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_03" class="user_icons_new">
+                    <%= link_to "新建班级", new_course_path(:host=> Setting.host_course), :target => "_blank", :style => "font-size:14px;" %>
+                  </li>
+                  <li id="user_04" class="user_icons_addclass">
+                    <%= link_to "加入班级",join_private_courses_courses_path,:remote => true, :method => "post", :style => "font-size:14px;" %>
+                  </li>
+              <% end %>
+            </ul>
+        <% end %>
+        <ul class="users_accordion mb10">
+          <% if @user == User.current %>
+              <li id="user_05" class="user_icons_myhw">
+                <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_06" class="icons-doc clear">
+                <%= link_to "题库",  user_homeworks_user_path(User.current), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_07" class="icons-download clear">
+                <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank",:style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight">
       <%= yield %>

app/views/layouts/base_project_community.html.erb

@@ -44,7 +44,34 @@
   <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft mt10" id="LSide">
-
+      <div class="user_leftnav ">
+        <ul class="users_accordion mb10">
+          <li id="user_06" class="user_icons_project">
+            <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%>
+            <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %></font>
+            <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
+            <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
+              <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>
+            </div>
+          </li>
+          <% if is_current_user %>
+              <li id="user_07"  class="user_icons_new">
+                <%= link_to "新建项目",  new_project_path(:host=> Setting.host_name), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_08" class="user_icons_addproject">
+                <%= link_to "加入项目", applied_join_project_path, :remote => true, :method => "post", :style => "font-size:14px;" %>
+              </li>
+              <li id="user_09" class="user_icons_myissues">
+                <%= link_to "我的Issue", user_issues_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
+              </li>
+          <% end %>
+        </ul>
+        <ul class="users_accordion mb10">
+          <li id="user_10" class="user_icons_mes">
+            <%= link_to '留言', feedback_path(@user, :host=> Setting.host_user)%>
+          </li>
+        </ul>
+      </div>
       <%# 更新访问数,刷新的时候更新访问次数 %>
       <%  update_visiti_count @user %>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>

app/views/layouts/new_base_user.html.erb

@@ -88,7 +88,7 @@
 
 <body onload="prettyPrint();">
 <div class="navContainer">
-  <% is_current_user = User.current.logged? && User.current == @user%>
+  <% is_current_user = User.current.logged? && User.current == @user %>
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>
   <% else%>
@@ -163,7 +163,7 @@
             <h3 >
           	  <%= link_to "课程社区", user_course_community_path(User.current), :class => "fl" %>
 			</h3>
-            <% if hidden_unproject_infos %>
+            <%# if hidden_unproject_infos %>
                 <ul>
                   <li class="home-user-leftnav-li icons-class clear">
                     <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140'>#{user_course_count}</span>".html_safe : "课程",
@@ -198,7 +198,7 @@
                     <%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :target => "_blank", :class => "fl" %>
                   </li>
                 </ul>
-            <% end %>
+            <%# end %>
           </div>
 
           <div class="home-user-leftnav">

app/views/users/course_community.html.erb

@@ -0,0 +1,38 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
+<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">消息动态</div>
+      <ul class="resourcesSelect">
+        <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+          <ul class="homepagePostType" style="position:static; width: 80px" >
+            <li>
+              <ul class="homepagePostTypeHomework fl">
+                <% if hidden_unproject_infos %>
+                    <li><%= link_to "全部动态", {:controller => "users", :action => "course_community", :type => "all"}, :class => "homepagePostTypeAll postTypeGrey" %>
+                    <li><%= link_to @user == User.current ? "我的动态" : "他的动态", {:controller => "users", :action => "course_community", :type => "current_user"}, :class => "homepagePostTypeMine postTypeGrey" %>
+                    <li><%= link_to "作业动态", {:controller => "users", :action => "course_community", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey" %>
+                    <li><%= link_to "通知动态", {:controller => "users", :action => "course_community", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey" %>
+                    <li><%= link_to "论坛动态", {:controller => "users", :action => "course_community", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey" %>
+                    <li><%= link_to "问卷动态", {:controller => "users", :action => "course_community", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey" %>
+                    <li><%= link_to "班级留言", {:controller => "users", :action => "course_community", :type => "course_journals"}, :class => "homepagePostTypeMessage postTypeGrey" %>
+                    <li><%= link_to "个人留言", {:controller => "users", :action => "course_community", :type => "user_journals"}, :class => "homepagePostTypeMessage postTypeGrey" %>
+                <% end %>
+              </ul>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+
+    <!--显示个人主页-->
+<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %>
+    <%# homepage = BlogComment.find(@user.blog.homepage_id) %>
+    <%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %>
+<%# end %>
+    <% if @user_activities_count > 0 %>
+        <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities, :page => 0, :type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>
+    <% else %>
+        <div class="mb10">
+          <%= render :partial => 'users/no_data' %>
+        </div>
+    <% end %>