Merge branch 'cxt_course' into develop

Conflicts:
	db/schema.rb

app/controllers/homework_common_controller.rb

@@ -11,9 +11,9 @@ class HomeworkCommonController < ApplicationController
   before_filter :member_of_course, :only => [:index]
 
   def index
-    unless params[:page]
-      update_homework_time(@course.homework_commons)
-    end
+    #unless params[:page]
+    #  update_homework_time(@course.homework_commons)
+    #end
     @new_homework = HomeworkCommon.new
     @new_homework.homework_detail_manual = HomeworkDetailManual.new
     @new_homework.course = @course

db/migrate/20160509025404_update_activity.rb

@@ -0,0 +1,24 @@
+class UpdateActivity < ActiveRecord::Migration
+  def up
+    homeworks = HomeworkCommon.where("course_id = 342")
+    unless homeworks.nil?
+      homeworks.each do |h|
+        course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+        user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+        org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+        if course_activity && h.updated_at > course_activity.updated_at
+          course_activity.update_column('updated_at', h.updated_at)
+        end
+        if user_activity && h.updated_at > user_activity.updated_at
+          user_activity.update_column('updated_at', h.updated_at)
+        end
+        if org_activity && h.updated_at > org_activity.updated_at
+          org_activity.update_column('updated_at', h.updated_at)
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

lib/tasks/update_homework.rake

@@ -0,0 +1,65 @@
+#coding=utf-8
+
+namespace :update_homework do
+  desc "update homework project time"
+  def update_homework_time homeworks
+    unless homeworks.nil?
+      homeworks.each do |h|
+        if h.homework_type == 3
+          student_works = h.student_work_projects.where("is_leader = 1 && project_id != -1")
+          time = h.updated_at
+          unless student_works.nil?
+            student_works.each do |s|
+              project = Project.find s.project_id
+              unless project.nil? && project.gpid.nil?
+                project_time=project.updated_on
+                project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
+                if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S')
+                  time = project_time
+                end
+                begin
+                  # gitlab端获取默认分支
+                  g = Gitlab.client
+                  default_branch = g.project(project.gpid).default_branch
+                  changesets = g.commits(project.gpid, :ref_name => default_branch)
+                  changesets_latest_coimmit = changesets[0]
+                  unless changesets[0].blank?
+                    if time.strftime('%Y-%m-%d %H:%M:%S') <changesets_latest_coimmit.created_at.strftime('%Y-%m-%d %H:%M:%S')
+                      time = changesets_latest_coimmit.created_at
+                    end
+                  end
+                rescue
+                end
+              end
+            end
+          end
+          s_time = time
+          if time.strftime('%Y-%m-%d %H:%M:%S') > h.updated_at.strftime('%Y-%m-%d %H:%M:%S')
+            h.update_column('updated_at', s_time)
+            course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+            if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              course_activity.update_column('updated_at', s_time)
+            end
+            user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+            if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              user_activity.update_column('updated_at', s_time)
+            end
+            org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+            if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              org_activity.update_column('updated_at', s_time)
+            end
+          end
+        end
+      end
+    end
+  end
+  task :update_homework => :environment do
+    year = Time.now.year
+    courses = Course.where("time > ? and is_delete = 0", (year.to_i - 2))
+    course_ids = courses.nil? ? '(-1)' : '(' + courses.map{|c| c.id}.join(',') + ')'
+    homeworks = HomeworkCommon.where("course_id in #{course_ids} and homework_type = 3")
+    unless homeworks.nil?
+      update_homework_time homeworks
+    end
+  end
+end