Merge branch 'develop' into ouyangxuhua

app/controllers/admin_controller.rb

@@ -32,18 +32,20 @@ class AdminController < ApplicationController
   end
 
   def projects
+=begin
     @status = params[:status] || 1
 
-    scope = Project.status(@status).order('id asc')
+    scope = Project.status(@status)
     scope = scope.like(params[:name]) if params[:name].present?
-    @projects = scope.where(project_type: Project::ProjectType_project).all
-
+    @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all
+=end
+    @projects = Project.like(@name).order('created_on desc')
     render :action => "projects", :layout => false if request.xhr?
   end
 
   def courses
     @name = params[:name]
-    @courses = Course.like(@name)
+    @courses = Course.like(@name).order('created_at desc')
     respond_to do |format|
       format.html
     end
@@ -469,6 +471,23 @@ class AdminController < ApplicationController
     end
   end
 
+  #最近登录老师列表
+  def latest_login_teachers
+    scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 ORDER BY last_login_on DESC")
+    if params[:startdate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on>= '#{params[:startdate]} 00:00:00' ORDER BY last_login_on DESC")
+    end
+    if params[:enddate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on <= '#{params[:enddate]} 23:59:59' ORDER BY last_login_on DESC")
+    end
+    @teachers = scope
+    @teachers = paginateHelper @teachers,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
   #作业
   def homework
     @homework = HomeworkCommon.order('end_time desc')

app/controllers/blogs_controller.rb

@@ -29,7 +29,7 @@ class BlogsController < ApplicationController
   def set_homepage
     @blog = Blog.find(params[:id])
     @blog.update_attribute(:homepage_id, params[:article_id])
-    redirect_to user_blogs_path(params[:user_id])
+    redirect_to user_path(params[:user_id])
   end
 
   def cancel_homepage

app/controllers/courses_controller.rb

@@ -450,6 +450,93 @@ class CoursesController < ApplicationController
       #copy avatar
       copy_avatar(@course, copy_course)
 
+      if params[:course_content_type]
+        params[:course_content_type].each do |type|
+          case type
+            when "0"
+              homeworks = copy_course.homework_commons
+              homeworks.each do |homework|
+                new_homework = HomeworkCommon.new
+                new_homework.name = homework.name
+                new_homework.user_id = User.current.id
+                new_homework.description = homework.description
+                new_homework.publish_time = Date.today + 30
+                new_homework.end_time = Date.today + 60
+                new_homework.homework_type = homework.homework_type
+                new_homework.late_penalty = homework.late_penalty
+                new_homework.course_id = @course.id
+                new_homework.teacher_priority = homework.teacher_priority
+                new_homework.anonymous_comment = homework.anonymous_comment
+                new_homework.quotes = 0
+                new_homework.is_open = homework.is_open
+                homework.attachments.each do |attachment|
+                  att = attachment.copy
+                  att.container_id = nil
+                  att.container_type = nil
+                  att.copy_from = attachment.id
+                  att.save
+                  new_homework.attachments << att
+                end
+                homework_detail_manual = homework.homework_detail_manual
+                homework_detail_programing = homework.homework_detail_programing
+                homework_detail_group = homework.homework_detail_group
+                if homework_detail_manual
+                  new_homework.homework_detail_manual = HomeworkDetailManual.new
+                  new_homework_detail_manual =  new_homework.homework_detail_manual
+                  new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+                  new_homework_detail_manual.comment_status = 0
+                  new_homework_detail_manual.evaluation_start = Date.today + 67
+                  new_homework_detail_manual.evaluation_end = Date.today + 74
+                  new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+                  new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+                end
+                if homework_detail_programing
+                  new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+                  new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+                  new_homework.homework_detail_programing.language = homework_detail_programing.language
+                  homework.homework_tests.each_with_index do |homework_test|
+                    new_homework.homework_tests << HomeworkTest.new(
+                        input: homework_test.input,
+                        output: homework_test.output
+                    )
+                  end
+                end
+
+                if homework_detail_group
+                  new_homework.homework_detail_group = HomeworkDetailGroup.new
+                  new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+                  new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+                  new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+                end
+                if new_homework.save
+                  new_homework_detail_manual.save if new_homework_detail_manual
+                  new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+                  new_homework.homework_detail_group.save if new_homework.homework_detail_group
+                end
+                homework.update_attribute(:quotes, homework.quotes+1)
+              end
+            when "1"
+              attachments = copy_course.attachments
+              attachments.each do |attachment|
+                attach_copied_obj = attachment.copy
+                attach_copied_obj.tag_list.add(attachment.tag_list) # tag关联
+                attach_copied_obj.container = @course
+                attach_copied_obj.created_on = Time.now
+                attach_copied_obj.author_id = User.current.id
+                attach_copied_obj.copy_from = attachment.copy_from.nil? ? attachment.id : attachment.copy_from
+                attach_copied_obj.is_publish = 0
+                attach_copied_obj.publish_time = Date.today + 30
+                if attach_copied_obj.attachtype == nil
+                  attach_copied_obj.attachtype = 4
+                end
+                attach_copied_obj.save
+                update_quotes attach_copied_obj
+              end
+          end
+        end
+      end
+
+=begin
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|
@@ -513,6 +600,7 @@ class CoursesController < ApplicationController
           end
         end
       end
+=end
     end
     if @course
       respond_to do |format|

app/controllers/files_controller.rb

@@ -533,6 +533,7 @@ class FilesController < ApplicationController
            if attachment.publish_time > Date.today
              attachment.is_publish = 0
            end
+           attachment.description = params[:description]
            attachment.save
          end
        end
@@ -632,16 +633,14 @@ class FilesController < ApplicationController
   end
 
   def update_contributor_score(course, file )
-    unless  file.author.allowed_to?(:as_teacher, course)
-      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
+    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
 

app/controllers/homework_common_controller.rb

@@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController
 
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -261,6 +261,30 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def open_student_works
+    if @homework.is_open == 0
+      @homework.update_attribute(:is_open, 1)
+    else
+      @homework.update_attribute(:is_open, 0)
+    end
+    @user_activity_id = params[:user_activity_id]
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+  end
+
+  def alert_open_student_works
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def programing_test
     test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
     @index = params[:index]

app/controllers/projects_controller.rb

@@ -66,6 +66,7 @@ class ProjectsController < ApplicationController
   helper :words
   helper :project_score
   helper :user_score
+  include UsersHelper
   ### added by william
   include ActsAsTaggableOn::TagsHelper
 
@@ -405,11 +406,16 @@ class ProjectsController < ApplicationController
       end
       flash.now[:error] = html if !html.to_s.blank?
     end
-      scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
-      @repository = Repository.factory(scm)
-      @repository.is_default = @project.repository.nil?
-      @repository.project = @project
-
+    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
+    @repository = Repository.factory(scm)
+    @repository.is_default = @project.repository.nil?
+    @repository.project = @project
+    unless @project.gpid.nil?
+      g = Gitlab.client
+      @gitlab_branches = g.branches(@project.gpid)
+      @branch_names = g.branches(@project.gpid).map{|b| b.name}
+      @gitlab_default_branch = g.project(@project.gpid).default_branch
+    end
   end
 
   # 项目邀请用户加入实现过程
@@ -670,8 +676,7 @@ class ProjectsController < ApplicationController
     # 更新公开私有时同步gitlab公开私有
     unless @project.gpid.nil?
       g = Gitlab.client
-      gproject = g.project(@project.gpid)
-      params[:project][:is_public] ? g.edit_project(gproject.id, 20) : g.edit_project(gproject.id, 0)
+      params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
     end
     # end
     if validate_parent_id && @project.save

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -521,6 +521,13 @@ update
     end
   end
 
+  # 每次提交对应的文件差异
+  def commit_diff
+    @commit_diff = $g.commit_diff(@project.gpid, params[:changeset])
+    @commit_details = $g.commit(@project.gpid, params[:changeset])
+    render :layout => 'base_projects'
+  end
+
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)
@@ -626,9 +633,10 @@ update
     end
     (render_404; return false) unless @repository
     @path = params[:path].is_a?(Array) ? params[:path].join('/') : params[:path].to_s
-    @rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip
+    # gitlab端获取默认分支
+    gitlab_branchs = $g.project(@project.gpid).default_branch
+    @project.gpid.nil? ? (@rev = params[:rev].blank? ? @repository.default_branch : params[:rev].to_s.strip) : (@rev = params[:rev].blank? ? gitlab_branchs : params[:rev].to_s.strip)
     @rev_to = params[:rev_to]
-
     unless @rev.to_s.match(REV_PARAM_RE) && @rev_to.to_s.match(REV_PARAM_RE)
       if @repository.branches.blank?
         raise InvalidRevisionParam

app/controllers/student_work_controller.rb

@@ -6,9 +6,10 @@ class StudentWorkController < ApplicationController
   require "base64"
   before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
-  before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
+  before_filter :member_of_course, :only => [:new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
+  before_filter :is_logged, :only => [:index]
 
   ### 
   def program_test
@@ -91,101 +92,119 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      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?)
+      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.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 = []
+      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
+          @show_all = true
+        elsif @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)
+            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(:id => pro.student_work_id)
+            @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)
           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)
-        end
-      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        if @homework.homework_type == 3
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          if pro.nil?
-            my_work = []
+        elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            if pro.nil?
+              my_work = []
+            else
+              my_work = @homework.student_works.where(:id => pro.student_work_id)
+            end
           else
-            my_work = @homework.student_works.where(:id => pro.student_work_id)
+            my_work = @homework.student_works.where(:user_id => User.current.id)
           end
-        else
-          my_work = @homework.student_works.where(:user_id => User.current.id)
-        end
-        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        if @homework.homework_type == 3
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          if pro.nil?
-            my_work = []
+          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+        elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            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)
+            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(:id => pro.student_work_id)
+            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)
+          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
+            @show_all = true
           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)
-        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
-          @show_all = true
         end
       else
-        @stundet_works = []
+        render_403
+        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
     else
-      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?)   #老师 || 超级管理员 显示所有列表
+      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.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 = []
+      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
+          @show_all = true
+        elsif @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)
+            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(:id => pro.student_work_id)
+            @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)
           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)
-        end
-      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
-        if @homework.homework_type == 3
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          if pro.nil?
-            my_work = []
+        elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            if pro.nil?
+              my_work = []
+            else
+              my_work = @homework.student_works.where(:id => pro.student_work_id)
+            end
           else
-            my_work = @homework.student_works.where(:id => pro.student_work_id)
+            my_work = @homework.student_works.where(:user_id => User.current.id)
           end
-        else
-          my_work = @homework.student_works.where(:user_id => User.current.id)
-        end
-        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
-      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
-        if @homework.homework_type == 3
-          pro = @homework.student_work_projects.where(:user_id => User.current.id).first
-          if pro.nil?
-            my_work = []
+          @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+        elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
+          if @homework.homework_type == 3
+            pro = @homework.student_work_projects.where(:user_id => User.current.id).first
+            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)
+            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(:id => pro.student_work_id)
+            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)
+          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
+            @show_all = true
           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)
-        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
-          @show_all = true
         end
       else
-        @stundet_works = []
+        render_403
+        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
     end
 
@@ -802,6 +821,10 @@ class StudentWorkController < ApplicationController
     render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
     if name == ""
@@ -1055,4 +1078,4 @@ class StudentWorkController < ApplicationController
       end
     end
   end
-end
+end

app/controllers/zipdown_controller.rb

@@ -134,8 +134,11 @@ class ZipdownController < ApplicationController
     homework_common.student_works.each do |work|
       unless work.attachments.empty?
         out_file = zip_student_work_by_user(work)
-        bid_homework_path << out_file.file_path
-        digests << out_file.file_digest
+
+          bid_homework_path << out_file.file_path
+          digests << out_file.file_digest
+
+
       end
     end
     homework_id = homework_common.id
@@ -172,7 +175,11 @@ class ZipdownController < ApplicationController
     }
   end
 
-  def zip_student_work_by_user work
+  def make_zip_name(work)
+    "#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}"
+  end
+
+  def zip_student_work_by_user(work)
     homeworks_attach_path = []
     not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
@@ -186,10 +193,23 @@ class ZipdownController < ApplicationController
         digests << 'not_exist_file'
       end
     end
-    out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
-      zipping("#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
-              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
-    }
+
+    #单个文件的话,不需要压缩,只改名
+    out_file = nil
+    if homeworks_attach_path.size == 1
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        des_path = "#{OUTPUT_FOLDER}/#{make_zip_name(work)}_#{File.basename(homeworks_attach_path.first)}"
+        FileUtils.cp homeworks_attach_path.first, des_path
+        des_path
+      }
+    else
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        zipping("#{make_zip_name(work)}.zip",
+                homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+      }
+    end
+    out_file
+
   end
 
 

app/helpers/application_helper.rb

@@ -110,11 +110,19 @@ module ApplicationHelper
     end
   end
 
-  # 更新课程英雄榜得分
-  # user传过来必须是学生
+  # 更新课程活跃度得分
   def course_member_score(course_id,user_id,type)
     course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first
     case type
+      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)
+        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)
+        end
       when "JournalForMessage"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
@@ -151,6 +159,15 @@ module ApplicationHelper
           total_score = course_contributor_score.total_score + 1
           course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_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)
+        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)
+        end
     end
   end
 
@@ -2512,7 +2529,7 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
-    if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+    if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status

app/helpers/courses_helper.rb

@@ -25,7 +25,7 @@ module CoursesHelper
     # 获取tag匹配结果ID
     a_tags = []
     # kc = keywords.to_a
-    Course.visible.where("is_excellent =?", 1).each do |ec|
+    Course.visible.where("is_excellent =? and is_public =?", 1, 1).each do |ec|
       if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
         a_tags << ec.id
       end
@@ -44,7 +44,7 @@ module CoursesHelper
     excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id}
     limit = 5 - excellent_ids.length.to_i
     sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
-         and c.is_excellent =1 and c.id != #{current_course.id} order by cs.updated_at desc;"
+         and c.is_excellent =1 and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;"
     default_ecourse_ids = Course.find_by_sql(sql).flatten
     # REDO:时间紧，待优化
     default_ids =[]
@@ -116,7 +116,7 @@ module CoursesHelper
     @course.journals_for_messages.where('m_parent_id IS NULL').count
   end
 
-  #当前学期
+  #当前学期(2015春季学期)
   def current_time_and_term course
     str = ""
     term = cur_course_term
@@ -144,6 +144,22 @@ module CoursesHelper
     val
   end
 
+  #当前学期(2015春)
+  def current_time_and_term_short course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term[0]
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term[0]
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term[0]
+    else
+      str = Time.now.year.to_s + cur_course_term[0]
+    end
+    str
+  end
+
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
    # searchStudent(project).count
@@ -840,7 +856,9 @@ module CoursesHelper
   end
 
   def contributor_course_scor(course_id)
-    ccs = CourseContributorScore.where("course_id =?", course_id).order("total_score desc") .limit(9)
+    ccs = CourseContributorScore.find_by_sql("SELECT * FROM `course_contributor_scores` where course_id = #{course_id} order by
+        (message_num*2 + message_reply_num + news_reply_num + news_num +
+         resource_num*5 + journal_num + homework_journal_num ) desc limit 9;")
   end
 
 end

app/helpers/repositories_helper.rb

@@ -41,6 +41,16 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier

app/models/attachment.rb

@@ -88,7 +88,8 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location,:act_as_course_activity
+  before_save :files_to_final_location
+  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
@@ -606,8 +607,14 @@ class Attachment < ActiveRecord::Base
 
   #课程动态公共表记录
   def act_as_course_activity
-    if self.container_type == "Course" && self.course_acts.empty?
-      self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+    if self.container_type == "Course"
+      if self.is_publish == 0
+        self.course_acts.destroy_all
+      else
+        if self.is_publish == 1 && self.course_acts.empty?
+          self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
+        end
+      end
     end
   end
 
@@ -644,8 +651,8 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1
-      self.container.project_score.update_attribute(:attach_num, aatach_count)
+      attach_count = self.container.project_score.attach_num - 1
+      self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
 end

app/models/comment.rb

@@ -82,9 +82,7 @@ class Comment < ActiveRecord::Base
   # 课程成员得分（英雄榜）
   def act_as_student_score
     if self.commented.course
-      unless self.author.allowed_to?(:as_teacher, self.commented.course)
-        course_member_score(self.commented.course.id, self.author_id, "NewReply")
-      end
+      course_member_score(self.commented.course.id, self.author_id, "NewReply")
     end
   end
 

app/models/course_contributor_score.rb

@@ -1,5 +1,6 @@
 class CourseContributorScore < ActiveRecord::Base
-  attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num, :resource_num, :user_id, :total_score
+  attr_accessible :course_id, :journal_num, :journal_reply_num, :message_num, :message_reply_num, :news_reply_num,
+                  :resource_num, :user_id, :total_score, :homework_journal_num, :news_num
   belongs_to :course
   belongs_to :user
 end

app/models/issue.rb

@@ -184,7 +184,7 @@ class Issue < ActiveRecord::Base
   def decrease_issues_count
     unless self.project.project_score.nil?
       issue_count = self.project.project_score.issue_num - 1
-      self.project.project_score.update_attribute(:issue_num, issue_count)
+      self.project.project_score.update_attribute(:issue_num, issue_count < 0 ? 0 : issue_count)
     end
   end
 

app/models/journal.rb

@@ -219,8 +219,9 @@ class Journal < ActiveRecord::Base
   # 减少留言数量统计
   def decrease_issues_journal_count
     unless self.issue.project.nil?
-      project = self.issue.project
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
+      journal_count = self.issue.project.project_score.issue_journal_num - 1
+      # project = self.issue.project
+       self.issue.project.project_score.update_attribute(:issue_journal_num, journal_count < 0 ? 0 : journal_count)
     end
   end
 

app/models/journals_for_message.rb

@@ -283,10 +283,12 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
-  # 课程成员得分（英雄榜）
+  # 课程成员得分（活跃度）
   def act_as_student_score
-    if !self.user.allowed_to?(:as_teacher, self.jour) && self.jour_type == "Course"
+    if self.jour_type == "Course"
       course_member_score(self.jour_id, self.user_id, "JournalForMessage")
+    elsif self.jour_type == "HomeworkCommon"
+      course_member_score(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
 

app/models/message.rb

@@ -148,10 +148,10 @@ class Message < ActiveRecord::Base
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
-        self.project.project_score.update_attribute(:board_num, count)
+        self.project.project_score.update_attribute(:board_num, count < 0 ? 0 : count)
       else # 回复
         count = self.project.project_score.board_message_num - 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
   end
@@ -341,17 +341,15 @@ class Message < ActiveRecord::Base
     delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE
   end
 
-  # 课程成员得分（英雄榜）
+  # 课程成员得分（活跃度）
   def act_as_student_score
     if self.course
-      unless  self.author.allowed_to?(:as_teacher, self.course)
-        if self.parent_id.nil?
-          # 发帖
-          course_member_score(self.course.id, self.author_id, "Message")
-        else
-          # 回帖
-          course_member_score(self.course.id, self.author_id, "MessageReply")
-        end
+      if self.parent_id.nil?
+        # 发帖
+        course_member_score(self.course.id, self.author_id, "Message")
+      else
+        # 回帖
+        course_member_score(self.course.id, self.author_id, "MessageReply")
       end
     end
   end

app/models/news.rb

@@ -59,7 +59,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  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
+  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
 
@@ -129,7 +129,7 @@ class News < ActiveRecord::Base
   def decrease_news_count
     if self.project && !self.project.project_score.nil?
       count = self.project.project_score.news_num - 1
-      self.project.project_score.update_attribute(:news_num, count)
+      self.project.project_score.update_attribute(:news_num, count < 0 ? 0 : count)
     end
   end
 
@@ -195,4 +195,10 @@ 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
+
 end