Merge remote-tracking branch 'origin/develop' into guange_dev

1234567

@@ -0,0 +1 @@
+{"access_token":"GrEg56Sg5QRM7IXghWlaDzNd-7iaQsqX2acszXkSTFwOh_OxtN_UNIJsj9rlSZeSkZSofQwd0KvFGv_StzARHeLw81JllcI3a3VuXgZ_cjbQnM3m00g0HiLtTniQFsEIUVIdABAPQD","expires_in":7200,"got_token_at":1461314104}

Gemfile

@@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
+gem 'wechat',git: 'https://github.com/guange2015/wechat.git'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'
 gem 'rest-client'
@@ -16,8 +17,9 @@ gem 'delayed_job_active_record'#, :group => :production
 gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
+gem 'rack-cors', :require => 'rack/cors'
 gem 'seems_rateable', '~> 1.0.13'
-gem "rails", "~> 3.2.13"
+gem 'rails', '~> 3.2'
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem 'coderay', '~> 1.1.0'
@@ -43,7 +45,7 @@ gem 'elasticsearch-rails'
 group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
-  gem 'rack-mini-profiler', '~> 0.9.3'
+  # gem 'rack-mini-profiler', '~> 0.9.3'
   if RUBY_PLATFORM =~ /w32/
     gem  'win32console'
   end

app/api/mobile/api.rb

@@ -7,6 +7,16 @@ module Mobile
   require_relative 'apis/upgrade'
   require_relative 'apis/homeworks'
   require_relative 'apis/comments'
+  require_relative 'apis/issues'
+  require_relative 'apis/activities'
+  require_relative 'apis/whomeworks'
+  require_relative 'apis/newss'
+  require_relative 'apis/journal_for_messages'
+  require_relative 'apis/messages'
+  require_relative 'apis/blog_comments'
+  require_relative 'apis/new_comment'
+  require_relative 'apis/praise'
+
   class API < Grape::API
     version 'v1', using: :path
     format :json
@@ -39,6 +49,15 @@ module Mobile
     mount Apis::Upgrade
     mount Apis::Homeworks
     mount Apis::Comments
+    mount Apis::Issues
+    mount Apis::Activities
+    mount Apis::Whomeworks
+    mount Apis::Newss
+    mount Apis::JournalForMessages
+    mount Apis::Messages
+    mount Apis::BlogComments
+    mount Apis::NewComment
+    mount Apis::Praise
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
     #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?

app/api/mobile/apis/activities.rb

@@ -0,0 +1,63 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Activities< Grape::API
+      resources :activities do
+
+        desc "get user activities"
+
+        params do
+          requires :page, type: Integer
+          requires :openid, type: String
+        end
+        post do
+          user = UserWechat.find_by_openid(params[:openid]).user
+=begin
+          shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
+          shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+          page = params[:page] ? params[:page] : 0
+          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
+          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+          project_types = "('Message','Issue','ProjectCreateInfo')"
+          principal_types = "JournalsForMessage"
+
+          blog_ids = "("+user.blog.id.to_s+","+((User.watched_by(user.id).count == 0 )? '0' :User.watched_by(user.id).map{|u| u.blog.id}.join(','))+")"
+          activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                              "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
+                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
+=end
+
+          shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
+          shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+          page = params[:page] ? params[:page] : 0
+          user_project_ids = (user.projects.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")"
+          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+          project_types = "('Message','Issue','ProjectCreateInfo')"
+          principal_types = "JournalsForMessage"
+          watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
+          user_ids = "(" + user.id.to_s + watched_user_ids + ")"
+          watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
+          blog_ids = "(" + watched_user_blog_ids + ")"
+
+          activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                                    "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                                    "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
+                                                    "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
+
+          all_count = activities.count
+          activities = activities.limit(10).offset(page * 10)
+          count = activities.count
+          present :data, activities, with: Mobile::Entities::Activity,user: user
+          present :all_count, all_count
+          present :count, count
+          present :page, page
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/blog_comments.rb

@@ -0,0 +1,19 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class BlogComments< Grape::API
+      resources :blog_comments do
+
+        desc "get special topic"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          blog = BlogComment.find params[:id]
+          present :data, blog, with: Mobile::Entities::BlogComment,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end
+

app/api/mobile/apis/comments.rb

@@ -115,7 +115,7 @@ module Mobile
 
         desc '通知评论列表'
         params do
-          requires :token, type: String
+          #requires :token, type: String
           requires :notice_id,type:Integer,desc:'通知id'
           optional :page,type:Integer,desc:'页码'
         end

app/api/mobile/apis/issues.rb

@@ -0,0 +1,19 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Issues< Grape::API
+      resources :issues do
+        include IssuesHelper
+
+        desc "get special issuse"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          issue = Issue.find params[:id]
+          present :data, issue, with: Mobile::Entities::Issue,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/journal_for_messages.rb

@@ -0,0 +1,18 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class JournalForMessages< Grape::API
+      resources :journal_for_messages do
+
+        desc "get special journal"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          jour = JournalsForMessage.find params[:id]
+          present :data, jour, with: Mobile::Entities::Jours,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/messages.rb

@@ -0,0 +1,18 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Messages< Grape::API
+      resources :messages do
+
+        desc "get special topic"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          message = Message.find params[:id]
+          present :data, message, with: Mobile::Entities::Message,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/new_comment.rb

@@ -0,0 +1,105 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class NewComment< Grape::API
+      include ApplicationHelper
+      include ApiHelper
+      resources :new_comment do
+
+        desc "add a new comment"
+        params do
+          requires :type, type: String
+          requires :content, type: String
+          requires :openid, type: String
+        end
+        post ':id' do
+          type = params[:type]
+          result = 1
+          current_user = UserWechat.find_by_openid(params[:openid]).user
+          if params[:content]!="" && current_user
+            case type
+              when "HomeworkCommon"
+                homework_common = HomeworkCommon.find(params[:id])
+                feedback = HomeworkCommon.add_homework_jour(current_user, params[:content], params[:id])
+                if (feedback.errors.empty?)
+                  homework_common.update_column(:updated_at, Time.now)
+                  result = 2
+                end
+              when "News"
+                news = News.find(params[:id])
+                comment = Comment.new
+                comment.comments = params[:content]
+                comment.author = current_user
+                if news.comments << comment
+                  result = 2
+                end
+              when "Message"
+                message = Message.find(params[:id])
+                board = Board.find(message.board_id)
+                topic = message.root
+                reply = Message.new
+                reply.author = current_user
+                reply.board = board
+                reply.content = params[:content]
+                reply.parent_id = params[:id]
+                reply.subject = "RE: #{topic.subject}"
+                if topic.children << reply
+                  result = 2
+                end
+              when "JournalsForMessage"
+                jour = JournalsForMessage.find params[:id]
+                parent_id = params[:id]
+                author_id = current_user.id
+                reply_user_id = jour.user_id
+                reply_id = params[:id]
+                content = params[:content]
+                options = {:user_id => author_id,
+                           :status => true,
+                           :m_parent_id => parent_id,
+                           :m_reply_id => reply_id,
+                           :reply_id => reply_user_id,
+                           :notes => content,
+                           :is_readed => false}
+                jfm = jour.user.add_jour(nil, nil, nil, options)
+                if jfm.errors.empty?
+                  (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
+                  result = 2
+                end
+              when 'Issue'
+                issue = Issue.find params[:id]
+                is_jour = Journal.new
+                is_jour.user_id = current_user.id
+                is_jour.notes = params[:content]
+                is_jour.journalized = issue
+                if is_jour.save
+                  result = 2
+                end
+              when 'BlogComment'
+                blog = BlogComment.find(params[:id]).root
+                blogComment = BlogComment.new
+                blogComment.author = current_user
+                blogComment.blog = blog.blog
+                blogComment.content = params[:content]
+                blogComment.title = "RE: #{blog.title}"
+                if blog.children << blogComment
+                  result = 2
+                end
+            end
+            if result == 2
+              update_course_activity_api(type,params[:id])
+              update_user_activity_api(type,params[:id])
+              update_org_activity_api(type,params[:id])
+              update_forge_activity_api(type,params[:id])
+              update_principal_activity_api(type,params[:id])
+            end
+          else
+            result = 3
+          end
+          present :result, result
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/newss.rb

@@ -0,0 +1,18 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Newss< Grape::API
+      resources :newss do
+
+        desc "get special news"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          news = News.find params[:id]
+          present :data, news, with: Mobile::Entities::News,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/praise.rb

@@ -0,0 +1,41 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Praise< Grape::API
+      include ApiHelper
+      resources :praise do
+        desc "praise an activity"
+
+        params do
+          requires :type, type: String
+          requires :openid, type: String
+        end
+        post ':id' do
+          obj_id = params[:id]
+          obj_type = params[:type]
+          user = UserWechat.find_by_openid(params[:openid]).user
+          pts = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",obj_id,obj_type.to_s,user.id).first
+          if pts.blank?
+            praise_or_cancel(obj_type,obj_id,user,1)
+            obj = PraiseTreadCache.where("object_id=? and object_type=?",obj_id,obj_type.to_s).first
+            num = get_activity_praise_num(obj) if !obj.blank?
+          else
+            pts.destroy if !pts.blank?
+            #再更新praise_tread_cache表 使相应的记录减1 当为0时删除
+            ptc = PraiseTreadCache.where("object_id=? and object_type=?",obj_id,obj_type.to_s).first
+            ptc.praise_minus(1) if !ptc.blank?
+            if ptc.praise_num == 0
+              ptc.delete
+            end
+            obj = PraiseTreadCache.where("object_id=? and object_type=?",obj_id,obj_type.to_s).first
+            num = !obj.blank? ? get_activity_praise_num(obj) : 0
+          end
+
+          present :data, num
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/apis/whomeworks.rb

@@ -0,0 +1,18 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Whomeworks< Grape::API
+      resources :whomeworks do
+
+        desc "get one homework"
+        get ':id' do
+          user = UserWechat.find_by_openid(params[:openid]).user
+          homework = HomeworkCommon.find params[:id]
+          present :data, homework, with: Mobile::Entities::Whomework,user: user
+          present :status, 0
+        end
+      end
+    end
+  end
+end

app/api/mobile/entities/activity.rb

@@ -0,0 +1,146 @@
+# encoding: utf-8
+module Mobile
+  module Entities
+    class Activity <Grape::Entity
+      include ApplicationHelper
+      include ApiHelper
+      def self.act_expose(f)
+        expose f do |ac,opt|
+          if ac.is_a?(Hash) && ac.key?(f)
+            ac[f]
+          elsif ac.is_a?(::UserActivity)
+            if ac.respond_to?(f)
+              ac.send(f)
+            else
+              case f
+                when :user_act
+                  if ac.act_type == "ProjectCreateInfo"
+                    ac unless ac.nil?
+                  else
+                    ac.act unless ac.nil? || ac.act.nil?
+                  end
+                when :reply_count
+                  if ac.act_type == "HomeworkCommon"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals_for_messages.count
+                  elsif ac.act_type == "News"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
+                  elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.children.count
+                  elsif ac.act_type == "Issue"
+                    ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
+                  end
+                when :subject
+                  if ac.act_type == "HomeworkCommon"
+                    ac.act.name unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "News" || ac.act_type == "BlogComment"
+                    ac.act.title unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "Message" || ac.act_type == "Issue"
+                    ac.act.subject unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "JournalsForMessage"
+                    ac.act.private == 0 ? "留言" : "私信" unless ac.nil? || ac.act.nil?
+                  end
+                when :description
+                  if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
+                    ac.act.description unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
+                    ac.act.content unless ac.nil? || ac.act.nil?
+                  elsif ac.act_type == "JournalsForMessage"
+                    ac.act.notes unless ac.nil? || ac.act.nil?
+                  end
+                when :latest_update
+                  time_from_now ac.updated_at unless ac.nil?
+                when :praise_count
+                  if ac.act_type == "HomeworkCommon" || ac.act_type == "News" || ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage" || ac.act_type == "Issue"
+                    ac.nil? || ac.act.nil? ? 0 : get_activity_praise_num(ac.act)
+                  end
+                #when :homework_common_detail_manual
+                #   if ac.act_type == "HomeworkCommon"
+                #     ac.act.homework_detail_manual unless ac.nil? || ac.act.nil? || ac.act.homework_detail_manual.nil?
+                #   end
+                when :course_project_name
+                  if ac.container_type == "Course"
+                    name = (get_course(ac.container_id)).name
+                    name
+                  elsif ac.container_type == "Project"
+                    name = (get_project(ac.container_id)).name
+                    name
+                  elsif ac.container_type == "Blog"
+                    "发表博客"
+                  end
+                when :activity_type_name
+                  if ac.container_type == "Course"
+                    case ac.act_type
+                      when "HomeworkCommon"
+                        "课程作业"
+                      when "News"
+                        "课程通知"
+                      when "Message"
+                        "课程问答区"
+                      when "Poll"
+                        "课程问卷"
+                      when "Course"
+                        "课程"
+                    end
+                  elsif ac.container_type == "Project"
+                    case ac.act_type
+                      when "Issue"
+                        "项目缺陷"
+                      when "Message"
+                        "项目讨论区"
+                      when "ProjectCreateInfo"
+                        "项目"
+                    end
+                  end
+              end
+            end
+          end
+        end
+      end
+      expose :act_type    #缺陷/作业/讨论区/留言等类型
+      expose :act_id
+      expose :container_type     #课程/项目/博客/个人
+      expose :author, using: Mobile::Entities::User do |a, opt|    #用户信息
+        if a.is_a? ::UserActivity
+          if a.act_type == "ProjectCreateInfo"
+            get_user(get_project(a.act_id).user_id)
+          elsif !a.act.nil?
+            if a.act_type == 'Issue' || a.act_type == 'News' || a.act_type == 'Message' || a.act_type == 'BlogComment'
+            a.act.author
+            elsif a.act_type == 'HomeworkCommon' || a.act_type == 'Poll' || a.act_type == 'JournalsForMessage'
+              a.act.user
+            elsif a.act_type == 'Course'
+              a.act.teacher
+            end
+          end
+        end
+      end
+      expose :homework_common_detail , using: Mobile::Entities::Whomework do |a, opt|  #作业相关信息
+        if a.act_type == "HomeworkCommon"
+          a.act
+        end
+      end
+      expose :issue_detail, using: Mobile::Entities::Issue do |a, opt| #缺陷信息
+        if a.act_type == "Issue"
+          a.act
+        end
+      end
+      act_expose :reply_count    #回复数
+      act_expose :praise_count   #点赞数
+      #act_expose :user_act     #某个动态
+      act_expose :subject      #标题
+      act_expose :description  #描述
+      act_expose :latest_update #最新更新时间
+      act_expose :course_project_name    #课程/项目名字
+      act_expose :activity_type_name     #课程问答区/项目缺陷等
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue"
+          has_praise = false
+          current_user = options[:user]
+          obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.act_id,instance.act_type.to_s,current_user.id)
+          has_praise = obj.empty? ? false : true
+          has_praise
+        end
+      end
+    end
+  end
+end

app/api/mobile/entities/blog_comment.rb

@@ -0,0 +1,65 @@
+module Mobile
+  module Entities
+    class BlogComment < Grape::Entity
+      include ApplicationHelper
+      include ApiHelper
+      def self.blog_comment_expose(f)
+        expose f do |u,opt|
+          if u.is_a?(Hash) && u.key?(f)
+            u[f]
+          elsif u.is_a?(::BlogComment)
+            if u.respond_to?(f)
+              if f == :created_at
+                format_time( u.send(f))
+              else
+                u.send(f)
+              end
+            else
+              case f
+                when :praise_count
+                  get_activity_praise_num(u)
+                when :lasted_comment
+                  time_from_now(u.created_at)
+                when :act_type
+                  'BlogComment'
+                when :act_id
+                  u.id
+                when :comment_count
+                  u.children.count
+              end
+            end
+          end
+
+        end
+      end
+
+      expose :user, using: Mobile::Entities::User do |c, opt|
+        if c.is_a?(::BlogComment)
+          c.author
+        end
+      end
+      blog_comment_expose :act_type
+      blog_comment_expose :act_id
+      blog_comment_expose :blog_id
+      blog_comment_expose :title
+      blog_comment_expose :content
+      blog_comment_expose :comment_count
+      blog_comment_expose :created_at
+      blog_comment_expose :lasted_comment
+      blog_comment_expose :id
+      blog_comment_expose :praise_count
+      expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
+        if c.is_a? (::BlogComment)
+          c.children.reverse
+        end
+      end
+      expose :has_praise, if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
+      end
+    end
+  end
+end

app/api/mobile/entities/comment.rb

@@ -9,7 +9,7 @@ module Mobile
           elsif f.is_a?(::Comment)
             if f.respond_to?(field)
               if field == :created_on
-                format_time(f.send(field))
+                time_from_now(f.send(field))
               else
                 f.send(field)
               end

app/api/mobile/entities/issue.rb

@@ -0,0 +1,67 @@
+module Mobile
+  module Entities
+    class Issue <Grape::Entity
+      include ApiHelper
+      include Redmine::I18n
+      def self.issue_expose(f)
+        expose f do |issue, opt|
+          if issue.is_a?(Hash) && issue.key?(f)
+            issue[f]
+          elsif issue.is_a?(::Issue)
+            if issue.respond_to?(f)
+              if f == :created_on
+                format_time(issue.send(f))
+              else
+                issue.send(f)
+              end
+            else
+              case f
+                when :issue_priority
+                  get_issue_priority_api issue.priority_id
+                when :issue_assigned_to
+                  (get_user(issue.assigned_to_id)).login
+                when :issue_status
+                  IssueStatus.find(issue.status_id).name
+                when :journals_count
+                  issue.journals.where("notes is not null and notes != ''").count
+                when :project_name
+                  issue.project.name
+                when :praise_count
+                  get_activity_praise_num(issue)
+                when :act_type
+                  'Issue'
+                when :act_id
+                  issue.id
+              end
+            end
+          end
+        end
+      end
+      expose :subject
+      expose :description
+      expose :author, using: Mobile::Entities::User
+      expose :done_ratio
+      issue_expose :act_type
+      issue_expose :act_id
+      issue_expose :created_on
+      issue_expose :issue_priority
+      issue_expose :issue_assigned_to
+      issue_expose :issue_status
+      issue_expose :journals_count
+      issue_expose :project_name
+      issue_expose :praise_count
+      expose :issue_journals, using: Mobile::Entities::Journal  do |f, opt|
+        if f.is_a?(::Issue)
+          f.journals.where("notes is not null and notes != ''").reverse
+        end
+      end
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
+      end
+    end
+  end
+end

app/api/mobile/entities/journal.rb

@@ -0,0 +1,44 @@
+module Mobile
+module Entities
+  class Journal <Grape::Entity
+    include Redmine::I18n
+=begin
+    include Redmine::I18n
+    include ApplicationHelper
+    include ApiHelper
+    include IssuesHelper
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::UrlHelper
+=end
+    def self.journal_expose(f)
+      expose f do |journal, opt|
+        if journal.is_a?(Hash) && journal.key?(f)
+          journal[f]
+        elsif journal.is_a?(::Journal)
+          if journal.respond_to?(f)
+            if f == :created_on
+              time_from_now(journal.send(f))
+            else
+              journal.send(f)
+            end
+          else
+            case f
+              when :detail_journal
+                if journal.details.any?
+                  details_to_strings(journal.details)
+                end
+            end
+          end
+        end
+      end
+    end
+
+    expose :notes
+    journal_expose :created_on
+    expose :user,using: Mobile::Entities::User do |f, opt|
+      f.user
+    end
+    #journal_expose :detail_journal
+  end
+end
+end

app/api/mobile/entities/jours.rb

@@ -3,7 +3,6 @@ module Mobile
     #普通留言
     class Jours < Grape::Entity
       include Redmine::I18n
-      include WordsHelper
       def self.jours_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
@@ -15,13 +14,24 @@ module Mobile
               f.send(field)
             end
           else
-            case f
-              when :course_name
-                f[:jour_type] == "Course" ? f.course.name : ""
+            case field
+              when :lasted_comment
+                time_from_now f.created_on
+              when :reply_count
+                f.children.count
+              when :praise_count
+                get_activity_praise_num(f)
+              when :act_type
+                'JournalsForMessage'
+              when :act_id
+                f.id
             end
           end
         end
       end
+
+      jours_expose :act_type
+      jours_expose :act_id
       jours_expose :id
       jours_expose :jour_type
       jours_expose :jour_id
@@ -29,9 +39,12 @@ module Mobile
         f.user
       end
       jours_expose :created_on
+      jours_expose :lasted_comment
       jours_expose :notes
       jours_expose :m_reply_id
       jours_expose :m_parent_id
+      jours_expose :reply_count
+      jours_expose :praise_count
       expose :course,using:Mobile::Entities::Course do |f,opt|
         if f.is_a?(::JournalsForMessage) && f[:jour_type] == "Course"
           f.course
@@ -42,9 +55,16 @@ module Mobile
       end
       expose :child_reply,using: Mobile::Entities::Jours do |f, opt|
         if f.is_a?(::JournalsForMessage)
-          fetch_user_leaveWord_reply(f)
+          f.children.reverse
         end
       end
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
+      end
     end
   end
 end

app/api/mobile/entities/message.rb

@@ -15,10 +15,22 @@ module Mobile
                 u.send(f)
               end
             else
-              # case f
-              #   when :xx
-              #    #
-              # end
+              case f
+                when :course_project_name
+                  if u.board.project_id == -1
+                    u.course.name
+                  else
+                    u.project.name
+                  end
+                when :lasted_comment
+                  time_from_now u.created_on
+                when :praise_count
+                  get_activity_praise_num(u)
+                when :act_type
+                  'Message'
+                when :act_id
+                  u.id
+              end
             end
           end
 
@@ -30,16 +42,28 @@ module Mobile
           c.author
         end
       end
+      message_expose :act_type
+      message_expose :act_id
+      message_expose :course_project_name
       message_expose :board_id
       message_expose :subject
       message_expose :content
       message_expose :replies_count
+      message_expose :praise_count
       message_expose :created_on
       message_expose :id
+      message_expose :lasted_comment
       expose :message_children,using:Mobile::Entities::Message do |c,opt|
         if c.is_a? (::Message)
-          c.children
+          c.children.reverse
+        end
       end
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
       end
     end
   end

app/api/mobile/entities/news.rb

@@ -2,15 +2,29 @@ module Mobile
   module Entities
     class News < Grape::Entity
       include Redmine::I18n
+      include ApiHelper
       def self.news_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
             f[field]
           elsif f.is_a?(::News)
+            if f.respond_to?(field)
               if field == :created_on
-              format_time(f.send(field)) if f.respond_to?(field)
+                format_time(f.send(field))
               else
-              f.send(field) if f.respond_to?(field)
+                f.send(field)
+              end
+            else
+              case field
+                when :course_name
+                  get_course(f.course_id).name unless f.course_id == nil
+                when :praise_count
+                  get_activity_praise_num(f)
+                when :act_type
+                  'News'
+                when :act_id
+                  f.id
+              end
             end
           elsif f.is_a?(Hash) && !f.key?(field)
             n = f[:news]
@@ -40,6 +54,8 @@ module Mobile
         end
         obj
       end
+      news_expose :act_type
+      news_expose :act_id
       #作者id
       news_expose :author_id
       #作者名
@@ -52,16 +68,24 @@ module Mobile
       news_expose :created_on
       #评论数量
       news_expose :comments_count
+      news_expose :praise_count
+      #课程名字
+      news_expose :course_name
       #评论
       expose :comments, using: Mobile::Entities::Comment do |f, opt|
         if f.is_a?(Hash) && f.key?(:comments)
           f[:comments]
         elsif f.is_a?(::News) && f.respond_to?(:comments)
-          f.send(:comments)
+          f.comments.reverse
         end
       end
-
-
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
+      end
     end
   end
 end

app/api/mobile/entities/user.rb

@@ -13,7 +13,7 @@ module Mobile
             else
               case f
                 when :img_url
-                  url_to_avatar(u)
+                  "/images/#{url_to_avatar(u)}"
                 when :gender
                   u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender
                 when :work_unit
@@ -24,6 +24,8 @@ module Mobile
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
                 when :student_num
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.student_id
+                when :realname
+                  u.nil? ? "" : get_user_realname(u)
               end
             end
           end
@@ -37,7 +39,7 @@ module Mobile
       #昵称
       expose :nickname
       #真名
-      expose :realname
+      user_expose :realname
       #性别
       user_expose :gender
       #我的二维码

app/api/mobile/entities/whomework.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+module Mobile
+  module Entities
+    class Whomework <Grape::Entity
+      include ApiHelper
+      include ApplicationHelper
+      include Redmine::I18n
+      def self.whomework_expose(f)
+        expose f do |wh, opt|
+          if wh.is_a?(Hash) && wh.key?(f)
+            wh[f]
+          elsif wh.is_a?(::HomeworkCommon)
+            if wh.respond_to?(f)
+              if f == :created_at
+                format_time(wh.send(f))
+              else
+                wh.send(f)
+              end
+            else
+              case f
+                when :absence_penalty
+                  wh.nil? || wh.homework_detail_manual.nil? ? 0 : wh.homework_detail_manual.absence_penalty
+                when :evaluation_start
+                  wh.nil? || wh.homework_detail_manual.nil? ? nil : convert_to_time(wh.homework_detail_manual.evaluation_start, 0)
+                when :evaluation_end
+                  wh.nil? || wh.homework_detail_manual.nil? ? nil : convert_to_time(wh.homework_detail_manual.evaluation_end, 1)
+                when :praise_count
+                  get_activity_praise_num(wh)
+                when :whomework_journal_count
+                  wh.journals_for_messages.count
+                when :course_name
+                  wh.course.name
+                when :act_type
+                  'HomeworkCommon'
+                when :act_id
+                  wh.id
+              end
+            end
+          end
+        end
+      end
+
+      expose :author, using: Mobile::Entities::User do |w, opt|
+        if w.is_a?(::HomeworkCommon)
+          w.user
+        end
+      end
+      expose :current_user, using: Mobile::Entities::User do |w, opt|
+        current_user
+      end
+      expose :name
+      expose :description
+      expose :publish_time
+      expose :end_time
+      expose :homework_type
+      expose :late_penalty
+      expose :course_id
+      expose :anonymous_comment
+      expose :quotes
+      expose :is_open
+      whomework_expose :act_type
+      whomework_expose :act_id
+      whomework_expose :course_name
+      whomework_expose :created_at
+      whomework_expose :absence_penalty
+      whomework_expose :evaluation_start
+      whomework_expose :evaluation_end
+      whomework_expose :praise_count
+      whomework_expose :whomework_journal_count
+      expose :journals_for_messages, using: Mobile::Entities::Jours  do |f, opt|
+        #f[:journals_for_messages] if f.is_a?(Hash) && f.key?(:journals_for_messages)
+        if f.is_a?(::HomeworkCommon)
+          f.journals_for_messages.reverse
+        end
+      end
+      expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
+        has_praise = false
+        current_user = options[:user]
+        obj = PraiseTread.where("praise_tread_object_id=? and praise_tread_object_type=? and user_id=?",instance.id,instance.class.to_s,current_user.id)
+        has_praise = obj.empty? ? false : true
+        has_praise
+      end
+    end
+  end
+end

app/api/mobile/middleware/error_handler.rb

@@ -7,7 +7,8 @@ module Mobile
           @app.call(@env)
         rescue =>e
           message = {status: 1, message: e.message }.to_json
-          puts(e.backtrace.join("\n")) if Rails.env.development?
+          Rails.logger.error e.inspect
+          Rails.logger.error e.backtrace.join("\n")
           status = 200
           headers = { 'Content-Type' => content_type }
           Rack::Response.new([message], status, headers).finish

app/controllers/admin_controller.rb

@@ -63,6 +63,42 @@ class AdminController < ApplicationController
     end
   end
 
+  #精品课程下的全部课程
+  def excellent_all_courses
+    name = params[:name]
+    @order = ""
+    if params[:order] == 'asc'
+      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) asc, c.id desc")
+      @order = params[:order]
+    elsif params[:order] == 'desc'
+      courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) DESC, c.id desc")
+      @order = params[:order]
+    else
+      courses = Course.like(name).order('created_at desc')
+    end
+    @courses = paginateHelper courses,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #设为精品
+  def set_excellent_course
+    @course = Course.find params[:id]
+    unless @course.nil?
+      if @course.is_excellent == 1 || @course.excellent_option == 1
+        @course.update_column('is_excellent', 0)
+        @course.update_column('excellent_option', 0)
+      else
+        @course.update_column('is_excellent', 1)
+      end
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
  #管理员界面课程资源列表
   def course_resource_list
 
@@ -548,7 +584,8 @@ class AdminController < ApplicationController
 
   #作业
   def homework
-    @homework = HomeworkCommon.order('end_time desc')
+    #@homework = HomeworkCommon.order('end_time desc')
+    @homework = HomeworkCommon.order( 'created_at desc ')
     @homework = paginateHelper @homework,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
@@ -556,4 +593,55 @@ class AdminController < ApplicationController
     end
   end
 
+  #代码测试列表
+  def code_work_tests
+    #求出所有条数
+    tCount = CodeTests.count()
+
+    #设置个空的数组 以便paginateHelper来分页
+    @code_work_tests = []
+    if tCount >= 1
+      @code_work_tests[tCount-1] = {}
+    end
+    @code_work_tests = paginateHelper @code_work_tests,30
+    @page = (params['page'] || 1).to_i - 1
+
+    #取出需要的那一页数据
+    tStart = @page*30
+    @code_work_tests  = CodeTests.find_by_sql("select * from code_tests order by id desc limit #{tStart},30 ")
+
+    #取出各个作品是否是模拟答题的
+    is_test = {}
+    #作品是否存在
+    link_swork = {}
+    #作业是否存在
+    link_hwork = {}
+    @code_work_tests.each do |test|
+      #作品是否存在
+      if is_test[test['student_work_id']] != nil
+          test['link_swork'] = link_swork[test['student_work_id']]
+          test['is_test'] = is_test[test['student_work_id']]
+      else
+          work = StudentWork.where("id=?",test['student_work_id']).first
+          test['link_swork'] = !work.nil?
+          test['is_test'] = work.nil? ? false : work.is_test
+          #test['is_test'] = CodeTests.find_by_sql("select is_test from student_works where id = #{test['student_work_id']}").first['is_test']
+          is_test[test['student_work_id']] = test['is_test']
+          link_swork[test['student_work_id']] = test['link_swork']
+      end
+
+      #作业是否存在
+      if link_hwork[test['homework_id']] != nil
+        test['link_hwork'] = link_hwork[test['homework_id']]
+      else
+        hwork = HomeworkCommon.where("id=?",test['homework_id']).first
+        test['link_hwork'] = !hwork.nil?
+        link_hwork[test['homework_id']] = test['link_hwork']
+      end
+    end
+
+    respond_to do |format|
+      format.html
+    end
+  end
 end

app/controllers/attachments_controller.rb

@@ -594,7 +594,7 @@ class AttachmentsController < ApplicationController
     end
   end
 
-private
+  private
   def find_project
     @attachment = Attachment.find(params[:id])
     # Show 404 if the filename in the url is wrong
@@ -608,7 +608,7 @@ private
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
+      unless @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end
@@ -660,8 +660,10 @@ private
   end
 
   def has_login
-    unless @attachment && @attachment.container_type == "PhoneAppVersion"
+    unless (@attachment && @attachment.container_type == "Organization").nil?
+      unless (@attachment && @attachment.container_type == "PhoneAppVersion").nil?
         render_403 if  !User.current.logged? && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
       end
     end
+  end
 end

app/controllers/courses_controller.rb

@@ -187,7 +187,7 @@ class CoursesController < ApplicationController
     end
     @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
     @is_remote = true
-
+    @members = student_homework_score(0,0, 10,"desc")
     @course_groups = @course.course_groups
   end
 
@@ -209,7 +209,7 @@ class CoursesController < ApplicationController
     end
     @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     @is_remote = true
-
+    @members = student_homework_score(0,0, 10,"desc")
     @course_groups = @course.course_groups
   end
 
@@ -334,7 +334,7 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
-    @homeworks = @course.homework_commons.order("created_at desc")
+    @homeworks = @course.homework_commons.order("created_at asc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
 
     respond_to do |format|
@@ -851,8 +851,6 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
-    # 统计访问量
-    @course.update_column(: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)
@@ -885,6 +883,7 @@ class CoursesController < ApplicationController
       @course_activities = course_activities.order('updated_at desc').limit(10).offset(@page * 10)
     end
     @type = params[:type]
+
     respond_to do |format|
       format.js
       format.html{render :layout => 'base_courses'}
@@ -925,6 +924,82 @@ class CoursesController < ApplicationController
     end
   end
 
+  def search_homework_member homeworks,name
+    if name == ""
+      select_homework = homeworks
+    else
+      name = name.downcase
+      select_homework = homeworks.select{ |homework|
+        homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+      }
+    end
+    select_homework
+  end
+
+  # 作业查重
+  def code_repeat
+    #代码查重新加的
+    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
+
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+
+    if !@is_teacher
+      render_403
+      return
+    end
+
+    @homework = HomeworkCommon.find params[:homework]
+                                                                                                                                                                                                        #order("#{@order} #{@b_sort}"
+    @student_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("simi_value desc"),@name
+
+    @works_hash = {}
+
+    @student_works.each do |tmpwork|
+      @works_hash[tmpwork.id] = tmpwork
+      puts tmpwork.id
+    end
+
+    #respond_to do |format|
+      #format.html {render :layout => 'base_courses'}
+    #end
+  end
+
+  def show_comparecode
+
+    src_id = params[:src_id]
+    dst_id = params[:dst_id]
+
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+
+    if !@is_teacher
+      render_403
+      return
+    end
+
+    src_work = StudentWork.where("id =?", src_id).first
+
+    @homework = HomeworkCommon.find params[:homework_id]
+
+    @simi_value = src_work.simi_value.to_i
+
+    @src_code = src_work.description
+    src_user = User.where("id =?", src_work.user_id).first
+
+    @src_username = src_user.try(:realname) != " " ? src_user.lastname + src_user.firstname : src_user.try(:login)
+
+    #descriotion  user name
+
+    dst_work = StudentWork.where("id =?", dst_id).first
+    @dst_code = dst_work.description
+    dst_user = User.where("id =?", dst_work.user_id).first
+
+    @dst_username = dst_user.try(:realname) != " " ? dst_user.lastname + dst_user.firstname : dst_user.try(:login)
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #根据已有课程复制课程
   #param id:已有课程ID
   def copy_course
@@ -1079,7 +1154,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          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)))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 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}
@@ -1091,7 +1166,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,IF(student_works.final_score =0,0,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,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 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

@@ -623,6 +623,36 @@ class FilesController < ApplicationController
        @attachtype = 0
        @contenttype = 0
 
+       respond_to do |format|
+         format.js
+         # format.html {
+         #   redirect_to org_subfield_files_url(@org_subfield)
+         # }
+       end
+     # 组织添加附件，为了修改图片
+     elsif params[:organization_id]
+       @organization = Organization.find(params[:organization_id])
+       @addTag=false
+       # atttchment_type = 0为logo 1为banner
+       if params[:logo]
+         attachments = Attachment.attach_filesex(@organization, params[:attachments], false)
+       else
+         attachments = Attachment.attach_filesex(@organization, params[:attachments], true)
+       end
+       # TODO: 临时用 nyan
+       sort_init 'created_on', 'desc'
+       sort_update 'created_on' => "#{Attachment.table_name}.created_on",
+                   'filename' => "#{Attachment.table_name}.filename",
+                   'size' => "#{Attachment.table_name}.filesize",
+                   'downloads' => "#{Attachment.table_name}.downloads"
+
+       @containers = [Organization.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@organization.id)]
+
+       show_attachments @containers
+       @tag_list = attachment_tag_list @all_attachments
+       @attachtype = 0
+       @contenttype = 0
+
        respond_to do |format|
          format.js
          # format.html {

app/controllers/homework_common_controller.rb

@@ -17,9 +17,11 @@ 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)
+      @homework_commons = @course.homework_commons.order("created_at desc")
     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)
+      @homework_commons = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc")
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
@@ -71,11 +73,18 @@ class HomeworkCommonController < ApplicationController
       else
         @homework.publish_time = params[:homework_common][:publish_time]
       end
+      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
-      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
+      anonymous = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 0
+      if anonymous != @homework.anonymous_comment
+        if  anonymous == 1
+          homework_detail_manual.ta_proportion = @homework.homework_type == 1 ? 1.0 : 0.4
+        else
+          homework_detail_manual.ta_proportion = @homework.homework_type == 1 ? 0.6 : 0.3
+        end
+      end
 
-      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
         homework_detail_manual.comment_status = 1
       end
@@ -92,6 +101,13 @@ class HomeworkCommonController < ApplicationController
           @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
           @homework_detail_programing = @homework.homework_detail_programing
           @homework_detail_programing.language = params[:language_type].to_i
+          if anonymous != @homework.anonymous_comment
+            if anonymous == 1
+              @homework_detail_programing.ta_proportion = 0.6
+            else
+              @homework_detail_programing.ta_proportion = 0.5
+            end
+          end
 
           @homework.homework_tests.delete_all
           inputs = params[:program][:input]
@@ -114,8 +130,9 @@ class HomeworkCommonController < ApplicationController
         @homework_detail_group.base_on_project = params[:base_on_project].to_i
       end
 
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment].to_i : 0
       if @homework.save
-        @homework_detail_manual.save if @homework_detail_manual
+        homework_detail_manual.save if homework_detail_manual
         @homework_detail_programing.save if @homework_detail_programing
         @homework_detail_group.save if @homework_detail_group
 

app/controllers/org_subfields_controller.rb

@@ -130,6 +130,12 @@ class OrgSubfieldsController < ApplicationController
     @organization = @org_subfield.organization
   end
 
+  def update_status
+    @subfield = OrgSubfield.find(params[:id])
+    @organization = Organization.find(@subfield.organization_id)
+    @subfield.update_attributes(:status => params[:status])
+  end
+
   def show_attachments obj
     @attachments = []
     obj.each do |container|

app/controllers/organizations_controller.rb

@@ -28,18 +28,25 @@ class OrganizationsController < ApplicationController
   helper :project_score
   helper :issues
   include UsersHelper
-  before_filter :find_organization, :only => [:show, :members, :apply_subdomain]
+  before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout]
   layout 'base_org'
   def index
 
   end
+
+
   def new
     @organization = Organization.new
     render :layout => 'new_base'
   end
 
   def edit
-    @organization = Organization.find(params[:id])
+    # @organization = Organization.find(params[:id])
+    begin
+      @organization = Organization.where("id =?", params[:id])
+    ensure
+      render_404
+    end
   end
 
   def destroy
@@ -56,6 +63,7 @@ class OrganizationsController < ApplicationController
     @organization.description = params[:organization][:description]
     @organization.is_public = params[:organization][:is_public]
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
+    @organization.show_mode = 0
     @organization.creator_id = User.current.id
     member = OrgMember.new(:user_id => User.current.id)
 
@@ -67,10 +75,51 @@ class OrganizationsController < ApplicationController
   end
 
   def show
+    # 组织新类型 show_mode：判断标准 1为新类型，0为旧
+    if @organization.show_mode == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+      if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+        # REDO:时间紧，暂时先这样
+        @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
+        @org_banner_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 1 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
+
+        @subfield_content = @organization.org_subfields.order("priority")
+        @organization = Organization.find(params[:id])
+          # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+          # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+          # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
+
+          shield_project_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Project'").map(&:shield_id)
+          shield_course_ids = ShieldActivity.where("container_type='Organization' and container_id=#{@organization.id} and shield_type='Course'").map(&:shield_id)
+          project_ids = (@organization.projects.map(&:id)-shield_project_ids) << 0
+          course_ids = (@organization.courses.map(&:id)-shield_course_ids) << 0
+          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+          @project_acts = get_project_activities_org @organization, project_ids
+          @course_acts = get_course_activities_org @organization, course_ids
+          #@org_acts = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc')
+          #@project_acts = OrgActivity.where("(container_id =? and container_type =?) " +
+                                                # "or (container_type ='Project' and org_act_type in ('Issue','Message') and container_id in (#{project_ids.join(',')})) ",
+                                                # @organization.id, 'Organization').order('updated_at desc').limit(8)
+
+          #@course_acts  = OrgActivity.where("(container_id =? and container_type =?) " +
+                                               # "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+                                              # @organization.id, 'Organization').order('updated_at desc').limit(8)
+
+
+
+        # 项目两种动态
+        #@project_acts = get_project_activities_org @organization
+
+        # 课程动态
+        #@project_acts_issues = get_project_activities_org @organization
+        #@course_acts = get_course_activities_org @organization
+
+        render :layout => 'base_org_newstyle'
+      else
+        render_403
+      end
+    else
       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
@@ -113,6 +162,80 @@ class OrganizationsController < ApplicationController
       end
     end
 
+  end
+
+  def get_project_message_activities_org org
+    project_ids = org.projects.map{|project| project.id}.join(",")
+    unless project_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'Message' order by updated_at desc limit 2;")
+    else
+      project_acts = nil
+    end
+  end
+
+  def get_project_issue_activities_org org
+    project_ids = org.projects.map{|project| project.id}.join(",")
+    unless project_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'issue' order by updated_at desc limit 4;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'issue' order by updated_at desc limit 4;")
+  end
+
+  # 获取整过项目的动态
+  def get_project_activities_org org, project_ids
+    unless project_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids.join(',')}) and container_type = 'project'
+                  and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' and org_act_type = 'issue' order by updated_at desc limit 4;")
+  end
+
+  # 获取整过课程的动态
+  def get_course_activities_org org, course_ids
+    unless course_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids.join(',')}) and container_type = 'course'
+                  and org_act_type in ('HomeworkCommon', 'Poll',  'Message', 'News', 'Course') order by updated_at desc limit 8;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 5;")
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'HomeworkCommon' order by updated_at desc limit 1;")
+  end
+
+  def get_course_homework_activities_org org
+    course_ids = org.courses.map{|course| course.id}.join(",")
+    unless course_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'HomeworkCommon' order by updated_at desc limit 1;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 5;")
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'HomeworkCommon' order by updated_at desc limit 1;")
+  end
+
+  def get_course_message_activities_org org
+    course_ids = org.courses.map{|course| course.id}.join(",")
+    unless course_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'Message' order by updated_at desc limit 1;")
+    else
+      project_acts = nil
+    end
+  end
+
+  def get_course_news_activities_org org
+    course_ids = org.courses.map{|course| course.id}.join(",")
+    unless course_ids.blank?
+      project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'News' order by updated_at desc limit 1;")
+    else
+      project_acts = nil
+    end
+    #project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'News' order by updated_at desc limit 1;")
+  end
+
   def update
     @organization = Organization.find(params[:id])
     @organization.name = params[:organization][:name]
@@ -120,12 +243,17 @@ class OrganizationsController < ApplicationController
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
     @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
+    @organization.show_mode = params[:show_mode]
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|
+       if @organization.show_mode == 1
+         format.html { redirect_to organization_path(@organization)}
+       else
        format.html { redirect_to setting_organization_path(@organization)}
      end
   end
+  end
 
   def check_uniq
     @check = false;
@@ -157,11 +285,6 @@ class OrganizationsController < ApplicationController
     end
   end
 
-
-  def clear_org_avatar_temp
-
-  end
-
   def set_homepage
     @org = Organization.find(params[:id])
     @org.home_id = params[:home_id]
@@ -224,8 +347,13 @@ class OrganizationsController < ApplicationController
     if !params[:name].nil?
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
-    sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+
+    if User.current.admin?
+      sql = "select courses.* from courses where courses.is_public = 1 and courses.name like '#{condition}'"+
+          "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id}) and courses.is_delete=0"
+    else
+      sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.is_public = 1 and courses.name like '#{condition}'"+
           "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id}) and courses.is_delete=0"
+    end
     #user_courses = Course.find_by_sql(sql)
     @courses = Course.find_by_sql(sql)
     # @added_course_ids = @organization.courses.map(&:id)
@@ -268,8 +396,13 @@ class OrganizationsController < ApplicationController
     if !params[:name].nil?
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
-    sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" +
+    if User.current.admin?
+      sql = "select projects.* from projects where projects.status != 9 and projects.is_public = 1 and projects.name like '#{condition}'" +
+          " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id}) and status=1"
+    else
+      sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.is_public = 1 and projects.name like '#{condition}'" +
           " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id}) and status=1"
+    end
     #user_projects = Course.find_by_sql(sql)
     @projects = Course.find_by_sql(sql)
     # @added_course_ids = @organization.projects.map(&:id)

app/controllers/projects_controller.rb

@@ -299,8 +299,6 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
-    # 统计访问量
-    @project.update_column(:visits, @project.visits + 1)
     # over
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
     @page = params[:page] ? params[:page].to_i + 1 : 0
@@ -321,6 +319,26 @@ class ProjectsController < ApplicationController
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
+    # g = Gitlab.client
+    unless @project.gpid.nil? || @project.project_score.changeset_num == 0
+      # rep_statics_commit = @project.rep_statics.order("commits_num desc")
+      rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
+      rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
+      # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
+      @a_uname = rep_statics_commit.map {|s| s.uname }
+      @a_uname_code = rep_statics_code.map {|s| s.uname }
+      @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
+      @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
+      @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
+      @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
+      g = Gitlab.client
+      begin
+        g_branch = g.project(@project.gpid).default_branch.to_s
+      rescue
+        logger.error("get gitlab project failed!")
+      end
+      @rev = g_branch.nil? ? "master" : g_branch
+    end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
       format.html

app/controllers/repositories_controller.rb

@@ -30,7 +30,7 @@ class RepositoriesController < ApplicationController
   menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers]
   default_search_scope :changesets
 
-  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
+  before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo, :stats]
   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]
@@ -325,62 +325,44 @@ update
       end
     end
 
-    # unless @repository.gitlab?
-    #   # redirect_to to_gitlab_project_repository_path(@project, @repository)
-    #   render :to_gitlab
-    #   return
-    # end
-
-    #if( !User.current.member_of?(@project) || @project.hidden_repo)
-    @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
-
-    # :name, :path, :kind, :size, :lastrev, :changeset
     @entries = @repository.entries(@path, @rev)
-    # @trees = g.trees(project, @path)
     @changeset = @repository.find_changeset_by_name(@rev)
-    #@project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-    #@ip               = RepositoriesHelper::REPO_IP_ADDRESS
-
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      #Modified by young
-      #  (show_error_not_found; return) unless @entries
       g = Gitlab.client
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
-      # @changesets = @repository.latest_changesets(@path, @rev)
-      # @changesets_count = @repository.latest_changesets(@path, @rev).count
-      @changesets_all_count = @project.gpid.nil? ? 0 : g.project(@project.gpid).commit_count
+      g_project = g.project(@project.gpid)
+      # 总的提交数
+      @changesets_all_count = @project.gpid.nil? ? 0 : g_project.commit_count
+      @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
       # 访问该页面的是会后则刷新
       if @project.project_score.nil?
         ProjectScore.create(:project_id => @project.id, :score => false)
       end
+      # 刷新改页面的时候，更新统计数
       if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0
         update_commits_count(@project, @changesets_all_count)
       end
-      # end
+      # 最近一次提交
       @changesets_latest_coimmit = @changesets[0]
       unless @changesets[0].blank?
         update_commits_date(@project, @changesets_latest_coimmit)
       end
-      @properties = @repository.properties(@path, @rev)
-      @repositories = @project.repositories
-      @course_tag = params[:course]
-      project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
-      ip = RepositoriesHelper::REPO_IP_ADDRESS
+      @creator = User.where("id =?", @project.user_id).first.try(:login)
+      # @properties = @repository.properties(@path, @rev)
+      # @repositories = @project.repositories
+      # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
+      # ip = RepositoriesHelper::REPO_IP_ADDRESS
       gitlab_address = Redmine::Configuration['gitlab_address']
       if @repository.type.to_s == "Repository::Gitlab"
         @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
       else
         @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s
       end
-      if @course_tag == 1
-        render :action => 'show', :layout => 'base_courses'
-      else
       render :action => 'show', :layout => 'base_projects'
     end
   end
-  end
 
   alias_method :browse, :show
 
@@ -390,7 +372,7 @@ update
     g = Gitlab.client
     limit = 20
     #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
-    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s, ref_name:@rev)
 
     #add by hx
     #rep_count = commit_count(@project)
@@ -565,10 +547,32 @@ update
   end
 
   def stats
-    @project_id = params[:id]
-    @repository_id = @repository.identifier
-    # 提交次数统计
-    @status_commit_count = Changeset.count(:conditions => ["#{Changeset.table_name}.repository_id = ?", @repository.id])
+    if @project.gpid.nil?
+      render 404
+      return
+    end
+    project_id = @project.gpid
+    # @repository_id = @repository.identifier
+    # creator = params[:creator]
+    rev = params[:rev]
+    g = Gitlab.client
+    begin
+    @static_total_per_user = g.rep_stats(project_id, :rev => rev)
+    # 更新rep_statics统计数
+    @static_total_per_user.each do |static|
+      rep_static = RepStatics.where("project_id =? and email =?", @project.id, static.email.to_s).first
+      if rep_static.nil?
+        RepStatics.create(:project_id => @project.id, :uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+      else
+        if @rev == params[:default_branch]
+          rep_static.update_attributes(:uname => static.uname, :commits_num => static.commits_num, :email => static.email, :add => static.add, :del => static.del, :changeset => static.changes)
+        end
+      end
+    end
+    rescue
+      render_404
+      return
+    end
     render :layout => 'base_projects'
   end
 

app/controllers/student_work_controller.rb

@@ -5,7 +5,7 @@ class StudentWorkController < ApplicationController
   include ApplicationHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,:code_repeattest,:work_canrepeat,: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 => [:new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
@@ -55,12 +55,36 @@ class StudentWorkController < ApplicationController
     render :json => resultObj
   end
 
-  $test_result = {}
-  $test_status = {}
+  #行尾空格替换成□
+  def space_replace_1(str)
+    for i in 0 .. str.size
+      tChar = str[i]
+      if tChar != ' ' &&  tChar != "\n"
+        sFlag = false
+        eFlag = false
+      elsif tChar == ' ' && sFlag == false
+        tStart = i
+        sFlag = true
+      elsif tChar == "\n"
+        tEnd = i - 1
+        if sFlag == true
+          for j in  tStart .. tEnd
+            str[j] = "□"
+          end
+          sFlag = false
+        end
+      end
+    end
+  end
+
+#由于负载问题 不要使用全局变量
 #根据传入的tIndex确定是第几次测试
+#之后如果觉得很卡 可以改成将结果传回JS再以参数形式传回来
   def program_test_ex
+    tStarttime = Time.now
+
     is_test = params[:is_test] == 'true'
-    resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T'),tseq:1,tcount:1} #保存每测试一次返回的结果
+    resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T'),tseq:1,tcount:1,testid:1} #保存每测试一次返回的结果
 
     student_work = find_or_save_student_work(is_test)
 
@@ -76,42 +100,49 @@ class StudentWorkController < ApplicationController
           test = @homework.homework_tests[index - 1]
 
           #请求测试
+          begin
             result = test_realtime_ex(test, params[:src])
+          rescue Timeout::Error
+            tEndtime = Time.now
+            tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+            logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
+
+            #status 0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+            CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
+
+          end
+          if result["status"].to_i != -2
+            #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
+            #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
+            space_replace_1(result["results"].first['output'])
+            space_replace_1(result["results"].first['result'])
+          end
+
           logger.debug  result
 
           #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
           resultObj[:status] = -1
-          resultObj[:results] = result["results"][0]  #本次测试结果
+          resultObj[:results] = result["results"].first  #本次测试结果
           resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
+          #该状态用于存入CodeTests
+          tmpstatus = -1
           if result["status"].to_i == -2 #编译错误
+              resultObj[:results] = result["error_msg"]
               resultObj[:status] = -2
+              tmpstatus = -2
           elsif  result["results"][0]["status"].to_i == 2
               resultObj[:status] = 2
+              tmpstatus = 2
           end
 
-          unless student_work.save
-              resultObj[:status] = 200
-          else
-
-              #索引
-              work_id = student_work.id
-
-              #测试第一个时初始化下全局变量
-              if index == 1
-                  $test_result[work_id] = []    #保存本次测试的结果  输入输出
-                  $test_status[work_id] = 0     #保存本次测试的结果 正确还是错误
+          if result["status"] == 0
+            tmpstatus = 0
           end
 
-              if result["status"].to_i == -2
-                  $test_result[work_id] = [result["error_msg"]]
-                  $test_status[work_id] = -2
+          unless student_work.save
+              resultObj[:status] = 200
           else
-                  #存下每次的结果 只有每次都为0才全部正确
-                  $test_status[work_id] = result["status"] != 0 ? result["status"]:$test_status[work_id]
-                  $test_result[work_id][index - 1] = resultObj[:results]
-              end
-
               student_work.name = params[:title]
               student_work.description = params[:src]
 
@@ -121,21 +152,55 @@ class StudentWorkController < ApplicationController
                   student_work.late_penalty = 0
               end
 
+              #每次从数据库取出上次的结果加上本次的结果再存入数据库
+              if result["status"].to_i != -2
+                result["results"].first['user_wait'] = tUsedtime
+
+                if result["results"][0]["status"].to_i == 2
+                  result["status"] = 2
+                end
+              end
+
+              status = result["status"]
+              if index == 1
+                student_work_test = student_work.student_work_tests.build(status: status,
+                                                                          results: [resultObj[:results]],src: params[:src])
+                student_work_test.save!
+                resultObj[:testid] = student_work_test.id
+              else
+                #先从数据库取出result
+                student_work_test = StudentWorkTest.find(params[:testid])
+                results = student_work_test.results
+                results << resultObj[:results]
+                student_work_test.results = results
+                student_work_test.status = (result["status"] != 0 ? result["status"] : student_work_test.status)
+                student_work_test.save!
+                status = student_work_test.status
+                resultObj[:testid] = student_work_test.id
+              end
+
               #超时或编译错误则直接返回了并存入数据库
               if resultObj[:status] == 2 || resultObj[:status] == -2 || index == @homework.homework_tests.size
-                  if   $test_status[work_id] == 0
+                  if  status == 0
                       resultObj[:status] = 0
                   end
-
-                  student_work_test = student_work.student_work_tests.build(status: $test_status[work_id],
-                  results: $test_result[work_id],src: params[:src])
-                  student_work.save
+                  student_work.save!
                   resultObj[:time] = student_work_test.created_at.to_s(:db)
                   resultObj[:index] = student_work.student_work_tests.count
+              end
 
-                  $test_result[work_id] = nil
-                  $test_status[work_id] = nil
+              #将每次用户等待时间都存起来以便管理界面显示用
+              tEndtime = Time.now
+              tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+              logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
+
+              time_used = 0
+              if result["status"].to_i != -2
+                #至少一毫秒
+                time_used = result["results"].first['time_used'] == 0 ? 1:result["results"].first['time_used']
               end
+              #0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+              CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>time_used,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
 
               #渲染返回结果
               render :json => resultObj
@@ -144,6 +209,114 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  #找出该作业的所有提交作业
+  def find_all_student_work_by_homeid()
+    all_studentwork = StudentWork.where("homework_common_id =#{@homework.id} and is_test = 0 ")
+
+    all_studentwork
+  end
+
+  def request_code_repeattest(src)
+    url = "#{Redmine::Configuration['jplag_server']}api/realtime_test.json"
+
+    factor = []
+    src.each do |test|
+      factor << {work_id: test.id, des: test.description,created_at:test.created_at.to_i}
+    end
+
+    solutions = {
+        homeid:@homework.id,
+        language:@homework.homework_detail_programing.language,
+        factor: factor
+    }
+    uri = URI(url)
+    body = solutions.to_json
+
+    logger.debug  "send body"
+    logger.debug  body
+
+    res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      request                 = Net::HTTP::Post.new(uri.path)
+      request.body            = body
+      request["Content-Type"] = "application/json"
+      client.request(request)
+    end
+
+    JSON.parse(res.body)
+  end
+
+  #点击代码查重按钮
+  def work_canrepeat
+    @homework_id = params[:homework]
+    @course_id = params[:course_id]
+
+    all_studentwork = find_all_student_work_by_homeid()
+
+    @work_count = all_studentwork.count
+  end
+
+  #代码查重 status: 0完成 -2不需要查重 -1查重失败不支持该语言
+  def code_repeattest
+    tStarttime = Time.now
+    logger.debug "code_repeattest start is #{tStarttime}}"
+    resultObj = {status: -2}
+
+    @homework = HomeworkCommon.find params[:homework]
+
+    all_studentwork = find_all_student_work_by_homeid()
+
+    if all_studentwork == nil
+      resultObj[:status] = -2
+    elsif all_studentwork.count <= 1
+      resultObj[:status] = -2
+    else
+
+      #@homework.homework_detail_programing.language、id、description
+      logger.debug "time1 is #{Time.now.usec} "
+      result = request_code_repeattest(all_studentwork)
+      logger.debug "time2 is #{Time.now.usec} "
+
+      resultObj[:status] = result['status'].to_i
+      # resultObj[:results] = result['results']
+
+      #Time.now, simi_id = simiworkid , simi_value = simivalue
+      if resultObj[:status] == 0
+        @homework.simi_time = Time.now
+        resultObj[:comparetime] = @homework.simi_time
+        @homework.update_column('simi_time', @homework.simi_time)
+
+        logger.debug "time3 is #{Time.now.usec} "
+        result['results'].each do |key,value|
+            @student_work = StudentWork.where("id =?", key.to_i).first
+            @student_work.update_column('simi_id', value['simiworkid'].to_i)
+            @student_work.update_column('simi_value', value['simivalue'].to_i)
+          # sqlstr = "update student_works set simi_id=#{value['simiworkid']},simi_value=#{value['simivalue']} where id=#{key.to_i} "
+          # dbh.execute(sqlstr)
+        end
+        logger.debug "time4 is #{Time.now.usec} "
+      end
+    end
+    tEndtime = Time.now
+    logger.debug "code_repeattest end is #{tEndtime}}"
+    tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000000+(tEndtime.usec - tStarttime.usec)
+    logger.debug "code_repeattest userd utime is #{tUsedtime}"
+    render :json => resultObj
+  end
+
+  #上次代码查重时间
+  def last_codecomparetime
+    resultObj = {status: 0}
+    @homework = HomeworkCommon.find params[:homework]
+
+    #转换一下
+    if @homework.simi_time != nil
+        resultObj[:comparetime] = Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M:%S")
+    else
+      resultObj[:comparetime] = 0
+    end
+
+    render :json => resultObj
+  end
 
   def index
     # 作业消息状态更新
@@ -326,10 +499,12 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
+
       @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"
+    @is_focus = params[:is_focus] ? params[:is_focus].to_i : 0
     # 消息传过来的ID
     @message_student_work_id = params[:student_work_id]
     respond_to do |format|
@@ -425,7 +600,7 @@ class StudentWorkController < ApplicationController
             stu_project.save
           end
         end
-        @homework.update_attributes(:updated_at => Time.now)
+        @homework.update_column(: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)
@@ -555,7 +730,7 @@ class StudentWorkController < ApplicationController
         end
       end
     end
-    redirect_to user_homeworks_user_path(User.current.id)
+    redirect_to student_homeworks_user_path(User.current.id)
   end
 
   def retry_work
@@ -746,11 +921,9 @@ class StudentWorkController < ApplicationController
         student_work.late_penalty = @homework.late_penalty
         student_work.save
       end
-
-      @homework.save
     end
 
-    unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s
+    if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s
       homework_detail_manual.absence_penalty = params[:absence_penalty]
       if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
         work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
@@ -770,7 +943,6 @@ class StudentWorkController < ApplicationController
       homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
       @homework.teacher_priority = teacher_priority
 
-      @homework.save
       homework_detail_manual.save if homework_detail_manual
       homework_detail_programing.save if homework_detail_programing
 
@@ -779,6 +951,8 @@ class StudentWorkController < ApplicationController
         student_work.save
       end
     end
+    
+    @homework.save
     if params[:student_path]
       redirect_to student_work_index_url(:homework => @homework.id)
     else

app/controllers/users_controller.rb

@@ -750,7 +750,11 @@ class UsersController < ApplicationController
         render_attachment_warning_if_needed(homework)
 
         homework_detail_manual = HomeworkDetailManual.new
+        if homework.anonymous_comment == 1
+          homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 1.0 : 0.4
+        else
           homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
+        end
         if homework.publish_time > Date.today
           homework_detail_manual.comment_status = 0
         else
@@ -766,7 +770,11 @@ class UsersController < ApplicationController
         if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
+          if homework.anonymous_comment == 1
+            homework_detail_programing.ta_proportion = 0.6
+          else
             homework_detail_programing.ta_proportion = 0.5
+          end
           homework_detail_programing.language = params[:language_type].to_i
 
           inputs = params[:program][:input]
@@ -836,8 +844,8 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
@@ -886,11 +894,11 @@ class UsersController < ApplicationController
   def user_ref_resource_search
     search = params[:search].to_s.strip.downcase
     if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
       @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                           " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
     elsif params[:type] == "2" #课程资源
-      user_course_ids = User.current.courses.map { |c| c.id}
+      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
       @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
     elsif params[:type] == "3" #项目资源
       @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
@@ -1122,13 +1130,13 @@ class UsersController < ApplicationController
   #显示更多用户课程
   def user_courses4show
     @page = params[:page].to_i + 1
-    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   #显示更多用户项目
   def user_projects4show
     @page = params[:page].to_i + 1
-    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
+    @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5)
   end
 
   def user_course_activities
@@ -1206,8 +1214,6 @@ class UsersController < ApplicationController
   end
 
   def show
-    # 统计访问量
-    @user.update_column(:visits, @user.visits.to_i + 1) unless User.current == @user
     #更新用户申请成为课程老师或教辅消息的状态
     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 =?",
@@ -1579,16 +1585,14 @@ class UsersController < ApplicationController
 
   # 上传用户资源
   def user_resource_create
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
     @user = User.find(params[:id])
     # 保存文件
     attach = Attachment.attach_filesex_public(@user, params[:attachments], params[:attachment_type], is_public = true)
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
     @score = @b_sort == "desc" ? "asc" : "desc"
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
     # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
@@ -1618,8 +1622,10 @@ class UsersController < ApplicationController
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
+
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
@@ -1677,6 +1683,7 @@ class UsersController < ApplicationController
     end
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
@@ -1701,6 +1708,7 @@ class UsersController < ApplicationController
       .select { |course|  @user.allowed_to?(:as_teacher,course)  and course.is_delete == 0 }
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids]
@@ -1719,6 +1727,7 @@ class UsersController < ApplicationController
       @projects = @user.projects.visible
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids] #搜索的时候  和 直接 用表格提交的时候的send_ids
@@ -1815,11 +1824,41 @@ class UsersController < ApplicationController
     else
       @flag = false
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -1926,11 +1965,42 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2024,11 +2094,41 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2371,7 +2471,7 @@ class UsersController < ApplicationController
 
   # 获取我的资源
   def get_my_resources author_id, user_course_ids, user_project_ids, order, score
-    attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                        "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("#{order.nil? ? 'created_on' : order} #{score}")
   end
@@ -2484,8 +2584,8 @@ class UsersController < ApplicationController
     end
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
     @score = @b_sort == "desc" ? "asc" : "desc"
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
@@ -2542,8 +2642,8 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
     @score = @b_sort == "desc" ? "asc" : "desc"
-    user_course_ids = User.current.courses.map { |c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}    # user_org_ids = User.current.organizations.map {|o| o.id}
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
@@ -2581,8 +2681,8 @@ class UsersController < ApplicationController
     # 别人的资源库是没有权限去看的
     if(params[:type].blank? || params[:type] == "1") # 我的资源
       # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      user_course_ids = User.current.courses.map { |c| c.id}
-      user_project_ids = User.current.projects.map {|p| p.id}
+      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
       # user_org_ids = User.current.organizations.map {|o| o.id}
       @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
     elsif params[:type] == "6" # 公共资源
@@ -2639,6 +2739,10 @@ class UsersController < ApplicationController
           attach_copied_obj.attachtype = 4
         end
         attach_copied_obj.save
+        # 附件保存成功后更新项目和课程的统计数
+        if params[:mul_type] == "Project"
+          mul_container.project_score.update_attribute(:attach_num, mul_container.project_score.attach_num + 1) unless mul_container.project_score.nil?
+        end
         @save_message = attach_copied_obj.errors.full_messages
       end
     end
@@ -2662,8 +2766,8 @@ class UsersController < ApplicationController
     @user = User.current
     @switch_search = params[:search].nil? ? " " : params[:search]
     search = "%#{@switch_search.strip.downcase}%"
-    user_course_ids = User.current.courses.map {|c| c.id}
-    user_project_ids = User.current.projects.map {|p| p.id}
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') # 全部
       if params[:status] == "2"
         @attachments = get_course_resources_search(params[:id], user_course_ids, @order, @score, search)
@@ -2721,6 +2825,7 @@ class UsersController < ApplicationController
     name = "%"+name+"%"
     @orgs = User.current.organizations.where("name like ?", name)
     @user = User.current
+    @type = params[:type]
     respond_to do |format|
       format.html {render :layout => 'static_base'}
       format.js

app/controllers/wechats_controller.rb

@@ -0,0 +1,235 @@
+#coding=utf-8
+class WechatsController < ActionController::Base
+  wechat_responder
+
+  include ApplicationHelper
+
+  # default text responder when no other match
+  on :text do |request, content|
+    request.reply.text "您的意见已收到" # Just echo
+  end
+
+  # When receive 'help', will trigger this responder
+  on :text, with: 'help' do |request|
+    request.reply.text 'help content'
+  end
+
+  # When receive '<n>news', will match and will got count as <n> as parameter
+  on :text, with: /^(\d+) news$/ do |request, count|
+    # Wechat article can only contain max 10 items, large than 10 will dropped.
+    news = (1..count.to_i).each_with_object([]) { |n, memo| memo << { title: 'News title', content: "No. #{n} news content" } }
+    request.reply.news(news) do |article, n, index| # article is return object
+      article.item title: "#{index} #{n[:title]}", description: n[:content], pic_url: 'http://www.baidu.com/img/bdlogo.gif', url: 'http://www.baidu.com/'
+    end
+  end
+
+  on :event, with: 'subscribe' do |request|
+    default_msg(request)
+  end
+
+  # When unsubscribe user scan qrcode qrscene_xxxxxx to subscribe in public account
+  # notice user will subscribe public account at same time, so wechat won't trigger subscribe event any more
+  on :scan, with: 'qrscene_xxxxxx' do |request, ticket|
+    request.reply.text "Unsubscribe user #{request[:FromUserName]} Ticket #{ticket}"
+  end
+
+  # When subscribe user scan scene_id in public account
+  on :scan, with: 'scene_id' do |request, ticket|
+    request.reply.text "Subscribe user #{request[:FromUserName]} Ticket #{ticket}"
+  end
+
+  # When no any on :scan responder can match subscribe user scaned scene_id
+  on :event, with: 'scan' do |request|
+    if request[:EventKey].present?
+      request.reply.text "event scan got EventKey #{request[:EventKey]} Ticket #{request[:Ticket]}"
+    end
+  end
+
+  # When enterprise user press menu BINDING_QR_CODE and success to scan bar code
+  on :scan, with: 'BINDING_QR_CODE' do |request, scan_result, scan_type|
+    request.reply.text "User #{request[:FromUserName]} ScanResult #{scan_result} ScanType #{scan_type}"
+  end
+
+  # Except QR code, wechat can also scan CODE_39 bar code in enterprise account
+  on :scan, with: 'BINDING_BARCODE' do |message, scan_result|
+    if scan_result.start_with? 'CODE_39,'
+      message.reply.text "User: #{message[:FromUserName]} scan barcode, result is #{scan_result.split(',')[1]}"
+    end
+  end
+
+  # When user click the menu button
+  on :click, with: 'BOOK_LUNCH' do |request, key|
+    request.reply.text "User: #{request[:FromUserName]} click #{key}"
+  end
+
+  # When user view URL in the menu button
+  on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
+    request.reply.text "#{request[:FromUserName]} view #{view}"
+  end
+
+  # When user sent the imsage
+  on :image do |request|
+    request.reply.image(request[:MediaId]) # Echo the sent image to user
+  end
+
+  # When user sent the voice
+  on :voice do |request|
+    request.reply.voice(request[:MediaId]) # Echo the sent voice to user
+  end
+
+  # When user sent the video
+  on :video do |request|
+    nickname = wechat.user(request[:FromUserName])['nickname'] # Call wechat api to get sender nickname
+    request.reply.video(request[:MediaId], title: 'Echo', description: "Got #{nickname} sent video") # Echo the sent video to user
+  end
+
+  # When user sent location
+  on :location do |request|
+    request.reply.text("Latitude: #{message[:Latitude]} Longitude: #{message[:Longitude]} Precision: #{message[:Precision]}")
+  end
+
+  on :event, with: 'unsubscribe' do |request|
+    request.reply.success # user can not receive this message
+  end
+
+  # When user enter the app / agent app
+  on :event, with: 'enter_agent' do |request|
+    request.reply.text "#{request[:FromUserName]} enter agent app now"
+  end
+
+  # When batch job create/update user (incremental) finished.
+  on :batch_job, with: 'sync_user' do |request, batch_job|
+    request.reply.text "sync_user job #{batch_job[:JobId]} finished, return code #{batch_job[:ErrCode]}, return message #{batch_job[:ErrMsg]}"
+  end
+
+  # When batch job replace user (full sync) finished.
+  on :batch_job, with: 'replace_user' do |request, batch_job|
+    request.reply.text "replace_user job #{batch_job[:JobId]} finished, return code #{batch_job[:ErrCode]}, return message #{batch_job[:ErrMsg]}"
+  end
+
+  # When batch job invent user finished.
+  on :batch_job, with: 'invite_user' do |request, batch_job|
+    request.reply.text "invite_user job #{batch_job[:JobId]} finished, return code #{batch_job[:ErrCode]}, return message #{batch_job[:ErrMsg]}"
+  end
+
+  # When batch job replace department (full sync) finished.
+  on :batch_job, with: 'replace_party' do |request, batch_job|
+    request.reply.text "replace_party job #{batch_job[:JobId]} finished, return code #{batch_job[:ErrCode]}, return message #{batch_job[:ErrMsg]}"
+  end
+
+  # Any not match above will fail to below
+  on :fallback, respond: 'fallback message'
+
+  on :click, with: 'FEEDBACK' do |request, key|
+    request.reply.text "如有反馈问题,请直接切入至输入框,发微信给我们即可"
+  end
+
+  on :click, with: 'MY_NEWS' do |request, key|
+    default_msg(request)
+  end
+
+  def default_msg(request)
+    uw = user_binded?(request[:FromUserName])
+    if uw && uw.user
+      request.reply.text "欢迎回来, #{uw.user.show_name}"
+    else
+      sendBind(request)
+    end
+  end
+
+  def sendBind(request)
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '绑定登录', content: "您还未绑定确实的用户,请先绑定." } }
+    request.reply.news(news) do |article, n, index| # article is return object
+      url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{login_wechat_url}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+      article.item title: "#{n[:title]}",
+                   description: n[:content],
+                   pic_url: 'https://www.trustie.net/images/trustie_logo2.png',
+                   url: url
+    end
+  end
+
+
+  def get_open_id
+    begin
+      raise "非法操作, code不存在" unless params[:code]
+      openid = get_openid_from_code(params[:code])
+      raise "无法获取到openid" unless openid
+      render :json => {status:0, openid: openid}
+    rescue Exception=>e
+      render :json => {status: -1, msg: e.message}
+    end
+  end
+
+  def bind
+    begin
+       raise "非法操作, code不存在" unless params[:code]
+       openid = get_openid_from_code(params[:code])
+       raise "无法获取到openid" unless openid
+       raise "此微信号已绑定用户, 不能得复绑定" if user_binded?(openid)
+
+       user, last_login_on = User.try_to_login(params[:username], params[:password])
+       raise "用户名或密码错误,请重新登录" unless user
+       #补全用户信息
+
+       raise "此用户已经绑定了公众号" if user.user_wechat
+
+       UserWechat.create!(
+           openid: openid,
+           user: user
+       )
+       render :json => {status:0, msg: "绑定成功"}
+    rescue Exception=>e
+      render :json => {status: -1, msg: e.message}
+    end
+  end
+
+  def login
+    @code = params[:code] #TODO 安全性
+    render 'wechats/login', layout: 'base_wechat'
+  end
+
+  private
+  def get_openid_from_code(code)
+    url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=#{Wechat.config.appid}&secret=#{Wechat.config.secret}&code=#{code}&grant_type=authorization_code"
+    logger.debug url
+    body = URI.parse(url).read
+    logger.debug body
+    JSON.parse(body)["openid"]
+  end
+
+  def user_binded?(openid)
+    uw = UserWechat.where(openid: openid).first
+  end
+
+  def user_activity(user)
+    @user = user
+    shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
+    user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
+    course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+    project_types = "('Message','Issue','ProjectCreateInfo')"
+    principal_types = "JournalsForMessage"
+
+    blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
+    @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" +
+                                              "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+
+                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " +
+                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc').limit(10).offset(@page * 10)
+
+
+  end
+
+  def process_activity(user_activity)
+    act= user_activity.act
+    case user_activity.container_type.to_s
+      when 'Course'
+      when 'Project'
+        case user_activity.act_type.to_s
+          when 'Issue'
+            [act.project.name.to_s+" | 项目问题", act.subject.to_s, url_to_avatar(act.author),"http://wechat.trustie.net/app.html#/issue/#{act.id}"]
+        end
+    end
+  end
+end

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)
+          @homework_common.update_column(: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/api_helper.rb

@@ -27,6 +27,10 @@ module ApiHelper
     location
   end
 
+  def get_user_realname user
+    name = user.lastname + user.firstname
+    name.empty? || name.nil? || name == " " ? user.login : name
+  end
 
   def get_assigned_homeworks(homeworks, n, index)
     homeworks += homeworks
@@ -201,5 +205,288 @@ module ApiHelper
 
   end
 
+  #日期转换为时间
+  def convert_to_time date, num
+    if num == 0
+      date = date.to_s + " 00:00"
+    elsif num == 1
+      date = date.to_s + " 23:59"
+    end
+    return date
+  end
+
+  #获取用户
+  def get_user user_id
+    user = User.find user_id
+    user
+  end
+
+  #获取项目
+  def get_project project_id
+    project = Project.find project_id
+    project
+  end
+
+  #获取课程
+  def get_course course_id
+    course = Course.find course_id
+    course
+  end
+
+  #获取点赞数
+  def get_activity_praise_num(object)
+    obj_type = object.class
+    obj_id = object.id
+    record = PraiseTreadCache.find_by_object_id_and_object_type(obj_id,obj_type)
+    if record
+      return ((record.praise_num.nil? ? 0 : record.praise_num.to_i)-(record.tread_num.nil? ? 0 : record.tread_num.to_i))
+    else
+      return 0
+    end
+  end
+
+  #获取缺陷的优先级
+  def get_issue_priority_api value
+    issuetype = ""
+    if value == 4
+      issuetype = "紧急"
+    elsif value == 2
+      issuetype = "正常"
+    elsif value == 3
+      issuetype = "高"
+    elsif value == 1
+      issuetype = "低"
+    else
+      issuetype = "立刻"
+    end
+  end
+
+  def jdetails_to_strings(details, no_html=false, options={})
+    options[:only_path] = (options[:only_path] == false ? false : true)
+    options[:token] = options[:token] if options[:token]
+    strings = []
+    values_by_field = {}
+    details.each do |detail|
+
+      if detail.property == 'cf'
+        field_id = detail.prop_key
+        field = CustomField.find_by_id(field_id)
+        if field && field.multiple?
+          values_by_field[field_id] ||= {:added => [], :deleted => []}
+          if detail.old_value
+            values_by_field[field_id][:deleted] << detail.old_value
+          end
+          if detail.value
+            values_by_field[field_id][:added] << detail.value
+          end
+          next
+        end
+      end
+      strings << jshow_detail(detail, no_html, options)
+
+    end
+    values_by_field.each do |field_id, changes|
+      detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
+      if changes[:added].any?
+        detail.value = changes[:added]
+        strings << jshow_detail(detail, no_html, options)
+      elsif changes[:deleted].any?
+        detail.old_value = changes[:deleted]
+        strings << jshow_detail(detail, no_html, options)
+      end
+    end
+    strings
+  end
+
+  # Returns the textual representation of a single journal detail
+  def jshow_detail(detail, no_html=false, options={})
+    multiple = false
+    case detail.property
+      when 'attr'
+        field = detail.prop_key.to_s.gsub(/\_id$/, "")
+        label = l(("field_" + field).to_sym)
+        case detail.prop_key
+          when 'due_date', 'start_date'
+            value = format_date(detail.value.to_date) if detail.value
+            old_value = format_date(detail.old_value.to_date) if detail.old_value
+
+          when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
+              'priority_id', 'category_id', 'fixed_version_id'
+            value = find_name_by_reflection(field, detail.value)
+            old_value = find_name_by_reflection(field, detail.old_value)
+
+          when 'estimated_hours'
+            value = "%0.02f" % detail.value.to_f unless detail.value.blank?
+            old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
+
+          when 'parent_id'
+            label = l(:field_parent_issue)
+            value = "##{detail.value}" unless detail.value.blank?
+            old_value = "##{detail.old_value}" unless detail.old_value.blank?
+
+          when 'is_private'
+            value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
+            old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
+        end
+      when 'cf'
+        custom_field = CustomField.find_by_id(detail.prop_key)
+        if custom_field
+          multiple = custom_field.multiple?
+          label = custom_field.name
+          value = format_value(detail.value, custom_field.field_format) if detail.value
+          old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
+        end
+      when 'attachment'
+        label = l(:label_attachment)
+    end
+    call_hook(:helper_issues_show_detail_after_setting,
+              {:detail => detail, :label => label, :value => value, :old_value => old_value })
+
+    label ||= detail.prop_key
+    value ||= detail.value
+    old_value ||= detail.old_value
+
+    unless no_html
+      label = content_tag('strong', label)
+      old_value = content_tag("i", old_value) if detail.old_value
+      old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
+      if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
+        # Link to the attachment if it has not been removed
+        if options[:token].nil?
+          value = atta.filename
+        else
+          value = atta.filename
+        end
+        # 放大镜搜索功能
+        # if options[:only_path] != false && atta.is_text?
+        #   value += link_to(
+        #                image_tag('magnifier.png'),
+        #                :controller => 'attachments', :action => 'show',
+        #                :id => atta, :filename => atta.filename
+        #              )
+        # end
+      else
+        value = content_tag("i", value) if value
+      end
+    end
+    # 缺陷更新结果在消息中显示样式
+    if no_html == "message"
+      label = content_tag(:span, label, :class => "issue_update_message")
+      old_value = content_tag("span", old_value) if detail.old_value
+      old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
+      if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
+        # Link to the attachment if it has not been removed
+        if options[:token].nil?
+          value = atta.filename
+        else
+          value = atta.filename
+        end
+      else
+        value = content_tag(:span, value, :class => "issue_update_message_value") if value
+      end
+    end
+
+    if detail.property == 'attr' && detail.prop_key == 'description'
+      s = l(:text_journal_changed_no_detail, :label => label)
+      unless no_html
+        diff_link = link_to l(:label_diff),
+                            {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
+                             :detail_id => detail.id, :only_path => options[:only_path]},
+                            :title => l(:label_view_diff)
+        s << " (#{ diff_link })"
+      end
+      s.html_safe
+    elsif detail.value.present?
+      case detail.property
+        when 'attr', 'cf'
+          if detail.old_value.present?
+            l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
+          elsif multiple
+            l(:text_journal_added, :label => label, :value => value).html_safe
+          else
+            l(:text_journal_set_to, :label => label, :value => value).html_safe
+          end
+        when 'attachment'
+          l(:text_journal_added, :label => label, :value => value).html_safe
+      end
+    else
+      l(:text_journal_deleted, :label => label, :old => old_value).html_safe
+    end
+  end
+
+  #课程动态的更新
+  def update_course_activity_api type, id
+    course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", type.to_s, id.to_i).first
+    if course_activity
+      course_activity.updated_at = Time.now
+      course_activity.save
+    end
+  end
+  #首页动态更新
+  def update_user_activity_api type, id
+    user_activity = UserActivity.where("act_type=? and act_id =?", type.to_s, id.to_i).first
+    if user_activity
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
+  end
+  #项目动态更新
+  def update_forge_activity_api type, id
+    forge_activity = ForgeActivity.where("forge_act_type=? and forge_act_id=?", type.to_s, id.to_i).first
+    if forge_activity
+      forge_activity.updated_at = Time.now
+      forge_activity.save
+    end
+  end
+  #组织动态更新
+  def update_org_activity_api type , id
+    org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", type.to_s, id.to_i).first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
+  end
+  #个人动态更新
+  def update_principal_activity_api type, id
+    principal_activity = PrincipalActivity.where("principal_act_type=? and principal_act_id =?", type.to_s, id.to_i).first
+    if principal_activity
+      principal_activity.updated_at = Time.now
+      principal_activity.save
+    end
+  end
+
+  #赞/取消赞
+  def praise_or_cancel(type,id,user,flag)
+    unless id.nil? and type.nil?
+      #首先创建或更新praise_tread 表
+      pt = PraiseTread.new
+      pt.user_id = user.id
+      pt.praise_tread_object_id = id.to_i
+      pt.praise_tread_object_type = type
+      pt.praise_or_tread = flag
+      pt.save
+      # end
+
+      #再创建或更新praise_tread_cache表
+      #@ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type)
+      ptc = PraiseTreadCache.where("object_id = ? and object_type = ?",id.to_i,type).first
+      ptc = ptc.nil? ? PraiseTreadCache.new : ptc
+      ptc.object_id = id.to_i
+      ptc.object_type = type
+      ptc.save
+      ptc.praise_plus(flag,1)
+    end
+  end
+
+  def praise_plus(flag,num)
+    case flag
+      when 1
+        self.update_attribute(:praise_num, self.praise_num.to_i + num)
+    end
+  end
+
+  def praise_minus(num)
+    self.update_attribute(:praise_num, self.praise_num.to_i - num)
+  end
 
 end

app/helpers/application_helper.rb

@@ -33,6 +33,10 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
+  def update_visiti_count container
+    container.update_column(:visits, container.visits + 1)
+  end
+
   # Time 2015-03-24 15:27:29
   # Author lizanle
   # Description 从硬盘上删除对应的资源文件
@@ -116,60 +120,53 @@ module ApplicationHelper
     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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1)
         else
-          score = course_contributor_score.homework_journal_num + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score)
+          score = course_contributor_score.homework_journal_num.to_i + 1
+          course_contributor_score.update_column(:homework_journal_num, score)
         end
       # 课程留言
       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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1)
         else
-          score = course_contributor_score.journal_num + 1
-          course_contributor_score.update_attributes(:journal_num => score)
+          score = course_contributor_score.journal_num.to_i + 1
+          course_contributor_score.update_column(:journal_num, score)
         end
       when  "Message"
         if  course_contributor_score.nil?
-          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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1)
         else
-          score = course_contributor_score.message_num + 1
-          course_contributor_score.update_attributes(:message_num => score)
+          score = course_contributor_score.message_num.to_i + 1
+          course_contributor_score.update_column(: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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1)
         else
-          score = course_contributor_score.message_reply_num + 1
-          course_contributor_score.update_attributes(:message_reply_num => score)
+          score = course_contributor_score.message_reply_num.to_i + 1
+          course_contributor_score.update_column(: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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1)
         else
-          score = course_contributor_score.news_reply_num + 1
-          course_contributor_score.update_attributes(:news_reply_num => score)
+          score = course_contributor_score.news_reply_num.to_i + 1
+          course_contributor_score.update_column(: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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1)
         else
-          score = course_contributor_score.news_num + 1
-          course_contributor_score.update_attributes(:news_num => score)
+          score = course_contributor_score.news_num.to_i + 1
+          course_contributor_score.update_column(: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)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1)
         else
-          score = course_contributor_score.resource_num + 1
-          course_contributor_score.update_attributes(:resource_num => score)
+          score = course_contributor_score.resource_num.to_i + 1
+          course_contributor_score.update_column(:resource_num, score)
         end
     end
   end
@@ -180,39 +177,39 @@ module ApplicationHelper
     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)
+          score = course_contributor_score.homework_journal_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.journal_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.message_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.message_reply_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.news_reply_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.news_num.to_i - 1
+          course_contributor_score.update_column(: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)
+          score = course_contributor_score.resource_num.to_i - 1
+          course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score)
         end
     end
   end
@@ -2104,6 +2101,8 @@ module ApplicationHelper
           attachment.container.board.course
         course = attachment.container.board.course
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+      elsif attachment.container.class.to_s=="Organization"
+        candown = true
       elsif attachment.container.class.to_s=="HomeworkAttach"
         candown = true
       elsif attachment.container.class.to_s=="StudentWorksScore"
@@ -2984,8 +2983,12 @@ def homework_common_index_url_in_org(course_id)
   Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s
 end
 
-def student_work_index_url_in_org(homework_id)
+def student_work_index_url_in_org(homework_id, is_focus = '')
+  if is_focus != ''
+    Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s
+  else
     Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s
+  end
 end
 
 def course_url_in_org(course_id)
@@ -3062,3 +3065,18 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
+def strip_html(text,len=0,endss="...")
+  ss = ""
+  if text.length>0
+    ss=text.gsub(/<\/?.*?>/, '').strip
+
+    if len > 0 && ss.length > len
+      ss = ss[0, len] + endss
+    elsif len > 0 && ss.length <= len
+      ss = ss
+      #ss = truncate(ss, :length => len)
+    end
+  end
+  return ss
+end
+

app/helpers/courses_helper.rb

@@ -850,7 +850,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          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)))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 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/helpers/issues_helper.rb

@@ -19,7 +19,7 @@
 
 module IssuesHelper
   include ApplicationHelper
-
+  include TagsHelper
   def issue_list(issues, &block)
     ancestors = []
     issues.each do |issue|

app/helpers/organizations_helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module OrganizationsHelper
   include ApplicationHelper
+  include FilesHelper
 
 
   def find_user_not_in_current_org_by_name org
@@ -28,4 +29,48 @@ module OrganizationsHelper
     end
   end
 
+  def get_message_org(org_id, field_id)
+    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} and parent_id is null order by updated_at desc limit 8;")
+  end
+
+  def get_message_reply_org(org_id, ids)
+    # OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id is not null order by updated_at desc limit 1;")
+    OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and parent_id in (#{ids}) order by updated_at desc limit 1;")
+  end
+
+  def get_attach_org(field_id)
+    Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;")
+  end
+
+  def get_attach_org2(field)
+    org_attachments = field.attachments
+    attachments = User.current.admin? ? org_attachments : visable_attachemnts(org_attachments)
+    return attachments.sort_by{|x| x.created_on}.reverse.first(6)
+    # Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;")
+  end
+
+  # 从内容中获取路径
+  def get_image_path_from_content content
+    r = Regexp.new(/src="\/files\/uploads\/image(.+?)"/)
+    if r.match(content).nil?
+      image_path = nil
+    else
+      image_path = r.match(content)[1]
+    end
+  end
+
+  #排列下拉框
+  def subfield_status_option
+    type = []
+    option1 = []
+    option1 << "列表"
+    option1 << "1"
+    type << option1
+    option2 = []
+    option2 << "图片"
+    option2 << "0"
+    type << option2
+    type
+  end
+
 end

app/helpers/repositories_helper.rb

@@ -41,6 +41,23 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取文件目录的最新动态
+  def get_trees_last_changes(project_id, rev, ent_name)
+    g = Gitlab.client
+    begin
+      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
+      tree_changes
+    rescue
+      logger.error("faile to get tress activities!")
+    end
+  end
+
+  def translate_time time
+    case time
+      when time.include("")
+    end
+  end
+
   # 获取diff内容行号
   def diff_line_num content
     content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i

app/helpers/student_work_helper.rb

@@ -130,7 +130,7 @@ module StudentWorkHelper
   def revise_attachment_status homework, attach
     date = Time.parse(format_time(attach.created_on.to_s)).strftime("%Y-%m-%d")
     status = ""
-    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time < date))
+    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time.to_s < date))
       status = "此时其他同学作品已公开"
     else
       status = "此时其他同学作品尚未公开"

app/models/attachment.rb

@@ -23,6 +23,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
   belongs_to :course, foreign_key: 'container_id', conditions: "attachments.container_type = 'Course'"
   belongs_to :org_subfield, foreign_key: 'container_id', conditions: "attachements.container_type = 'OrgSubfield'"
+  belongs_to :organization, foreign_key: 'container_id', conditions: "attachements.container_type = 'Organization'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"

app/models/blog_comment.rb

@@ -1,5 +1,8 @@
+#encoding: utf-8
 class BlogComment < ActiveRecord::Base
   # attr_accessible :title, :body
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   belongs_to :blog
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
@@ -18,7 +21,7 @@ class BlogComment < ActiveRecord::Base
 
   after_save :add_user_activity
   after_update :update_activity
-  after_create :update_parent_time
+  after_create :update_parent_time, :blog_wechat_message
   before_destroy :destroy_user_activity
 
   scope :like, lambda {|arg|
@@ -72,4 +75,18 @@ class BlogComment < ActiveRecord::Base
   end
   def project
   end
+
+  #博客回复微信模板消息
+  def blog_wechat_message
+    ws = WechatService.new
+    if self.parent_id.nil?
+      self.author.watcher_users.each do |watcher|
+        content = strip_html self.author.try(:realname) + " 发表了博客：" + self.title.html_safe, 200
+        ws.message_update_template watcher.id, "blog_comment", self.id, "#{l(:label_new_blog_template)}", content, format_time(self.created_at)
+      end
+    else
+      content = strip_html self.content.html_safe, 200
+      ws.comment_template self.parent.author_id, "blog_comment", self.parent_id, "#{l(:label_blog_comment_template)}", self.author.try(:realname), format_time(self.created_at), content
+    end
+  end
 end

app/models/code_tests.rb

@@ -0,0 +1,3 @@
+class CodeTests < ActiveRecord::Base
+  attr_accessible :homework_id, :language, :status, :time_used, :wait_time, :student_work_id
+end

app/models/comment.rb

@@ -16,6 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Comment < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   include ApplicationHelper
   has_many_kindeditor_assets :assets, :dependent => :destroy
@@ -39,13 +41,18 @@ class Comment < ActiveRecord::Base
   after_destroy :down_course_score
 
   def act_as_system_message
+    ws = WechatService.new
     if self.commented.course
       if self.author_id != self.commented.author_id
         self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
+        content = strip_html self.comments.html_safe, 200
+        ws.comment_template self.commented.author_id, "course_notice", self.id, "#{l(:label_notice_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
       end
     else  # 项目相关
       if self.author_id != self.commented.author_id
         self.forge_messages << ForgeMessage.new(:user_id => self.commented.author_id, :project_id => self.commented.project.id, :viewed => false)
+        #content = strip_html self.comments.html_safe, 200
+        #ws.comment_template self.commented.author_id, "blog_comment", self.id, "#{l(:label_news_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
       end
     end
   end

app/models/homework_common.rb

@@ -1,7 +1,10 @@
+#encoding: utf-8
 #老师布置的作业表
 #homework_type: 0:普通作业;1:匿评作业;2:编程作业
 class HomeworkCommon < ActiveRecord::Base
-  # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id
+  # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id,:simi_time
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   include ApplicationHelper
 
@@ -26,7 +29,7 @@ class HomeworkCommon < ActiveRecord::Base
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
   after_create :act_as_activity, :send_mail, :act_as_course_message
-  after_update :update_activity
+  after_update :update_activity, :wechat_message
   after_save :act_as_course_activity
   after_destroy :delete_kindeditor_assets
 
@@ -56,6 +59,8 @@ class HomeworkCommon < ActiveRecord::Base
         self.course.members.each do |m|
           # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          ws = WechatService.new
+          ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
           # end
         end
       end
@@ -98,6 +103,14 @@ class HomeworkCommon < ActiveRecord::Base
     jfm
   end
 
+  #修改作业后发送微信模板消息
+  def wechat_message
+    self.course.members.each do |member|
+      ws = WechatService.new
+      ws.homework_template(member.user_id, "homework", self.id, "#{l(:label_update_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+    end
+  end
+
   delegate :language_name, :language, :to => :homework_detail_programing
 
 end

app/models/issue.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -16,6 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Issue < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   include Redmine::Utils::DateCalculation
   include UserScoreHelper
@@ -156,6 +159,9 @@ class Issue < ActiveRecord::Base
     # 指派给自己的缺陷不提示消息
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
+      ws = WechatService.new
+      content = strip_html self.author.try(:realname) + " 给您指派了缺陷：" + self.subject.html_safe, 200
+      ws.message_update_template self.assigned_to_id, "issues", self.id, "#{l(:label_new_issue_template)}", content, format_time(self.created_on)
     end
     if self.tracker_id == 5
       self.project.members.each do |m|

app/models/journal.rb

@@ -1,3 +1,4 @@
+#coding=utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -16,6 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Journal < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include UserScoreHelper
   belongs_to :journalized, :polymorphic => true,:touch => true
   # added as a quick fix to allow eager loading of the polymorphic association
@@ -52,7 +55,7 @@ class Journal < ActiveRecord::Base
   
   # fq
   after_save :act_as_activity,:be_user_score, :act_as_forge_message, act_as_at_message(:notes, :user_id)
-  after_create :update_issue_time
+  after_create :issue_wechat_message
   # end
   #after_destroy :down_user_score
   #before_save :be_user_score
@@ -233,4 +236,11 @@ class Journal < ActiveRecord::Base
       forge_activity.update_attribute(:created_at, self.created_on) unless forge_activity.nil?
     end
   end
+
+  #缺陷回复微信模板消息
+  def issue_wechat_message
+    ws = WechatService.new
+    content = strip_html self.notes.html_safe, 200
+    ws.comment_template self.issue.author_id, "issues", self.journalized_id, "#{l(:label_issue_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+  end
 end

app/models/journals_for_message.rb

@@ -1,7 +1,9 @@
-# fq
+#coding=utf-8
 # 数据库字段中带有m前缀和is_readed是二次开发添加，之前的字段基本复用
 # 注意reply_id 是提到人的id，不是留言id, Base中叫做 at_user
 class JournalsForMessage < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   include UserScoreHelper
   include ApplicationHelper
@@ -253,17 +255,26 @@ class JournalsForMessage < ActiveRecord::Base
         self.course_messages << CourseMessage.new(:user_id => r, :course_id => self.jour.id, :viewed => false)
       end
     end
+    if self.jour_type == 'HomeworkCommon'
+      ws = WechatService.new
+      #content = truncate(strip_tags(self.notes.to_s), length: 200)
+      content = strip_html self.notes.html_safe, 200
+      ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+    end
   end
 
 
   # 用户留言消息通知
   def act_as_user_feedback_message
     # 主留言
+    ws = WechatService.new
     if self.jour_type == 'Principal'
       receivers = []
       if self.reply_id == 0
         if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
           receivers << self.jour
+          content = strip_html self.notes, 200
+          ws.message_update_template self.jour_id, "journal_for_message", self.id, "#{l(:label_new_journals_template)}", content, format_time(self.created_on)
         end
       else # 留言回复
         reply_to = User.find(self.reply_id)
@@ -273,11 +284,12 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
           receivers << self.parent.jour
         end
+        content = strip_html self.notes, 200
+        ws.comment_template self.reply_id, "journal_for_message", self.parent.id, "#{l(:label_journals_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
       end
       receivers.each do |r|
         self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
       end
-
     end
   end
 
@@ -298,5 +310,4 @@ class JournalsForMessage < ActiveRecord::Base
       down_course_score_num(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
-
 end

app/models/mailer.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -626,6 +627,7 @@ class Mailer < ActionMailer::Base
   #   attachments_added(attachments) => Mail::Message object
   #   Mailer.attachments_added(attachments).deliver => sends an email to the project's recipients
   def homework_added(homework_common)
+    logger.info "homework added"
     @homework_common = homework_common
     @author = homework_common.user
     @homework_common_url = url_for(:controller => "homework_common", :action =>"index", :homework => @homework_common.id)
@@ -1096,5 +1098,4 @@ class Mailer < ActionMailer::Base
     1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
     return newpass
   end
-
 end

app/models/member.rb

@@ -145,7 +145,7 @@ class Member < ActiveRecord::Base
 
   #当前课程的作业列表
   def homework_common_list
-    HomeworkCommon.where(:course_id => self.course_id)
+    HomeworkCommon.where("course_id = ? and publish_time is not null and publish_time <= '#{Date.today}'", self.course_id)
   end
 
   #当前学生在指定作业内的得分
@@ -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,IF(student_works.final_score =0,0,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,IF((student_works.final_score - student_works.absence_penalty - student_works.late_penalty) < 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

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -16,6 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Message < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   include UserScoreHelper
   include ApplicationHelper
@@ -77,12 +80,10 @@ class Message < ActiveRecord::Base
   validates_length_of :subject, :maximum => 255
   validate :cannot_reply_to_locked_topic, :on => :create
 
-  after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
+  # 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, :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(:content, :author_id)
+  after_create :act_as_course_activity, :act_as_forge_activity, :act_as_student_score, act_as_at_message(:content, :author_id), :add_author_as_watcher, :reset_counters!, :add_boards_count
   #before_save :be_user_score
 
   scope :visible, lambda {|*args|
@@ -134,11 +135,11 @@ class Message < ActiveRecord::Base
     if self.project && !project.project_score.nil?
       # 讨论区
       if self.parent_id.nil?
-        count = self.project.project_score.board_num + 1
-        self.project.project_score.update_attribute(:board_num, count)
+        count = self.project.project_score.board_num.to_i + 1
+        self.project.project_score.update_column(:board_num, count)
       else # 回复
-        count = self.project.project_score.board_message_num + 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        count = self.project.project_score.board_message_num.to_i + 1
+        self.project.project_score.update_column(:board_message_num, count)
       end
     end
   end
@@ -257,31 +258,40 @@ class Message < ActiveRecord::Base
   # 主贴项目成员都能收到
   # 回帖：帖子的发布人收到
   def act_as_system_message
+    ws = WechatService.new
     if self.course
       if self.parent_id.nil?   # 主贴
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
+            content = strip_html self.subject, 200
+            ws.topic_publish_template m.user_id, "course_discussion", self.id, "#{l(:label_course_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
           end
         end
       else    # 回帖
-        self.course.members.each do |m|
+        self.course.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
+            content = strip_html self.content.html_safe, 200
+            ws.comment_template m.user_id, "course_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
           end
         end
       end
     elsif self.project  # 项目相关
       if self.parent_id.nil?   # 主贴
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if  m.user_id != self.author_id
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+            content = strip_html self.subject, 200
+            ws.topic_publish_template m.user_id, "project_discussion", self.id, "#{l(:label_project_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
           end
         end
       else    # 回帖
-        self.project.members.each do |m|
+        self.project.members.includes(:user).each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
+            content = strip_html self.content.html_safe, 200
+            ws.comment_template m.user_id, "project_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
           end
         end
       end

app/models/news.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -16,6 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class News < ActiveRecord::Base
+  require 'net/http'
+  require 'json'
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   include ApplicationHelper
@@ -167,6 +170,9 @@ class News < ActiveRecord::Base
       self.course.members.each do |m|
         if m.user_id != self.author_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+          ws = WechatService.new
+          content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200
+          ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.author.try(:realname) + " 发布了通知：" + content, format_time(self.created_on)
         end
       end
     else

app/models/organization.rb

@@ -8,6 +8,8 @@ class Organization < ActiveRecord::Base
   has_many :org_courses, :dependent => :destroy
   has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
+  has_many :files
+  acts_as_attachable
   validates_uniqueness_of :name
   after_create :save_as_org_activity, :add_default_subfields
 

app/models/project.rb

@@ -115,6 +115,7 @@ class Project < ActiveRecord::Base
 
   has_many :org_projects,:dependent => :destroy
   has_many :organization,:through => :org_projects
+  has_many :rep_statics, :class_name => 'RepStatics'
 
   # has_many :journals
 

app/models/rep_statics.rb

@@ -0,0 +1,4 @@
+class RepStatics < ActiveRecord::Base
+  belongs_to :project
+  attr_accessible :add, :commits_num, :del, :email, :project_id, :uname, :changeset
+end

app/models/repository.rb

@@ -44,7 +44,7 @@ class Repository < ActiveRecord::Base
   # validates_uniqueness_of :identifier, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
-  validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
+  validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]*[a-zA-Z_\-]+[a-zA-Z0-9_\-]*$/, :allow_blank => true
   # Checks if the SCM is enabled when creating a repository
   validate :repo_create_validation, :on => :create
 

app/models/student_work.rb

@@ -1,6 +1,6 @@
 #学生提交作品表
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test, :simi_id, :simi_value
 
   belongs_to :homework_common
   belongs_to :user

app/models/student_work_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :results, :status, :src
+  attr_accessible :student_work_id, :results, :status, :src, :uwait_time
   belongs_to :student_work
 
   serialize :results, Array

app/models/user.rb

@@ -179,6 +179,7 @@ class User < Principal
   #####
   has_many :shares ,:dependent => :destroy
 
+  has_one :user_wechat
 
   # add by zjc
   has_one :level, :class_name => 'UserLevels', :dependent => :destroy
@@ -1181,17 +1182,17 @@ class User < Principal
 
   def create_user_ealasticsearch_index
     if self.id != 2 && self.id != 4
-      self.__elasticsearch__.index_document
+      self.__elasticsearch__.index_document if Rails.env.production?
     end
   end
   def update_user_ealasticsearch_index
     if self.id != 2 && self.id != 4
-      self.__elasticsearch__.update_document
+      self.__elasticsearch__.update_document if Rails.env.production?
     end
   end
   def delete_user_ealasticsearch_index
     if self.id != 2 && self.id != 4
-      self.__elasticsearch__.delete_document
+      self.__elasticsearch__.delete_document if Rails.env.production?
     end
   end
 

app/models/user_wechat.rb

@@ -0,0 +1,6 @@
+class UserWechat < ActiveRecord::Base
+  attr_accessible :subscribe, :openid, :nickname, :sex, :language, :city, :province, :country,
+                  :headimgurl, :subscribe_time, :unionid, :remark, :groupid, :user, :user_id
+
+  belongs_to :user
+end

app/services/wechat_service.rb

@@ -0,0 +1,117 @@
+#encoding: utf-8
+class WechatService
+
+  def template_data(openid, template_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+    data = {
+        touser:openid,
+        template_id:template_id,
+        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+        topcolor:"#FF0000",
+        data:{
+            first: {
+                value:first,
+                color:"#173177"
+            },
+            keyword1:{
+                value:key1,
+                color:"#173177"
+            },
+            keyword2:{
+                value:key2,
+                color:"#173177"
+            },
+            keyword3:{
+                value:key3,
+                color:"#173177"
+            },
+            remark:{
+                value:remark,
+                color:"#173177"
+            }
+        }
+    }
+    data
+  end
+
+  def homework_template(user_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = template_data uw.openid,"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI", type, id, first, key1, key2, key3, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[homework] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  end
+
+  def topic_publish_template(user_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = template_data uw.openid,"oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", type, id,first, key1, key2, key3, remark
+      Rails.logger.info "start send template message: #{data}"
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[topic_publish] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  end
+
+  def comment_template(user_id,type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = template_data uw.openid,"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",type, id,first, key1, key2, key3, remark
+      Rails.logger.info "start send template message: #{data}"
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[comment] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  end
+
+  def message_update_template(user_id, type, id, first, key1, key2, remark="具体内容请点击详情查看网站")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = {
+          touser:uw.openid,
+          template_id:"YTyNPZnQD8uZFBFq-Q6cCOWaq5LA9vL6RFlF2JuD5Cg",
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
+          topcolor:"#FF0000",
+          data:{
+              first: {
+                  value:first,
+                  color:"#173177"
+              },
+              keyword1:{
+                  value:key1,
+                  color:"#173177"
+              },
+              keyword2:{
+                  value:key2,
+                  color:"#173177"
+              },
+              remark:{
+                  value:remark,
+                  color:"#173177"
+              }
+          }
+      }
+      Rails.logger.info "start send template message: #{data}"
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[message_update] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+  end
+end

app/views/admin/_course_detail_tr.html.erb

@@ -0,0 +1,32 @@
+  <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>
+  <td class="buttons">
+    <%= link_to( course.is_excellent == 1 || course.excellent_option == 1 ? "取消精品" : "设为精品", { :controller => 'admin', :action => 'set_excellent_course', :id => course.id },:remote=>true, :class => 'icon-del') %>
+  </td>

app/views/admin/_tab_excellent_courses.erb

@@ -0,0 +1,7 @@
+<div class="tabs">
+  <ul>
+    <li><%= link_to '精品课程', {:action => 'excellent_courses'},   class: "#{current_page?(excellent_courses_path)? 'selected' : nil }" %></li>
+    <li><%= link_to '全部课程',  {:action => 'excellent_all_courses'},  class: "#{current_page?(excellent_all_courses_path)? 'selected' : nil }" %></li>
+
+  </ul>
+</div>

app/views/admin/code_work_tests.html.erb

@@ -0,0 +1,99 @@
+<h3>
+  <%=l(:label_code_work_tests)%>
+</h3>
+
+&nbsp;
+
+
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 50px;">
+        <span style="float:left; margin-left:20px;">作业id</span>
+      </th>
+      <th style="width: 50px;">
+        <span style="float:left; margin-left:20px;">作品id</span>
+      </th>
+      <th style="width: 60px;">
+        用户等待时间
+      </th>
+      <th style="width: 50px;">
+        <span style="float:left; margin-left:20px;">语言</span>
+      </th>
+      <th style="width: 100px;">
+        测试完成时间
+      </th>
+      <th style="width: 60px;">
+        <span style="float:left; margin-left:20px;">答题状态</span>
+      </th>
+      <th style="width: 50px;">
+        <span style="float:left; margin-left:20px;">耗时</span>
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @code_work_tests.each do |test| %>
+        <% if test['homework_id'] != nil %>
+            <tr class="<%= cycle("odd", "even") %>">
+              <td style="text-align: center; " title='<%=test['homework_id']%>'>
+                <% if test['link_hwork'] %>
+                    <%=link_to(test['homework_id'], student_work_index_path(:homework => test['homework_id']))%>
+                <% else %>
+                    <%= test['homework_id'] %>
+                <% end %>
+              </td>
+              <td style="text-align: center; " title='<%=test['student_work_id']%>'>
+                <% if test['link_swork'] && test['link_hwork'] %>
+                    <% if !test['is_test'] %>
+                        <%=link_to(test['student_work_id'], student_work_index_path(:homework => test['homework_id'],:student_work_id=>test['student_work_id']))%>
+                    <% else %>
+                        <%=link_to(test['student_work_id'], new_user_commit_homework_users_path(homework_id: test['homework_id'], is_test: true))%>
+                    <% end %>
+                <% else %>
+                     <%= test['student_work_id'] %>
+                <% end %>
+              </td>
+              <td style="text-align: center;">
+                    <% if test.wait_time != 0 %>
+                        <%=test.wait_time.to_s+"毫秒" %>
+                    <% else %>
+                        <%="未记录"%>
+                    <% end %>
+              </td>
+              <td align="center">
+                <%=%W(C C++ Python Java).at(test['language'].to_i - 1)%>
+              </td>
+              <td align="center">
+                <%=Time.parse(test.created_at.to_s).strftime("%Y-%m-%d %H:%M:%S")%>
+              </td>
+              <td align="center">
+                <% if test.status == 0 %>
+                    <%= "答题正确" %>
+                <% elsif test.status == -2 %>
+                    <%= "编译错误" %>
+                <% elsif test.status == 2 %>
+                    <%= "代码超时" %>
+                <% elsif test.status == -3 %>
+                    <%= "请求超时" %>
+                <% else %>
+                    <%= "答题错误" %>
+                <% end %>
+              </td>
+              <td class="center">
+                <% if test.time_used > 0 %>
+                    <%=test.time_used.to_s+"毫秒"%>
+                <% end %>
+              </td>
+            </tr>
+        <% end %>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_code_work_tests)) -%>

app/views/admin/courses.html.erb

@@ -13,9 +13,7 @@
       </label>
       <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %>
       <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-      <a class="icon icon-reload" onclick="$('#name').val('')" style="cursor: pointer;text-decoration: none;">
-        <%= l(:button_clear)%>
-      </a>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'courses'},:remote => true, :class => 'icon icon-reload' %>
     </fieldset>
 <% end %>
 &nbsp;

app/views/admin/excellent_all_courses.html.erb

@@ -0,0 +1,71 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
+<h3>
+  精品课程列表
+</h3>
+<%= render 'tab_excellent_courses' %>
+
+<h3>
+  全部课程列表
+</h3>
+
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <label for='name'>
+        课程:
+      </label>
+      <%= text_field_tag 'name', params[:name], :size => 30, :placeholder => '课程名称' %>
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'excellent_all_courses'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+
+<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: 50px;">
+        帖子数
+      </th>
+      <th style="width: 50px;" class = "<%= @order == 'desc' ? 'st_up' : (@order == 'asc' ? 'st_down' : '') %>">
+        <%=link_to '动态数', excellent_all_courses_path(:order=> @order == "desc" ? 'asc' : 'desc') %>
+      </th>
+      <th style="width: 40px;">
+      </tr>
+    </tr>
+    </thead>
+    <tbody>
+    <% @courses.each do |course| %>
+        <tr class="<%= cycle("odd", "even") %>" id="tr_<%= course.id %>">
+            <%= render :partial => 'course_detail_tr', :locals => {:course => course} %>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>
+
+<% html_title(l(:label_excellent_courses_list)) -%>

app/views/admin/excellent_courses.html.erb

@@ -1,3 +1,9 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
+<h3>
+  <%=l(:label_excellent_courses_list)%>
+</h3>
+<%= render 'tab_excellent_courses' %>
+
 <h3>
   <%=l(:label_excellent_courses_list)%>
 </h3>

app/views/admin/homework.html.erb

@@ -22,24 +22,27 @@
         提交作品数
       </th>
       <th style="width: 70px;">
-        提交截止日期
+        作业发布日期
       </th>
     </tr>
     </thead>
     <tbody>
       <%@count=@page*30 %>
       <% for homework in @homework do %>
+          <% unless homework.nil? %>
           <% @count+=1 %>
           <tr>
             <td align="center">
               <%=@count %>
             </td>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
-              <%=link_to(homework.name, student_work_index_path(:homework => homework.id))%>
+              <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
+            <% if homework.course %>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
               <%= link_to(homework.course.name, course_path(homework.course.id)) %>
             </td>
+            <% end %>
             <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
               <% if homework.try(:user).try(:realname) == ' '%>
                   <%= link_to(homework.try(:user), user_path(homework.user_id)) %>
@@ -51,10 +54,11 @@
               <%=link_to(StudentWork.where('homework_common_id=?',homework.id).count, student_work_index_path(:homework => homework.id))%>
             </td>
             <td align="center">
-              <%=format_date(homework.end_time) %>
+              <%=format_date( homework.created_at ) %>
             </td>
           </tr>
           <% end %>
+      <% end %>
     </tbody>
   </table>
 </div>

app/views/admin/organization.html.erb

@@ -24,7 +24,8 @@
         <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align:center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=org.name%>'>
             <span>
-              <%= link_to org.name,home_path(:organization => org.id) %>
+              <%#= link_to org.name,home_path(:organization => org.id) %>
+              <%= link_to org.name, organization_path(org) %>
             </span>
           </td>
           <td align="center">

app/views/admin/set_excellent_course.js.erb

@@ -0,0 +1 @@
+$("#tr_<%=@course.id %>").html("<%=escape_javascript(render :partial => 'course_detail_tr', :locals => {:course => @course}) %>");

app/views/courses/_compare_code_tips_1.html.erb

@@ -0,0 +1,100 @@
+<div class="blue-border-box">
+  <div class="box-con">
+    <h4 id = "compare-tips-1"></h4>
+    <div class="box-con-a">
+      <a href="javascript:void(0);" class="Blue-btn fl " onclick = "compare_code_btn(<%=homework.id%>,<%=courseid%>)">重新查重</a>
+      <a href="javascript:void(0);" class="Blue-btn fl " onclick = "see_last_compare_code(<%=courseid%>,<%=homework.id%>)">查看结果</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+</div>
+
+<script type="text/javascript">
+    //请求重新查重
+    function compare_code_btn(homeworkid,courseid)
+    {
+        hideModal($(".blue-border-box"));
+        test_repeat(homeworkid,courseid);
+
+    }
+    //查看结果
+    function see_last_compare_code(courseid,homeworkid)
+    {
+        hideModal($(".blue-border-box"));
+        var rootpath = getRootPath();
+        var code_repeatpath = rootpath+"/courses/"+courseid+"/code_repeat?homework="+homeworkid;
+        //新打开页面
+        window.open(code_repeatpath);
+    }
+
+    var test_repeat = function(homeworkid,courseid){
+        $.post(
+                '/student_work/code_repeattest',
+                {homework: homeworkid},
+                function(data,status){
+                    console.log("result = ");
+                    console.log(data);
+
+                    if (data.status == 0) {
+                        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成，是否立即查看结果？",:status=>1, :homework=> homework,:courseid=> courseid})%>');
+                        showModal('ajax-modal', '580px');
+                        $('#ajax-modal').siblings().remove();
+                        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                        //$('#ajax-modal').parent().css("top","40%").css("left","50%");
+                        $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed");
+                        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+                        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+
+                        function closeModal(){
+                            hideModal($(".blue-border-box"));
+                        }
+                    }
+                    else if (data.status == -1){
+//                          confirm("对不起只支持java/c/c++的代码查重!");
+                        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> homework,:courseid=> courseid})%>');
+                        showModal('ajax-modal', '580px');
+                        $('#ajax-modal').siblings().remove();
+                        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                        $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed");
+                        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+                        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+
+                        function closeModal(){
+                            hideModal($(".blue-border-box"));
+                        }
+
+                    }
+                    else if (data.status == -2){
+//                          confirm("对不起该作业的作品过少不能查重!");
+                        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> homework,:courseid=> courseid})%>');
+                        showModal('ajax-modal', '580px');
+                        $('#ajax-modal').siblings().remove();
+                        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                        $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed");
+                        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+                        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+
+                        function closeModal(){
+                            hideModal($(".blue-border-box"));
+                        }
+                    }
+                    return;
+                }
+        ).fail(function(xhr, status){
+//                    confirm("对不起,服务器繁忙请稍后再试!");
+                    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> homework,:courseid=> courseid})%>');
+                    showModal('ajax-modal', '580px');
+                    $('#ajax-modal').siblings().remove();
+                    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                    $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed");
+                    $('#ajax-modal').parent().addClass("resourceUploadPopup");
+                    $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+
+                    function closeModal(){
+                        hideModal($(".blue-border-box"));
+                    }
+                    return;
+                });
+    };
+</script>

app/views/courses/_compare_code_tips_2.html.erb

@@ -0,0 +1,22 @@
+<div class="blue-border-box">
+  <div class="box-con">
+    <h4><%=des%></h4>
+    <div class="box-con-a">
+      <a href="javascript:void(0);" class="Blue-btn  " style="width:67px; margin:25px auto 0px auto;" onclick = "yes_btn(<%=status%>,<%=courseid%>,<%=homework.id%>)">确定</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>
+</div>
+
+<script type="text/javascript">
+    function yes_btn(status,courseid,homeworkid)
+    {
+        hideModal($(".blue-border-box"));
+        if(status == 1) {
+            var rootpath = getRootPath();
+            var code_repeatpath = rootpath+"/courses/"+courseid+"/code_repeat?homework="+homeworkid;
+            window.open(code_repeatpath);
+        }
+    }
+</script>

app/views/courses/_show_compare_code.html.erb

@@ -0,0 +1,21 @@
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c"  %>
+    <%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
+    <%= stylesheet_link_tag "/assets/codemirror/merge" %>
+    <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"%>
+    <%= javascript_include_tag "/assets/codemirror/merge" %>
+<% end %>
+
+<article>
+  <h3 style="float:left; width:47%; text-align:center;"><%=src_name%></h3>
+  <% if @simi_value.to_i >= 90  %>
+      <h6 style="color:red;float:left; width:6%; text-align:center;">相似度<%=@simi_value.to_i%>%</h3>
+  <% else %>
+      <h6 style="float:left; width:6%; text-align:center;">相似度<%=@simi_value.to_i%>%</h3>
+  <% end %>
+  <h3 style="float:left; width:47%; text-align:center;"><%=dst_name%></h3><div class="cl"></div>
+  <pre id = "program-src_1" style = "display: none" ><%= src_code if src_code%></pre>
+  <pre id = "program-src_2" style = "display: none" ><%= dst_code if dst_code%></pre>
+  <div class = "program-compare-code" id=program-compare-code></div>
+</article>

app/views/courses/_show_member_score.html.erb

@@ -24,11 +24,11 @@
               </span>
               <span class="c_red w70">
                 <% final_score = @member_score.homework_common_score(homework_common).first%>
-                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score) %>
+                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score < 0 ? 0 : final_score.final_score) %>
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= format("%0.2f",(@member_score.student_work_score_sum).first.score)  %></span></li>
     </ul>
 
   </div>

app/views/courses/addgroups.js.erb

@@ -1 +1,2 @@
 $("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");

app/views/courses/code_repeat.html.erb

@@ -0,0 +1,81 @@
+<div class="conbox">
+  <h2 class="conbox-h2">查重结果</h2>
+  <div class="chabox">
+    <ul class="chabox-header">
+      <li class="chabox-w-500" style = "width:437px" >被查作品</li>
+      <li class="chabox-w-500" style = "width:561px" >疑被抄袭作品</li>
+      <div class="cl"></div>
+    </ul>
+    <ul class="chabox-top">
+      <li  class="chabox-w-40 " >序号</li>
+      <li class="chabox-w-401" >作品名称</li>
+      <li>姓名</li>
+      <li>学号 </li>
+      <li class="chabox-r-line">时间 </li>
+      <li class="chabox-w-401">作品名称</li>
+      <li>姓名</li>
+      <li>学号 </li>
+      <li class="chabox-r-line">时间 </li>
+      <li >相似度 </li>
+      <li >对比 </li>
+    </ul>
+
+    <%if @homework.homework_type == 2 %>
+        <% @student_works.each_with_index do |student_work,index|%>
+        <ul class="chabox-con" id = "chabox-con-<%=student_work.id%>" >
+          <li  class="chabox-w-40 chabox-txt-left"  ><%=index+1%></li>
+          <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+          <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=student_work_name%></li>
+          <li><%=student_work.user.show_name%></li>
+          <li><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> </li>
+          <li class="chabox-r-line"><%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%></li>
+          <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %>
+              <% simi_student_work = @works_hash[student_work.simi_id.to_i] %>
+              <% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%>
+              <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=simi_student_work_name%></li>
+              <li><%=simi_student_work.user.show_name%></li>
+              <li><%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%></li>
+              <li class="chabox-r-line"><%= Time.parse(format_time(simi_student_work.created_at)).strftime("%m-%d %H:%M")%></li>
+              <% if student_work.simi_value.to_i >= 90  %>
+                  <li style = "color:red" ><%=student_work.simi_value.to_i%>%</li>
+              <% else %>
+                  <li ><%=student_work.simi_value.to_i%>%</li>
+              <% end %>
+
+              <!--@works_hash[student_work.id].description -->
+              <!--<li ><a href="javascript:void(0);"  target="_blank" class="cha-btn" onclick = "show_code_compare()">查看</a>-->
+              <li >
+                <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id.to_i),:class => "cha-btn",:remote => true ) %>
+              </li>
+          <%else%>
+              <li class="chabox-w-401">--</li>
+              <li>--</li>
+              <li>--</li>
+              <li class="chabox-r-line">--</li>
+              <li >--</li>
+              <li >  </li>
+          <% end %>
+        </ul>
+        <%end%>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+</div>
+
+<script type="text/javascript">
+    function show_code_compare() {
+
+//        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/show_compare_code' ,:locals => {:src_code=> 1,:src_name=> 2,:dst_name=> 3, :dst_code=> 4,:language=> 5,})%>');
+//        showModal('ajax-modal', '950px');
+//        $('#ajax-modal').siblings().remove();
+//        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 935px;' class='resourceClose'></a>");
+//        $('#ajax-modal').parent().css("top", "20%").css("left", "26.5%").css("position", "absolute");
+//        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+//        $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px");
+//
+//        function closeModal() {
+//            hideModal($(".contrast-box"));
+//        }
+    }
+
+</script>

app/views/courses/show_comparecode.js.erb

@@ -0,0 +1,101 @@
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/show_compare_code' ,:locals => {:src_code=> @src_code,:src_name=> @src_username,:dst_name=> @dst_username, :dst_code=> @dst_code, :simivalue=> @simi_value })%>');
+showModal('ajax-modal', '1250px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 1235px; margin-top:-18px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","30%").css("left","20%").css("padding-top","20px").css("position","fixed");
+//$('#ajax-modal').parent().addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+
+function closeModal(){
+    hideModal($(".program-compare-code"));
+}
+
+var program_name = "text/x-csrc";
+var language = <%= @homework.language.to_i %>;
+if (language == 1) {
+    program_name = 'text/x-csrc';
+} else if(language==2){
+    program_name = 'text/x-c++src';
+}else if(language==3){
+    program_name = 'text/x-cython';
+} else if(language==4){
+    program_name = 'text/x-java';
+}
+//
+//var editor_1 = CodeMirror(document.getElementById("program-code_1"), {
+//            mode: {name: program_name,
+//                version: 2,
+//                singleLineStringErrors: false},
+//            lineNumbers: true,
+//            indentUnit: 2,
+//            matchBrackets: true,
+//            readOnly: true,
+//            value: $("#program-src_1").text()
+//        }
+//);
+//
+//var editor_2 = CodeMirror(document.getElementById("program-code_2"), {
+//            mode: {name: program_name,
+//                version: 2,
+//                singleLineStringErrors: false},
+//            lineNumbers: true,
+//            indentUnit: 2,
+//            matchBrackets: true,
+//            readOnly: true,
+//            value: $("#program-src_2").text()
+//        }
+//);
+
+var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
+function initUI() {
+    if (value == null) return;
+    var target = document.getElementById("program-compare-code");
+    target.innerHTML = "";
+    dv = CodeMirror.MergeView(target, {
+        value: value,
+        origLeft: panes == 3 ? orig1 : null,
+        orig: orig2,
+        lineNumbers: true,
+        mode: program_name,
+        highlightDifferences: highlight,
+        connect: connect,
+        collapseIdentical: collapse
+    });
+}
+
+function toggleDifferences() {
+    dv.setShowDifferences(highlight = !highlight);
+}
+
+
+value = $("#program-src_1").text();
+orig1 = $("#program-src_1").text();
+orig2 = $("#program-src_2").text();
+initUI();
+
+
+function mergeViewHeight(mergeView) {
+    function editorHeight(editor) {
+        if (!editor) return 0;
+        return editor.getScrollInfo().height;
+    }
+    return Math.max(editorHeight(mergeView.leftOriginal()),
+            editorHeight(mergeView.editor()),
+            editorHeight(mergeView.rightOriginal()));
+}
+
+function resize(mergeView) {
+    var height = mergeViewHeight(mergeView);
+    for(;;) {
+        if (mergeView.leftOriginal())
+            mergeView.leftOriginal().setSize(null, height);
+        mergeView.editor().setSize(null, height);
+        if (mergeView.rightOriginal())
+            mergeView.rightOriginal().setSize(null, height);
+
+        var newHeight = mergeViewHeight(mergeView);
+        if (newHeight >= height) break;
+        else height = newHeight;
+    }
+    mergeView.wrap.style.height = height + "px";
+}

app/views/courses/updategroupname.js.erb

@@ -2,3 +2,4 @@
  * Created by Administrator on 2014/12/3.
  */
 $("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");

app/views/files/_org_subfield_list.html.erb

@@ -43,8 +43,8 @@
             </div>
             <div class="homepagePostSetting">
               <ul>
-                <li class="homepagePostSettingIcon">
                 <% if User.current.logged? %>
+                <li class="homepagePostSettingIcon">
                      <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
                         <ul class="homepagePostSettiongText">
                           <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
@@ -66,8 +66,8 @@
                             <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                           </ul>
                       <% end %>
-                  <% end %>
                 </li>
+                <% end %>
               </ul>
 
             </div>

app/views/files/_org_upload_attachment_list.html.erb

@@ -0,0 +1,32 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+ <button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse_org) %></button>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "_file#{container.id}",
+                     :class => ie8? ? '':'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}','"+"submit_resource"+"');",
+                     :style => ie8? ? '': 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
+                             :containerid => "#{container.id}"
+                     } %>
+</span>
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+
+<span id="upload_file_count<%=container.id %>">
+     建议上传高度不超过52px的图片
+</span>
+<div class="cl"></div>
+<div>
+     <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+</div>

app/views/files/_org_upload_attachment_list_banner.html.erb

@@ -0,0 +1,32 @@
+<span class="add_attachment" data-containerid="<%= container.id %>">
+ <button name="button" class="sub_btn" onclick="_file<%=container.id %>.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse_org) %></button>
+  <%= file_field_tag 'attachments[dummy][file]',
+                     :id => "_file#{container.id}",
+                     :class => ie8? ? '':'file_selector',
+                     :multiple => true,
+                     :onchange => "addInputFiles_board(this, '#{container.id}','"+"submit_resource"+"');",
+                     :style => ie8? ? '': 'display:none',
+                     :data => {
+                             :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                             :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                             :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                             :upload_path => uploads_path(:format => 'js'),
+                             :description_placeholder => l(:label_optional_description),
+                             :field_is_public => l(:field_is_public),
+                             :are_you_sure => l(:text_are_you_sure),
+                             :file_count => l(:label_file_count),
+                             :delete_all_files => l(:text_are_you_sure_all),
+                             :lebel_file_uploding => l(:lebel_file_uploding),
+                             :containerid => "#{container.id}"
+                     } %>
+</span>
+<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
+
+<span id="upload_file_count<%=container.id %>">
+      建议上传 长度:1920px 高度:313px 的图片
+</span>
+<div class="cl"></div>
+<div>
+     <span id="attachments_fields<%= container.id %>" data-containerid="<%= container.id %>" xmlns="http://www.w3.org/1999/html">
+</span>
+</div>

app/views/files/_upload_org_new_files.html.erb

@@ -0,0 +1,25 @@
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center">更换Logo</h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+      <%= form_tag(organization_files_path(org, :in_org => params[:in_org], :logo => true), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
+          <%= render :partial => 'files/org_upload_attachment_list', :locals => {:container => org}%>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_org_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_org_resource').parent().submit();
+    }
+</script>

app/views/files/_upload_org_new_files_banner.html.erb

@@ -0,0 +1,25 @@
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center">更换背景图片</h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+      <%= form_tag(organization_files_path(org, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
+          <%= render :partial => 'files/org_upload_attachment_list_banner', :locals => {:container => org}%>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_org_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_org_resource').parent().submit();
+    }
+</script>

app/views/files/create.js.erb

@@ -1,71 +1,75 @@
 <% if @addTag%>
-  <% if @obj_flag == '3'%>
-    $('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+<% if @obj_flag == '3'%>
+$('#tags_show_issue').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
-    //$('#put-tag-form-issue').hide();
-    $('#name-issue').val("");
-    <% elsif @obj_flag == '6'%>
-    $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-    $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name',
+//$('#put-tag-form-issue').hide();
+$('#name-issue').val("");
+<% elsif @obj_flag == '6'%>
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
-    $("#put-tag-form- <%=@obj.class%>- <%=@obj.id%>").hide();
-    $("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val("");
-  <% else %>
-    $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
+$("#put-tag-form- <%=@obj.class%>- <%=@obj.id%>").hide();
+$("#put-tag-form-<%=@obj.class%>-<%=@obj.id%> #name").val("");
+<% else %>
+$('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
-    $('#tags_show').html('<%=render_attachments_tag_save(@project, nil)%>');
-    $('#put-tag-form #name').val("");
-    //$('#put-tag-form').hide();
-  <% end %>
+$('#tags_show').html('<%=render_attachments_tag_save(@project, nil)%>');
+$('#put-tag-form #name').val("");
+//$('#put-tag-form').hide();
+<% end %>
 <% else %>
 $("#attachments_fields").children().remove();
 $("#upload_file_count").text("未上传文件");
 $('#upload_file_div').slideToggle('slow');
-  <% if @project %>
-    hideModal();
-    <% if @in_project_toolbar %>
-        window.location.href = '<%= project_files_path(@project) %>'
-    <% else %>
+<% if @project %>
+hideModal();
+<% if @in_project_toolbar %>
+window.location.href = '<%= project_files_path(@project) %>'
+<% else %>
 
-        $("#resource_list").html('<%= j(render partial:"project_file", locals: {project: @project}) %>');
-        $("#project_files_count_info").html("<%= @all_attachments.count %>");
-        $("#project_files_count_nav").html("(<%= @all_attachments.count %>)")
-    //    添加文件上传成功提示
-        <% unless params[:attachments].nil? %>
-            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-            $("#course_list").prepend(div);
-            setTimeout( function(){div.remove();},3000)
-        <% end %>
-    <% end %>
-  <%elsif @course%>
-    hideModal();
-    <%if @in_course_toolbar %>
-        window.location.href='<%= course_files_path(@course)%>'
-    <%else%>
-        $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
-        $("#courses_files_count_info").html("<%= @all_attachments.count%>");
-        $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
-        //    添加文件上传成功提示,
-        <% unless params[:attachments].nil? %>
-            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
-            $("#course_list").prepend(div);
-            setTimeout( function(){div.remove();},3000)
-        <% end %>
-    <%end%>
-    <% elsif @org_subfield %>
-       <% if params[:in_org] %>
-            window.location.href = '<%= org_subfield_files_path @org_subfield %>';
-       <%else %>
-            hideModal();
-            $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
-            //    添加文件上传成功提示,
-            <% unless params[:attachments].nil? %>
+$("#resource_list").html('<%= j(render partial:"project_file", locals: {project: @project}) %>');
+$("#project_files_count_info").html("<%= @all_attachments.count %>");
+$("#project_files_count_nav").html("(<%= @all_attachments.count %>)")
+//    添加文件上传成功提示
+<% unless params[:attachments].nil? %>
+var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+$("#course_list").prepend(div);
+setTimeout( function(){div.remove();},3000)
+<% end %>
+<% end %>
+<%elsif @course%>
+hideModal();
+<%if @in_course_toolbar %>
+window.location.href='<%= course_files_path(@course)%>'
+<%else%>
+$("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
+$("#courses_files_count_info").html("<%= @all_attachments.count%>");
+$("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
+//    添加文件上传成功提示,
+<% unless params[:attachments].nil? %>
+var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+$("#course_list").prepend(div);
+setTimeout( function(){div.remove();},3000)
+<% end %>
+<%end%>
+<% elsif @org_subfield %>
+<% if params[:in_org] %>
+window.location.href = '<%= org_subfield_files_path @org_subfield %>';
+<%else %>
+hideModal();
+$("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+//    添加文件上传成功提示,
+<% unless params[:attachments].nil? %>
 //                var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
 //                $("#org_subfield_list").prepend(div);
 //                setTimeout( function(){div.remove();},3000);
-            <% end %>
-       <% end %>
-  <% end %>
+<% end %>
+<% end %>
+<% elsif @organization %>  //组织单独处理
+hideModal();
+window.location.href = '<%= organization_path @organization %>';
+
+<% end %>
 <% end %>
 $(document).ready(img_thumbnails);
 

app/views/homework_common/index.html.erb

@@ -39,7 +39,21 @@
 
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner mb10">
-    <div class="NewsBannerName">作业</div>
+    <!--<div class="NewsBannerName">作业</div>-->
+    <div id="menu_r" class="NewsBannerName" style="margin-bottom: -10px;">
+      <ul class="menu_r b_w" style="padding-left: 0px; margin-top: -5px;">
+        <li>
+          <a href="javascript:void(0);" class="menu_arrow" style="font-size:16px; color:#4b4b4b; font-weight: normal; padding-left: 0px;">作业</a>
+          <ul style="max-height:240px; overflow-y:auto; overflow-x:hidden;">
+            <% @homework_commons.each_with_index do |homework_common,index |%>
+                <li class="pr10">
+                  <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id),:target=>"_blank"%>
+                </li>
+            <% end%>
+          </ul>
+        </li>
+      </ul>
+    </div>
     <div id="search_div" class="fr mr10">
       <%= render :partial =>  'homework_search_form',:locals => {:course=>@course} %>
     </div>

app/views/layouts/_project_info.html.erb

@@ -1,6 +1,7 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% teacher_num = TeacherAndAssistantCount(@course) %>
 <% student_num = studentCount(@course) %>
+<% course_file_num = visable_attachemnts_incourse(@course).count %>
 <div class="pr_info_logo fl mr10 mb5">
   <% if is_excellent_course(@course) %>
     <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />

app/views/layouts/base_courses.html.erb

@@ -55,8 +55,7 @@
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
-        <% course_file_num = visable_attachemnts_incourse(@course).count %>
-        <%=render :partial=>'layouts/project_info', :locals => {:course_file_num => course_file_num} %>
+        <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
       <div class="info_box">
         <ul>
@@ -69,6 +68,10 @@
         </ul>
       </div>
 
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @course %>
+      <%# over %>
+
       <div class="subNavBox">
         <% unless show_nav?(@course.course_activities.count) %>
         <div class="subNav">

app/views/layouts/base_org.html.erb

@@ -113,6 +113,9 @@
         <!--<span class="img_private"><%#= l(:label_private)%></span>-->
         <!--<%# end %>-->
         <!--</div>-->
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @organization %>
+        <%# over %>
 
         <div class="cl"></div>
         <div class="f12 fontGrey3">

app/views/layouts/base_org_newstyle.html.erb

@@ -0,0 +1,433 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <title><%= h html_title %></title>
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
+  <%= stylesheet_link_tag  'org_new_style','jquery/jquery-ui-1.9.2' %>
+  <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+  <%= javascript_include_tag 'attachments' %>
+  <%#= call_hook :view_layouts_base_html_head %>
+  <!-- page specific tags -->
+  <%#= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+  </script>
+  <script>
+      jQuery(document).ready(function($){
+          // browser window scroll (in pixels) after which the "back to top" link is shown
+          var offset = 300,
+          //browser window scroll (in pixels) after which the "back to top" link opacity is reduced
+                  offset_opacity = 1200,
+          //duration of the top scrolling animation (in ms)
+                  scroll_top_duration = 700,
+          //grab the "back to top" link
+                  $back_to_top = $('.cd-top');
+
+          //hide or show the "back to top" link
+          $(window).scroll(function(){
+              ( $(this).scrollTop() > offset ) ? $back_to_top.addClass('cd-is-visible') : $back_to_top.removeClass('cd-is-visible cd-fade-out');
+              if( $(this).scrollTop() > offset_opacity ) {
+                  $back_to_top.addClass('cd-fade-out');
+              }
+          });
+
+          //smooth scroll to top
+          $back_to_top.on('click', function(event){
+              event.preventDefault();
+              $('body,html').animate({
+                          scrollTop: 0 ,
+                      }, scroll_top_duration
+              );
+          });
+
+      });
+  </script>
+
+</head>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
+<body onload="prettyPrint();">
+<div class="cl"></div>
+<div class="container">
+  <div class="header">
+    <div class="header-con">
+      <% if User.current.admin_of_org?(@organization) %>
+          <div class="logo fl">
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+          </div>
+       <% else %>
+          <div class="logo fl">
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+          </div>
+       <% end %>
+      <%= render :partial => 'organizations/org_logined_header' %>
+    </div>
+    <div class="cl"></div>
+  </div><!--header end-->
+
+  <div class="nav-box">
+    <div class="nav-con">
+      <div class="nav fl">
+        <% @subfield_content.each do |field| %>
+            <% if is_default_field?(field) %>
+                <% case field.name %>
+        <% when 'activity' %>
+                    <%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
+                <% when 'course' %>
+                    <a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
+                <% when 'project' %>
+                    <a href="#project_<%= field.id %>" class="fl">项目动态</a>
+                <% end %>
+            <% else %>
+                <% if field.field_type == "Post" && field.hide == 0 %>
+                    <a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
+                <% elsif field.field_type == "Resource" && field.hide == 0 %>
+                    <a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
+                <% end %>
+            <% end %>
+        <% end %>
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="<%= setting_organization_path(@organization) %>" class="fl">配置</a>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+  <!--nav end-->
+
+  <div class="banner">
+    <div class="banner-inner">
+      <% if User.current.admin_of_org?(@organization) %>
+          <% if @org_banner_attchment.blank? %>
+              <img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
+          <% end %>
+          <a href="#" class="banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
+          <div class="banner-txt">
+            <p ><%= @organization.name  %></p>
+          </div>
+      <% else %>
+          <% if @org_banner_attchment.blank? %>
+              <img class="banner-img" src="/images/org_new_style/banner.jpg" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
+          <% end %>
+          <div class="banner-txt">
+            <p ><%= @organization.name  %></p>
+          </div>
+      <% end %>
+    </div>
+  </div>
+
+  <!--模块-->
+  <% @subfield_content.each do |field| %>
+      <% if is_default_field?(field) %>
+          <% case field.name %>
+          <% when 'course' %>
+              <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;">
+               <% if field.status == 0 %>
+                    <div class="content ">
+                      <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
+                      <% if @course_acts.blank? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% else %>
+                          <div class="course-list">
+                            <ul class="clearfix">
+                              <% unless @course_acts.nil? %>
+                                  <%= render :partial => 'organizations/org_new_course_pic', :locals => {:activities => @course_acts.first(3)} %>
+                              <% end %>
+                              <div class="cl"></div>
+                              <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                              <div class="cl"></div>
+                            </ul>
+                          </div>
+                      <% end %>
+                    </div><!--content end-->
+               <% else %>
+                    <div class="content">
+                      <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
+                      <% if @course_acts.blank? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% else %>
+                          <div class="row">
+                            <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
+                            <!--row-ziyuan end-->
+                          </div>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% end %>
+
+
+                    </div><!--row end-->
+               <% end %>
+              </div><!--box1 end-->
+          <% when 'project' %>
+            <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <% if field.status == 0 %>
+                <div class="content ">
+                  <div class="box-top"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
+                  <% if @project_acts.blank? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% else %>
+                      <div class="course-list">
+                        <ul class="clearfix">
+                          <% unless @project_acts.nil? %>
+                              <%= render :partial => 'organizations/org_new_project_pic', :locals => {:activities => @project_acts.first(3)} %>
+                          <% end %>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                        </ul>
+                      </div>
+                  <% end %>
+
+                </div><!--content end-->
+            <% else %>
+                <div class="content">
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
+                  <% if @project_acts.blank? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% else %>
+                      <div class="row">
+                        <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
+                        <!--row-ziyuan end-->
+                      </div>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% end %>
+
+                </div><!--row end-->
+            <% end %>
+            </div>
+          <% end %>
+      <% else %>
+          <% if field.field_type == "Post" %> <%# 讨论类型 %>
+            <% org_subfield = OrgSubfield.find(field.id) %>
+            <% org_subfield_ids = org_subfield.org_document_comments.map(&:id) << 0 %>
+            <% org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{org_subfield.id})").order('updated_at desc') %>
+            <%# message_ats = get_message_org(@organization.id, field.id) %>
+              <%# ids = field.org_document_comments.map{|o| o.id}.join(",") %>
+              <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+                <% if field.status == 0 %>
+                    <div class="content">
+                      <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                      <% if org_acts.blank? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                                  <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
+
+                          <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
+                      <% else %>
+                          <div class="course-list">
+                            <ul class="clearfix">
+
+                              <% org_acts.first(3).each do |act| %>
+                                  <%= render :partial => 'organizations/org_new_forum_pic', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                              <% end %>
+                              <div class="cl"></div>
+                            </ul>
+                            <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                                <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                                    <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                                <% else %>
+                                    <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                                <% end %>
+                            <% else %>
+                                <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                            <% end %>
+                            <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                            <div class="cl"></div>
+                          </div>
+                      <% end %>
+
+                    </div><!--content end-->
+                <% else %>
+                    <div class="content">
+                      <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                      <% if org_acts.blank? %>
+                          <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                                  <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
+                          <div class="cl"></div>
+                      <% else %>
+                          <div class="row">
+                            <% org_acts.each do |act| %>
+                                <%= render :partial => 'organizations/org_new_forum_list', :locals => {:activity => act, :field => field, :organization => @organization} %>
+                            <% end %>
+                            <!--row-ziyuan end-->
+                          </div>
+                          <div class="cl"></div>
+                          <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
+                              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                                  <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% else %>
+                                  <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                              <% end %>
+                          <% else %>
+                              <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank"  %>
+                          <% end %>
+                          <div class="cl"></div>
+                      <% end %>
+
+                    </div><!--row end-->
+                    <div class="cl"></div>
+                <% end %>
+              </div><!--box1 end-->
+          <% elsif field.field_type == "Resource" %>
+              <% org_attachs = get_attach_org2(field) %>
+              <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
+                <div class="content">
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
+                  <% if org_attachs.blank? %>
+                      <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <% if !field.subfield_subdomain_dir.nil? %>
+                          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                              <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% else %>
+                      <div class="row">
+                        <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
+                        <!--row-ziyuan end-->
+                      </div>
+
+                      <div class="cl"></div>
+                      <% if !field.subfield_subdomain_dir.nil? %>
+                          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", @organization.id).map(&:subname).include?(request.subdomain) %>
+                              <%= link_to "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
+                  <% end %>
+
+                </div><!--row end-->
+                <div class="cl"></div>
+              </div><!--box1 end-->
+              </div>
+          <% end %>
+      <% end %>
+  <% end %>
+
+  <%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+  <%# over %>
+
+  <div class="footer">
+    <div class="footer-con">
+      <ul>
+        <li><a href="<%= about_us_path %>" target="_blank" class="fl">关于我们</a></li>
+        <li><a href="<%= agreement_path %>" target="_blank" class="fl"> 服务协议 </a></li>
+        <li><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="fl">帮助中心</a></li>
+        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="fl"> 贴吧交流</a></li>
+      </ul>
+      <div class="cl"></div>
+      <p>Copyright 2007~2016  All Rights Reserved<br>湘ICP备09019772</p>
+    </div>
+  </div>
+  <!--backtop end-->
+  <main class="cd-container">
+  </main>
+  <a href="#0" class="cd-top">Top</a>
+
+  </div><!--container end-->
+
+  <!--页面底部-->
+  <div class="cl"></div>
+  <div id="ajax-modal" style="display:none;"></div>
+
+  <div id="ajax-indicator" style="display:none;">
+    <span><%= l(:label_loading) %></span>
+  </div>
+  <%#= call_hook :view_layouts_base_body_bottom %>
+  </body>
+</html>
+

app/views/layouts/base_projects.html.erb

@@ -72,6 +72,9 @@
           <% end %>
         </div>
         <div class="cl"></div>
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @project %>
+        <%# over %>
         <div>
           <% if @project.project_type == 0 %>
             <% unless static_project_score(@project.project_score) == 0 %>

app/views/layouts/base_wechat.html.erb

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <%= csrf_meta_tag %>
+  <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+  <title>绑定用户</title>
+  <link rel="stylesheet" href="/stylesheets/weui/weui.min.css"/>
+  <script src="/javascripts/jquery.min.js"></script>
+  <script src="/javascripts/wechat/alert.js"></script>
+</head>
+
+<%= yield %>
+
+<!--BEGIN dialog2-->
+<div class="weui_dialog_alert" id="dialog2" style="display: none;">
+  <div class="weui_mask"></div>
+  <div class="weui_dialog">
+    <div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
+    <div class="weui_dialog_bd"><span class="weui_dialog_info">弹窗内容，告知当前页面信息等</span></div>
+    <div class="weui_dialog_ft">
+      <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
+    </div>
+  </div>
+</div>
+<!--END dialog2-->
+
+<!--BEGIN dialog1-->
+<div class="weui_dialog_confirm" id="dialog1" style="display: none;">
+  <div class="weui_mask"></div>
+  <div class="weui_dialog">
+    <div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
+    <div class="weui_dialog_bd"><span class="weui_dialog_info">自定义弹窗内容，居左对齐显示，告知需要确认的信息等</span></div>
+    <div class="weui_dialog_ft">
+      <a href="javascript:;" class="weui_btn_dialog default cancel">取消</a>
+      <a href="javascript:;" class="weui_btn_dialog primary confirm">确定</a>
+    </div>
+  </div>
+</div>
+<!--END dialog1-->
+
+
+</body>
+</html>

app/views/layouts/new_base_user.html.erb

@@ -132,6 +132,11 @@
           </div>
         </div>
         <div class="cl"></div>
+
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @user %>
+        <%# over %>
+
         <div>
           <div class="homepageSignature break_word">
             <p id="user_brief_introduction_show">
@@ -204,7 +209,7 @@
               <% end%>
           <% end%>
         </div>
-        <% if @user.courses.visible.count > 0
+        <%# if @user.courses.visible.count > 0
            course_order_ids = "(" +
             CourseActivity.find_by_sql("SELECT  c.course_id, updated_at FROM
 	(SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ")
@@ -216,7 +221,11 @@
 
         end
         %>
-        <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% if @user.courses.visible.count > 0
+          courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)
+        else
+          courses = []
+        end %>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
@@ -229,19 +238,24 @@
               <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%>
           <% end%>
         </div>
-        <% if @user.projects.visible.count > 0
+        <%# if @user.projects.visible.count > 0
            project_order_ids = "(" +
-            ForgeActivity.find_by_sql("SELECT  p.project_id, p.created_at FROM
-	(SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")
+            ForgeActivity.find_by_sql("SELECT  p.project_id, p.updated_at FROM
+	(SELECT fa.project_id, MAX(fa.updated_at) AS updated_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ")
 	GROUP BY fa.project_id) AS p
-	ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"
+	ORDER BY p.updated_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"
          projects = Project.where("projects.id in #{project_order_ids}")
             else
              projects = []
            end
         %>
 
-        <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+        <% if @user.projects.visible.count > 0
+             projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)
+           else
+             projects = []
+           end
+        %>
         <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" id="homepageLeftMenuForge">
           <ul>
             <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>

app/views/org_subfields/update_status.js.erb

@@ -0,0 +1,3 @@
+$("#subfield_show_<%= @subfield.id %>").html("<%= @subfield.name %>");
+$("#sub_field_left_lists").html("");
+$("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");

app/views/organizations/_join_course_menu.html.erb

@@ -24,12 +24,13 @@
 <body>
 <!--<div class="resourceSharePopup">-->
   <div>
-    <div class="relateText fl">请选择关联到组织的课程</div>
+    <div class="relateText">请选择关联到组织的课程</div>
+    <div class="c_red">您的私有课程不能被关联到组织</div>
   </div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %>
       <input type="text" name="courses" placeholder="搜索您已加入的课程的名称" class="searchCourse" />
-      <div id="search_courses_result_list" class="mb8"></div>
+      <div id="search_courses_result_list" class="mb8 maxHeight100" style="overflow:auto;"></div>
       <div class="courseSendSubmit">
         <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>
       </div>

app/views/organizations/_join_project_menu.html.erb

@@ -24,12 +24,13 @@
 <body>
 
   <div>
-    <div class="relateText fl">请选择关联到组织的项目</div>
+    <div class="relateText">请选择关联到组织的项目</div>
+    <div class="c_red">您的私有项目不能被关联到组织</div>
   </div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
         <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
-        <div id="search_projects_result_list" class="mb8 maxHeight100"></div>
+        <div id="search_projects_result_list" class="mb8 maxHeight100" style="overflow:auto;"></div>
         <div class="courseSendSubmit">
           <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
         </div>

app/views/organizations/_org_course_homework.html.erb

@@ -66,11 +66,16 @@
                 </div>
             <% end %>
         <% end %>
-        <div class="homepagePostSubmit">
         <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+        <div class="homepagePostSubmit">
           <%= user_for_homework_common activity,is_teacher %>
         </div>
-
+        <% work = cur_user_works_for_homework activity %>
+        <% if activity.end_time < Date.today && !is_teacher && !work.nil? %>
+            <div class="homepagePostSubmit">
+              <%=link_to "追加附件", student_work_index_url_in_org(activity.id, 1), :class => 'c_blue', :title => "可追加作品修订附件" %>
+            </div>
+        <% end %>
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">
               <%= link_to "模拟答题", Setting.protocol + "://" + Setting.host_name + "/users/new_user_commit_homework?homework_id="+activity.id.to_s + "&is_test=true", class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>