Merge branch 'linchun' into develop

app/controllers/admin_controller.rb

@@ -24,7 +24,7 @@ class AdminController < ApplicationController
   before_filter :require_admin
   helper :sort
   helper :Users
-  helper :Settings
+  helper :Settings,SchoolHelper
   include SortHelper
 
   def index
@@ -51,15 +51,66 @@ class AdminController < ApplicationController
     end
   end
 
+  #管理员界面精品课程列表
+  def excellent_courses
+    @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
+    respond_to do |format|
+      format.html
+    end
+  end
+
+ #管理员界面课程资源列表
+  def course_resource_list
+
+    if params[:sort] == 'file_size'
+      @resource = Attachment.where(:container_type => 'Course').order("filesize desc")
+    elsif params[:sort] == 'file_upload'
+      @resource = Attachment.where(:container_type => 'Course').order("created_on desc")
+    elsif params[:sort] == 'file_download_times'
+      @resource = Attachment.where(:container_type => 'Course').order("downloads desc")
+    else
+      @resource = Attachment.where(:container_type => 'Course').order("created_on desc")
+    end
+
+    @resource = paginateHelper @resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #管理员界面項目资源列表
+  def project_resource_list
+
+    if params[:sort] == 'file_size'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("filesize desc")
+    elsif params[:sort] == 'file_upload'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("created_on desc")
+    elsif params[:sort] == 'file_download_times'
+      @pro_resource = Attachment.where(:container_type => 'Project').order("downloads desc")
+    else
+      @pro_resource = Attachment.where(:container_type => 'Project').order("created_on desc")
+    end
+
+    @pro_resource = paginateHelper @pro_resource,30
+    @page = (params['page'] || 1).to_i - 1
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+
   def users
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
 
     case params[:format]
       when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 15})
+        @offset, @limit = api_offset_and_limit({:limit => 50})
       else
-        @limit = 15#per_page_option
+        @limit = 50 #per_page_option
     end
 
     @status = params[:status] || 1
@@ -339,7 +390,13 @@ class AdminController < ApplicationController
 
   #组织
   def organization
-    @organizations = Organization.all
+    @organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
+    #@organizations = Organization.all.order("created_at desc")
+    @organization_count = @organizations.count
+    @organization_pages = Paginator.new @organization_count, 30, params['page'] || 1
+    @organizations = paginateHelper @organizations,30
+
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end
@@ -347,17 +404,14 @@ class AdminController < ApplicationController
 
   #学校列表
   def schools
-    @school_name = params[:school_name]
-    if @school_name && @school_name != ''
-      @schools = School.where("name like '%#{@school_name}%'")
-    elsif @school_name.nil?
-      @schools = []
-    else  @school_name && @school_name == ' '
-    @schools = School.where('1=1')
-    end
+
+    @schools = School.find_by_sql("SELECT * FROM schools ORDER BY created_at DESC")
     @school_count = @schools.count
-    @school_pages = Paginator.new @school_count, 100, params['page'] || 1
-    @schools = paginateHelper @schools,100
+
+    @school_pages = Paginator.new @school_count, 30, params['page'] || 1
+    @schools = paginateHelper @schools,30
+
+    @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
     end

app/controllers/attachments_controller.rb

@@ -251,7 +251,7 @@ class AttachmentsController < ApplicationController
       @history.version =  @old_history.nil? ? 1 :  @old_history.version + 1
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
-      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads")
+      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes")
       @old_attachment.save
       #删除当前记录
       @attachment.delete

app/controllers/courses_controller.rb

@@ -240,6 +240,18 @@ class CoursesController < ApplicationController
     # req[:message] = l(:modal_valid_passing) if req[:message].blank?
     render :json => req
   end
+
+  def teacher_assign_group
+    member = Member.where(:course_id => @course.id, :user_id => params[:user_id]).first
+    member.course_group_id = params[:course_group_id].to_i
+    member.save
+    @course_groups = @course.course_groups
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def join_group
     @subPage_title = l :label_student_list
     group = CourseGroup.find(params[:object_id])
@@ -838,6 +850,8 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
+    # 统计访问量
+    @course.update_attribute(:visits, @course.visits.to_i + 1)
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)
@@ -1067,7 +1081,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1079,7 +1093,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}

app/controllers/files_controller.rb

@@ -559,7 +559,8 @@ class FilesController < ApplicationController
          end
        end
        # 更新课程英雄榜得分
-       update_contributor_score(@course, attachments[:files].first)
+       course_member_score(@course.id, attachments[:files].first.author_id, "Attachment")
+       # end
        # end
        # TODO: 临时用 nyan
        sort_init 'created_on', 'desc'
@@ -632,18 +633,6 @@ class FilesController < ApplicationController
    end
   end
 
-  def update_contributor_score(course, file )
-    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
-    if  course_contributor_score.nil?
-      CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
-                                    :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
-    else
-      score = course_contributor_score.resource_num + 5
-      total_score = course_contributor_score.total_score + 5
-      course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
-    end
-  end
-
   def get_project_tag_name_by_type_nmuber type
     case type
       when "1"

app/controllers/homework_common_controller.rb

@@ -17,9 +17,9 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]

app/controllers/news_controller.rb

@@ -107,32 +107,18 @@ class NewsController < ApplicationController
 
   def show
     # 更新news对应的forge_messages的消息viewed字段
+    ids = @news.comments.map { |comment| comment.id }.join(",") unless @news.comments.nil?
     if @project
-      query_message_news = @news.forge_messages
+      # 更新新闻
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      # 更新新闻的时候一并更新回复
+      ForgeMessage.where("forge_message_id in (#{ids}) and forge_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     else
-      query_message_news = @news.course_messages
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      CourseMessage.where("course_message_id in (#{ids}) and course_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     end
-    query_message_news.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-    end
-    # 更新项目新闻的评阅的消息viewed字段
-    current_message_comments = @news.comments
-    current_message_comments.each do |current_message_comment|
-    if @project
-      query_message_comment = current_message_comment.forge_messages
-    else
-      query_message_comment = current_message_comment.course_messages
-    end
-    query_message_comment.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-      end
-    end
-    # end
-
+    query_message_news.update_attribute(:viewed, true) unless query_message_news.nil?
+    # over
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

app/controllers/organizations_controller.rb

@@ -69,6 +69,8 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      # 统计访问量
+      @organization.update_attribute(:visits, @organization.visits.to_i + 1)
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0

app/controllers/projects_controller.rb

@@ -298,6 +298,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+    # 统计访问量
+    @project.update_attribute(:visits, @project.visits.to_i + 1)
 =begin
     cond = @project.project_condition(Setting.display_subprojects_issues?)
     has = {
@@ -406,6 +408,7 @@ class ProjectsController < ApplicationController
       end
       flash.now[:error] = html if !html.to_s.blank?
     end
+    # for：设置默认分支
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
     @repository = Repository.factory(scm)
     @repository.is_default = @project.repository.nil?

app/controllers/repositories_controller.rb

@@ -140,7 +140,7 @@ class RepositoriesController < ApplicationController
             attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?}
             redirect_to new_project_url(attrs, :course => '0')
           else
-            redirect_to settings_project_url(project)
+            redirect_to project_path(project)
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) }
@@ -431,8 +431,11 @@ update
 
   def entry
     entry_and_raw(false)
+    @content = @repository.cat(@path, @rev)
+    if is_entry_text_data?(@content, @path)
       render :layout => 'base_projects'
     end
+  end
 
   def entry_and_raw(is_raw)
     @entry = @repository.entry(@path, @rev)
@@ -443,9 +446,7 @@ update
 
     @content = @repository.cat(@path, @rev)
     (show_error_not_found; return) unless @content
-    if is_raw ||
-        (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
-        ! is_entry_text_data?(@content, @path)
+    if is_raw || (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || !is_entry_text_data?(@content, @path)
       # Force the download
       send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
       send_type = Redmine::MimeType.of(@path)

app/controllers/student_work_controller.rb

@@ -36,6 +36,14 @@ class StudentWorkController < ApplicationController
           unless student_work.save
             resultObj[:status] = 200
           else
+            student_work.name = params[:title]
+            student_work.description = params[:src]
+            if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+              student_work.late_penalty = @homework.late_penalty
+            else
+              student_work.late_penalty = 0
+            end
+            student_work.save
             resultObj[:status] = result["status"].to_i
             resultObj[:time] = student_work_test.created_at.to_s(:db)
             resultObj[:index] = student_work.student_work_tests.count
@@ -91,25 +99,27 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-        @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? ||
-            (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+      #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -129,15 +139,21 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+            else
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -148,25 +164,28 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-        @show_all = true
-      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
-        if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+      if @homework.is_open == 1 || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+        if @order == 'lastname'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+        elsif @order == 'student_id'
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+        else
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+        end
         @show_all = true
-        elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+      elsif User.current.member_of_course?(@course)
+        if @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
             pro = @homework.student_work_projects.where(:user_id => User.current.id).first
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -186,15 +205,21 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+            if @order == 'lastname'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+            elsif @order == 'student_id'
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+            else
+              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
+            end
             @show_all = true
           end
         else
@@ -205,7 +230,7 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -303,6 +328,7 @@ class StudentWorkController < ApplicationController
             stu_project.save
           end
         end
+        @homework.update_attributes(:updated_at => Time.now)
         update_course_activity(@homework.class,@homework.id)
         update_user_activity(@homework.class,@homework.id)
         update_org_activity(@homework.class,@homework.id)
@@ -500,6 +526,10 @@ class StudentWorkController < ApplicationController
         when 3 #学生评分 学生评分显示平均分
           @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
       end
+      @homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(@homework.class,@homework.id)
+      update_user_activity(@homework.class,@homework.id)
+      update_org_activity(@homework.class,@homework.id)
       if @work.save
         respond_to do |format|
           format.js

app/controllers/users_controller.rb

@@ -58,6 +58,7 @@ class UsersController < ApplicationController
   helper :sort
   helper :attachments
   include SortHelper
+  include ApplicationHelper
   helper :custom_fields
   include CustomFieldsHelper
   include AvatarHelper
@@ -375,13 +376,15 @@ class UsersController < ApplicationController
 
   #用户作业列表
   def user_homeworks
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
     @user = User.current
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     if(params[:type].blank? || params[:type] == "1") #公共题库
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @limit = 15
@@ -422,7 +425,7 @@ class UsersController < ApplicationController
   end
 
   def choose_user_course
-    homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:send_id].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}
@@ -524,20 +527,22 @@ class UsersController < ApplicationController
   end
 
   def user_homework_type
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     if(params[:type].blank? || params[:type] == "1") #公共题库
       visible_course = Course.where("is_public = 1 && is_delete = 0")
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @property = params[:property]
@@ -563,6 +568,8 @@ class UsersController < ApplicationController
 
   #用户主页过滤作业
   def user_search_homeworks
+    @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc"
+    @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     search = params[:name].to_s.strip.downcase
     if(params[:type].blank? || params[:type] == "1") #全部
@@ -572,16 +579,16 @@ class UsersController < ApplicationController
       all_user_ids = all_homeworks.map{|hw| hw.user_id}
       user_str_ids = search_user_by_name all_user_ids, search
       user_ids = user_str_ids.empty? ? "(-1)" : "(" + user_str_ids.join(",") + ")"
-      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("created_at desc")
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #课程资源
-      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("created_at desc")
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and (name like '%#{search}%')").order("#{@order} #{@b_sort}")
     end
     if params[:property] && params[:property] == "1"
-      @homeworks = @homeworks.where("homework_type = 1").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "2"
-      @homeworks = @homeworks.where("homework_type = 2").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}")
     elsif params[:property] && params[:property] == "3"
-      @homeworks = @homeworks.where("homework_type = 3").reorder("created_at desc")
+      @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}")
     end
     @type = params[:type]
     @limit = 15
@@ -591,6 +598,8 @@ class UsersController < ApplicationController
     @offset ||= @hw_pages.offset
     @homeworks = paginateHelper @homeworks,15
     @is_import = params[:is_import]
+    @property = params[:property]
+    @search = search
     respond_to do |format|
       format.js
     end
@@ -690,6 +699,11 @@ class UsersController < ApplicationController
       end
 
       student_work.save
+      homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(homework.class,homework.id)
+      update_user_activity(homework.class,homework.id)
+      update_org_activity(homework.class,homework.id)
+
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
     else
@@ -1168,6 +1182,10 @@ class UsersController < ApplicationController
   end
 
   def show
+    # 统计访问量
+    unless User.current == @user
+      @user.update_attribute(:visits, @user.visits.to_i + 1)
+    end
     #更新用户申请成为课程老师或教辅消息的状态
     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 =?",
@@ -1537,7 +1555,7 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
-    Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
+    attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       if params[:status] == 2
@@ -2322,9 +2340,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
-                                       "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                       "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("created_on desc")
+    attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("created_on desc")
   end
 
   # 获取我的资源
@@ -2341,7 +2357,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源课程
   def get_course_resources_public user_course_ids
-    attchments = Attachment.where("(container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("created_on desc")
   end
 
   # 获取我的项目资源
@@ -2351,7 +2367,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids
-    attchments = Attachment.where("(container_type = 'Project') or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我上传的附件
@@ -2361,7 +2377,7 @@ class UsersController < ApplicationController
 
   # 获取公共资源中我上传的附件
   def get_attch_resources_public
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')").order("created_on desc")
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 获取我的用户类型资源
@@ -2371,7 +2387,7 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public
-    attchments = Attachment.where("container_type = 'Principal'").order("created_on desc")
+    attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("created_on desc")
   end
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2603,9 +2619,7 @@ class UsersController < ApplicationController
       end
     elsif  params[:type] == "6" #全部资源
       # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("((is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) "+
-                                          "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
-                                          "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and  (filename like :p)" ,:p => search).order("created_on desc")
+      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
     end
     @type = params[:type]
     @limit = 25

app/controllers/words_controller.rb

@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-
+          @homework_common.update_attributes(:updated_at => Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)

app/helpers/application_helper.rb

@@ -117,56 +117,102 @@ module ApplicationHelper
       when "HomeworkCommon"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1 , :total_score => 1)
+                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1)
         else
           score = course_contributor_score.homework_journal_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:homework_journal_num => score)
         end
-      when "JournalForMessage"
+      # 课程留言
+      when "Course"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0)
         else
           score = course_contributor_score.journal_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:journal_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:journal_num => score)
         end
       when  "Message"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 2, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 2)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1, :message_reply_num => 0,
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
-          score = course_contributor_score.message_num + 2
-          total_score = course_contributor_score.total_score + 2
-          course_contributor_score.update_attributes(:message_num => score, :total_score => total_score)
+          score = course_contributor_score.message_num + 1
+          course_contributor_score.update_attributes(:message_num => score)
         end
       when "MessageReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.message_reply_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:message_reply_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:message_reply_num => score)
         end
       when "NewReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.news_reply_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:news_reply_num => score)
         end
       when "News"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.news_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:news_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:news_num => score)
+        end
+      when "Attachment"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                        :news_reply_num => 0, :news_num => 0, :resource_num => 1, :journal_num => 0, :journal_reply_num => 0)
+        else
+          score = course_contributor_score.resource_num + 1
+          course_contributor_score.update_attributes(:resource_num => score)
+        end
+    end
+  end
+
+  # 删除某条记录相应减少课程统计数
+  def down_course_score_num (course_id,user_id,type)
+    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first
+    case type
+      when "HomeworkCommon"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.homework_journal_num - 1
+          course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
+        end
+      # 课程留言
+      when "Course"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.journal_num - 1
+          course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
+        end
+      when  "Message"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.message_num - 1
+          course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
+        end
+      when "MessageReply"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.message_reply_num - 1
+          course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
+        end
+      when "NewReply"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.news_reply_num - 1
+          course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
+        end
+      when "News"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.news_num - 1
+          course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
+        end
+      when "Attachment"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.resource_num - 1
+          course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
         end
     end
   end
@@ -2895,3 +2941,13 @@ int main(int argc, char** argv){
     end
   end
 end
+
+def user_url_in_org(user_id)
+  if Rails.env.development?
+    return "http://localhost:3000/users/" + user_id.to_s
+  elsif Rails.env.test?
+    return "https://www.test.forge.trustie.net/users/" + user_id.to_s
+  else
+    return "https://www.trustie.net/users/" + user_id.to_s
+  end
+end

app/helpers/courses_helper.rb

@@ -71,6 +71,11 @@ module CoursesHelper
     project.members.count
   end
 
+  # 统计课程中作品的数量
+  def student_works_num course
+    StudentWork.find_by_sql("SELECT * FROM student_works WHERE homework_common_id IN (SELECT id FROM homework_commons WHERE course_id = '#{course.id}')").count
+  end
+
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
     project ? project.members.count - studentCount(project).to_i : 0
@@ -601,6 +606,24 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  #分班下拉框
+  def course_group_option course
+    type = []
+    option1 = []
+    option1 << "暂无"
+    option1 << 0
+    type << option1
+    unless course.course_groups.nil?
+      course.course_groups.each do |cg|
+        option = []
+        option << cg.name
+        option << cg.id
+        type << option
+      end
+    end
+    type
+  end
+
   #课程实践年份下拉框
   def course_time_option year
     type = []
@@ -762,7 +785,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end

app/helpers/files_helper.rb

@@ -121,7 +121,8 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? ||
+      if (attachment.is_public? && attachment.container_type != "Course") ||
+          (attachment.is_public? && attachment.container_type == "Course" && attachment.is_publish == 1)||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||

app/helpers/school_helper.rb

@@ -1,2 +1,15 @@
 module SchoolHelper
+  def schoolMember_num school
+    count = student_num(school) + teacher_num(school)
+    count.to_s
+  end
+
+  def student_num school
+    UserExtensions.find_by_sql("SELECT * FROM user_extensions WHERE occupation = '#{school.name}' AND identity = '1'").count
+  end
+
+  def teacher_num school
+    UserExtensions.find_by_sql("SELECT * FROM user_extensions AS ue, schools AS s WHERE ue.school_id = s.id AND s.name = '#{school.name}' AND ue.identity = '0'").count
+  end
+
 end

app/models/attachment.rb

@@ -43,6 +43,7 @@ class Attachment < ActiveRecord::Base
 
   #elasticsearch
   include Elasticsearch::Model
+  include ApplicationHelper
   #elasticsearch kaminari init
   Kaminari::Hooks.init
   Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
@@ -92,7 +93,7 @@ class Attachment < ActiveRecord::Base
   after_save :act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
-  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count
+  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count, :down_course_score
 
   # add by nwb
   # 获取所有可公开的资源文件列表
@@ -498,6 +499,12 @@ class Attachment < ActiveRecord::Base
     result
   end
 
+  def self.attach_filesex_public(obj, attachments,attachment_type, is_public)
+    result = obj.save_attachmentsex_public(attachments, User.current,attachment_type, is_public)
+    obj.attach_saved_attachments
+    result
+  end
+
   def self.latest_attach(attachments, filename)
     attachments.sort_by(&:created_on).reverse.detect {
       |att| att.filename.downcase == filename.downcase
@@ -655,6 +662,12 @@ class Attachment < ActiveRecord::Base
       self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
+
+  def down_course_score
+    if self.container_type == "Course"
+      down_course_score_num(self.container_id, self.author_id, "Attachment")
+    end
+  end
 end
 
 # Delete the previous articles index in Elasticsearch

app/models/comment.rb

@@ -36,6 +36,7 @@ class Comment < ActiveRecord::Base
   validates_presence_of :commented, :author, :comments
   safe_attributes 'comments'
   after_create :send_mail, :act_as_system_message, :act_as_student_score
+  after_destroy :down_course_score
 
   def act_as_system_message
     if self.commented.course
@@ -86,4 +87,11 @@ class Comment < ActiveRecord::Base
     end
   end
 
+  # 课程新闻数减少
+  def down_course_score
+    if self.commented.course
+      down_course_score_num(self.commented.course.id, self.author_id, "NewReply")
+    end
+  end
+
 end

app/models/journals_for_message.rb

@@ -73,7 +73,7 @@ class JournalsForMessage < ActiveRecord::Base
   #after_update :update_activity
   after_destroy :reset_counters!
   after_save :be_user_score
-  after_destroy :down_user_score
+  after_destroy :down_user_score, :down_course_score
 
   # default_scope { where('m_parent_id IS NULL') }
 
@@ -184,6 +184,7 @@ class JournalsForMessage < ActiveRecord::Base
       end
     end
   end
+
   # 更新用户分数     -by zjc
   def down_user_score
     #删除了留言回复
@@ -286,10 +287,19 @@ class JournalsForMessage < ActiveRecord::Base
   # 课程成员得分（活跃度）
   def act_as_student_score
     if self.jour_type == "Course"
-      course_member_score(self.jour_id, self.user_id, "JournalForMessage")
+      course_member_score(self.jour_id, self.user_id, "Course")
     elsif self.jour_type == "HomeworkCommon"
       course_member_score(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
 
+  # 删除操作的时候相应扣掉回复数
+  def down_course_score
+    if self.jour_type == "Course"
+      down_course_score_num(self.jour_id, self.user_id, "Course")
+    elsif self.jour_type == "HomeworkCommon"
+      down_course_score_num(self.jour.course_id, self.user_id, "HomeworkCommon")
+    end
+  end
+
 end

app/models/member.rb

@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("IF(final_score is null,null,final_score - absence_penalty - late_penalty) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,7 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    sql_select = "SELECT (SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))) as score
+    sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))) as score
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{self.course_id}

app/models/message.rb

@@ -79,7 +79,7 @@ class Message < ActiveRecord::Base
 
   after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
   after_update :update_messages_board, :update_activity
-  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count
+  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
   
   after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
   #before_save :be_user_score
@@ -354,6 +354,18 @@ class Message < ActiveRecord::Base
     end
   end
 
+  # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数
+  def down_course_score
+    if self.course
+      if self.parent_id.nil?  # 发帖
+        down_course_score_num(self.course.id, self.author_id, "Message")
+      else
+        # 回帖
+        down_course_score_num(self.course.id, self.author_id, "MessageReply")
+      end
+    end
+  end
+
   def delete_org_activities
     OrgActivity.where("org_act_type='Message' and org_act_id =#{self.id} and container_type='OrgSubfield'").destroy_all
   end

app/models/news.rb

@@ -61,7 +61,7 @@ class News < ActiveRecord::Base
 
   after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
   after_update :update_activity
-  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities
+  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
   scope :visible, lambda {|*args|
     includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
@@ -195,10 +195,18 @@ class News < ActiveRecord::Base
     OrgActivity.where("container_type='OrgSubfield' and org_act_type='News' and org_act_id=?", self.id).destroy_all
   end
 
+  # 新增新闻统计数增加
   def act_as_student_score
     if self.course
       course_member_score(self.course.id, self.author_id, "News")
     end
   end
 
+  # 删除新闻统计数减少
+  def down_course_score
+    if self.course
+      down_course_score_num(self.course.id, self.author_id, "News")
+    end
+  end
+
 end

app/models/praise_tread.rb

@@ -2,8 +2,8 @@ class PraiseTread < ActiveRecord::Base
   attr_accessible :user_id,:praise_tread_object_id,:praise_tread_object_type,:praise_or_tread
   belongs_to :user
   belongs_to :praise_tread_object, polymorphic: true
-  after_create :be_user_score
-  after_destroy :down_user_score
+  #after_create :be_user_score
+  #after_destroy :down_user_score
   include UserScoreHelper
   def self.find_object_by_type_and_id(type,id)
     @obj = nil

app/views/admin/course_resource_list.html.erb

@@ -0,0 +1,66 @@
+<h3><%=l(:label_course_resource_list)%></h3>
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+
+      <th style="width: 60px;">
+        资源名称
+      </th>
+      <th style="width: 30px;">
+        <%= link_to "资源大小",admin_course_resource_list_path(:sort => "file_size") %>
+      </th>
+      <th style="width: 25px;">
+        资源类型
+      </th>
+      <th style="width: 23px;">
+        <%= link_to "上传时间",admin_course_resource_list_path(:sort => "file_upload") %>
+      </th>
+      <th style="width: 15px;">
+        <%= link_to "下载次数",admin_course_resource_list_path(:sort => "file_download_times") %>
+      </th>
+      <th style="width: 20px;">
+        上传者
+      </th>
+      <th style="width: 35px;">
+        所属课程
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @resource.each do |resource| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: left;">
+            <%= link_to truncate(resource.filename, :length => 18), download_named_attachment_path(resource.id, resource.filename ), :title => resource.filename,:class=>'resourcesBlack'%>
+          </td>
+          <td style=" text-align: center;">
+            <%=  number_to_human_size(resource.filesize)%>
+          </td>
+          <td style=" text-align: center;">
+            课程资源
+          </td>
+          <td style=" text-align: center;">
+            <%= format_date(resource.created_on)%>
+          </td>
+          <td style=" text-align: center;">
+            <%= resource.downloads %>
+          </td>
+          <td style=" text-align: center;">
+            <%= link_to(User.find(resource.author_id).realname, user_path(User.find(resource.author_id)) ) %>
+          </td>
+          <td style=" text-align: center;">
+            <%=link_to truncate(Course.find(resource.container_id).name, :length => 10), course_path(Course.find(resource.container_id)), :title => Course.find(resource.container_id).name, :class => "hidden fl w170" %>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_course_resource_list)) -%>

app/views/admin/excellent_courses.html.erb

@@ -0,0 +1,77 @@
+<h3>
+  <%=l(:label_excellent_courses_list)%>
+</h3>
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 25px;">
+        序号
+      </th>
+      <th style="width: 120px;">
+        课程名
+      </th>
+      <th style="width: 50px;">
+        主讲老师
+      </th>
+      <th style="width: 30px;">
+        学生数
+      </th>
+      <th style="width: 25px;">
+        作业数
+      </th>
+      <th style="width: 25px;">
+        作品数
+      </th>
+      <th style="width: 25px;">
+        资源数
+      </th>
+      <th style="width: 70px;">
+        帖子数
+      </th>
+      <th style="width: 70px;">
+        动态数
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @courses.each do |course| %>
+        <tr class="<%= cycle("odd", "even") %>">
+          <td style="text-align: center;">
+            <%= course.id %>
+          </td>
+          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=course.name%>'>
+            <span>
+              <%= link_to(course.name, course_path(course.id)) %>
+            </span>
+          </td>
+          <td align="center">
+            <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+          </td>
+          <td align="center">
+            <%= studentCount(course) %>
+          </td>
+          <td class="center">
+            <%= course.homework_commons.count%>
+          </td>
+          <td class="center">
+            <%= student_works_num(course) %>
+          </td>
+          <td class="center">
+            <%= visable_attachemnts_incourse(course).count%>
+          </td>
+          <td class="center">
+            <%= course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", course.boards.first.id, nil).count %>
+
+          </td>
+          <td class="center">
+            <%= course.course_activities.count%>
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<% html_title(l(:label_excellent_courses_list)) -%>