Merge branch 'develop' into yuanke

.access_token

@@ -1 +1 @@
-{"access_token":"oEEf8ZKAB8Y2G0o_xnTPkPJHKKk8iHkLC-f5ptvQ2nCMj9IpC86ivLD2-p38GfOkuG-HuQp3pWZqhs3NJXUMdPLWsr5k67hPZYuqg4ozLccx0xdLswapj0mn8ovZhK1tKIKiAFAOMO","expires_in":7200,"got_token_at":1467012449}
+{"access_token":"b_Pc60Dd5eyg_ut3cHbsjQO9EJJdj2Qj5F99o9LH9ltKSme7_FZ3Of22lWLL-K2V0siWzv-bd9PO0Dn-L1PBvIy9LhXa0qPVaFl6vTtZHR2kA8qjo1ps2ancya0t7KmzURGbAFAAXM","expires_in":7200,"got_token_at":1467976842}

.gitignore

@@ -6,8 +6,7 @@
 /config/database.yml
 /config/configuration.yml
 /config/additional_environment.rb
-/config/menu.yml
-/config/wechat.yml
+
 
 /files/*
 /log/*
@@ -35,3 +34,5 @@ vendor/cache
 1234567
 public/javascripts/wechat/node_modules/
 .ruby-version
+.access_token
+tmux*.log

Gemfile

@@ -5,8 +5,8 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
   if RUBY_PLATFORM =~ /darwin/
     gem "rmagick", "= 2.15.4" ## osx must be this version
-  else
-    gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
+  elsif RUBY_PLATFORM =~ /linux/
+    #gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   end
   gem 'certified'
   gem 'net-ssh', '2.9.1'
@@ -57,7 +57,7 @@ group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   # gem "query_reviewer"
-  # 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

@@ -19,6 +19,7 @@ module Mobile
   require_relative 'apis/new_comment'
   require_relative 'apis/praise'
   require_relative 'apis/resources'
+  require_relative 'apis/syllabuses'
 
   class API < Grape::API
     version 'v1', using: :path
@@ -73,6 +74,7 @@ module Mobile
     mount Apis::NewComment
     mount Apis::Praise
     mount Apis::Resources
+    mount Apis::Syllabuses
 
     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 

app/api/mobile/apis/activities.rb

@@ -10,30 +10,44 @@ module Mobile
         params do
           requires :page, type: Integer
           requires :token, type: String
+          requires :container_type, type: String
         end
         post do
           authenticate!
 
           user = current_user
 
-          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)
+          container_type = params[:container_type] ? params[:container_type] : "All"
+
+          if container_type == "All" || container_type == "Project"
+            shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
+            user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
+            project_types = "('Message','Issue','Project')"
+          end
+
+          if container_type == "All" || container_type == "Course"
+            shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
+            user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+            course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+          end
+
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
-          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','Project')"
           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}").count == 0 ? " " :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')
-
+          if container_type == "Course"
+            activities = UserActivity.where("(container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc')
+          elsif container_type == "Project"
+            activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})").order('updated_at desc')
+          else
+            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
           all_count = activities.count
           activities = activities.limit(10).offset(page * 10)
           count = activities.count
@@ -42,6 +56,7 @@ module Mobile
           present :count, count
           present :page, page
           present :status, 0
+          present :container_type, container_type
         end
       end
     end

app/api/mobile/apis/blog_comments.rb

@@ -7,7 +7,7 @@ module Mobile
 
         desc "get special topic"
         get ':id' do
-          user = UserWechat.find_by_openid(params[:openid]).user
+          user = current_user
           blog = BlogComment.find params[:id]
           present :data, blog, with: Mobile::Entities::BlogComment,user: user
           present :status, 0

app/api/mobile/apis/courses.rb

@@ -107,7 +107,7 @@ module Mobile
           status = cs.join_course({role: "10", openid: params[:openid], invite_code: params[:invite_code]}, current_user)
           {
               status: status[:state],
-              messsge:CoursesService::JoinCourseError.message(status[:state])
+              message:CoursesService::JoinCourseError.message(status[:state])
           }
         end
 
@@ -396,6 +396,23 @@ module Mobile
           present :status,0
         end
 
+        desc '删除课程'
+        params do
+          requires :token, type: String
+        end
+        post ':course_id/del' do
+          authenticate!
+          c = Course.find(params[:course_id])
+          # if c.members.count > 1
+          #   {status: -1, message: '已经有成员加入,不能删除'}
+          # else
+            c.delete!
+            present :status,0
+          # end
+
+
+        end
+
       end
     end
   end

app/api/mobile/apis/resources.rb

@@ -46,9 +46,25 @@ module Mobile
         end
 
 
-      end
+        desc '发送资源'
+        params do
+          requires :token, type: String
+          requires :course_ids, type: Array[Integer]
+          requires :send_id, type: Integer
+        end
+        post 'send' do
+          authenticate!
 
+          rs = ResourcesService.new
+          ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+          if flag
+            present :status, 0
+          else
+            {status: -1, message: save_message.first}
+          end
+        end
 
+      end
 
     end
   end

app/api/mobile/apis/syllabuses.rb

@@ -0,0 +1,103 @@
+#coding=utf-8
+
+module Mobile
+  module Apis
+    class Syllabuses < Grape::API
+
+      resources :syllabuses do
+        desc "获取大纲列表"
+        params do
+          requires :token, type: String
+        end
+        get do
+          authenticate!
+
+          cs = SyllabusesService.new
+          courses = cs.user_syllabus(current_user)
+          present :data, courses, with: Mobile::Entities::Syllabus
+          present :status, 0
+        end
+
+        desc "获取某个大纲"
+        params do
+          requires :token, type: String
+        end
+        get ':id' do
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          sy = ::Syllabus.find(params[:id])
+          sy.courses = sy.courses.not_deleted
+          sy = ss.judge_can_setting(sy,current_user)
+
+          present :data, sy, with: Mobile::Entities::Syllabus
+          present :status, 0
+        end
+
+        desc "获取新建大纲的权限"
+        params do
+          requires :token, type: String
+        end
+        post 'auth' do
+          authenticate!
+
+          auth = 0
+
+          if (current_user.user_extensions && current_user.user_extensions.identity == 0 && current_user.allowed_to?(:add_course, nil, :global => true))
+            auth = 1
+          end
+
+          present :auth, auth
+        end
+
+        desc "新建大纲"
+        params do
+          requires :token, type: String
+          requires :title, type: String, desc: '大纲标题'
+          requires :courses, type: Array[String], desc: '课程名'
+        end
+        post do
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          sy = ss.create(current_user, params[:title],
+                         params[:courses].map{|c| {name: c} })
+
+          if sy.new_record?
+            {status:-1, message: '创建大纲失败' }
+          else
+            present :data, sy, with: Mobile::Entities::Syllabus
+            present :status, 0
+          end
+
+        end
+
+        desc '编辑大纲'
+        params do
+          requires :token, type: String
+          requires :title, type: String, desc: '大纲标题'
+          # requires :add_courses, type: Array[String], desc: '课程名'
+          # requires :modify_courses, type: Array[Integer,String], desc: '课程名'
+        end
+        post ':id/edit' do
+
+          authenticate!
+
+          ss  = SyllabusesService.new
+
+          #修改课程大纲
+          status = ss.edit(current_user, params)
+
+          if status == -1
+            {status:status, message: '修改课程信息失败' }
+          else
+            present :status, status
+          end
+        end
+      end
+
+    end
+  end
+end

app/api/mobile/apis/users.rb

@@ -53,10 +53,20 @@ module Mobile
           requires :password, type: String, desc: 'password'
         end
         post do
+
+          openid = session[:wechat_openid]
+          logger.debug "openid ============== #{openid}"
+          raise "无法获取到openid,请在微信中打开本页面" unless openid
+
+
           us = UsersService.new
           user = us.register params.merge(:password_confirmation => params[:password],
                                           :should_confirmation_password => true)
-          raise "该邮箱已经被注册过了" if user.new_record?
+          raise user.errors.full_messages.first if user.new_record?
+          UserWechat.create!(
+              openid: openid,
+              user: user
+          )
           
           present :data, user, with: Mobile::Entities::User
           present :status, 0

app/api/mobile/entities/course.rb

@@ -15,6 +15,8 @@ module Mobile
             #f.img_url if f.respond_to?(:img_url)
           elsif field == :created_at || field == :updated_at
             (format_time(c[field]) if (c.is_a?(Hash) && c.key?(field))) || (format_time(c.send(field)) if c.respond_to?(field))
+          elsif field == :member_count
+            ::Course===c ? c.members.count : 0
           else
             (c[field] if (c.is_a?(Hash) && c.key?(field))) || (c.send(field) if c.respond_to?(field))
           end
@@ -49,6 +51,8 @@ module Mobile
       course_expose :qrcode
       course_expose :updated_at
       course_expose :course_student_num
+      course_expose :member_count
+      course_expose :can_setting
       expose :teacher, using: Mobile::Entities::User do |c, opt|
         if c.is_a? ::Course
           c.teacher

app/api/mobile/entities/syllabus.rb

@@ -0,0 +1,13 @@
+module Mobile
+  module Entities
+    class Syllabus < Grape::Entity
+      include ApplicationHelper
+
+      expose :title
+      expose :id
+      expose :can_setting
+
+      expose :courses, using: Mobile::Entities::Course
+    end
+  end
+end

app/controllers/admin_controller.rb

@@ -45,9 +45,78 @@ class AdminController < ApplicationController
     render :action => "projects", :layout => false if request.xhr?
   end
 
-  def courses
+  def syllabuses
     @name = params[:name]
-    @courses = Course.like(@name).order('created_at desc')
+    @syllabuses = Syllabus.like(@name).order('created_at desc')
+    @syllabuses = paginateHelper @syllabuses,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #为班级选择课程
+  def select_course_syllabus
+    @flag = false
+    if params[:syllabus_id] && params[:course_id]
+      course = Course.where("id = #{params[:course_id].to_i}").first
+      unless course.nil?
+        course.update_column('syllabus_id', params[:syllabus_id].to_i)
+        @flag = true
+      end
+    end
+    if @flag
+      render :text=> "succ"
+    else
+      render :text=>'fail'
+    end
+  end
+
+  #新建课程
+  def create_syllabus
+    if params[:course_id]
+      course = Course.where("id = #{params[:course_id]}").first
+      if course
+        @user = course.teacher
+        syllabus = Syllabus.new
+        syllabus.update_attributes(:title => params[:title], :eng_name => params[:eng_name], :user_id => @user.id)
+        syllabus.description = Message.where("id = 19412").first.nil? ? nil : Message.where("id = 19412").first.content
+        if syllabus.save
+          course.update_attribute('syllabus_id', syllabus.id)
+          @flag = params[:flag].to_i
+          @course = course
+          respond_to do |format|
+            format.js
+          end
+        end
+      end
+    end
+  end
+
+  def courses
+    @name = params[:name].to_s.strip.downcase
+    if @name && @name != ""
+      @courses = Course.select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
+    else
+      @courses = Course.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 non_syllabus_courses
+    @name = params[:name].to_s.strip.downcase
+    if @name && @name != ""
+      @courses = Course.where("syllabus_id is null and is_delete = 0").select{ |course| (course.teacher[:lastname].to_s.downcase + course.teacher[:firstname].to_s.downcase).include?(@name) || course.name.include?(@name)}
+      @courses = @courses.sort{|x, y| y.created_at <=> x.created_at}
+    else
+      @courses = Course.where("syllabus_id is null and is_delete = 0").order('created_at desc')
+    end
     @courses = paginateHelper @courses,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
@@ -55,6 +124,17 @@ class AdminController < ApplicationController
     end
   end
 
+  #修改班级名称
+  def update_course_name
+    @course = Course.where("id = #{params[:course_id].to_i}").first
+    unless @course.nil?
+      @course.update_column("name", params[:name])
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   #管理员界面精品课程列表
   def excellent_courses
     @courses = Course.where("is_excellent =? or excellent_option =?", 1, 1 )
@@ -72,10 +152,42 @@ class AdminController < ApplicationController
       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) #{params[:sort]}, c.id desc")
       @order = params[:order]
       @sort = params[:sort]
+
     elsif params[:sort] && (params[:order]  == 'time')
-      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]},id desc")
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY time #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'post')
+      courses = Course.find_by_sql("SELECT c.*, count(m.id) count FROM boards b, courses c, messages m WHERE m.board_id = b.id AND b.course_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count #{params[:sort]}, c.id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'res')
+      courses = Course.find_by_sql("SELECT c.*, count(at.container_id) cat FROM attachments at, courses c WHERE at.container_type = 'Course' AND at.container_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY cat #{params[:sort]}, id desc")
       @order = params[:order]
       @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order] == 'works')
+      courses = Course.find_by_sql("SELECT c.*, count(hc.id) chc FROM courses c, homework_commons hc,student_works sw WHERE c.id = hc.course_id AND sw.homework_common_id = hc.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY chc #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'homework')
+      courses = Course.find_by_sql("SELECT c.*, count(sw.id) csw FROM student_works sw, courses c, homework_commons hc WHERE c.id = hc.course_id AND sw.id = c.id  AND c.name like '%#{name}%' GROUP BY c.id ORDER BY csw #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'std')
+      courses = Course.find_by_sql("SELECT c.*, count(sfc.id) sfc FROM courses c, students_for_courses sfc WHERE sfc.course_id = c.id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY sfc #{params[:sort]}, id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
+    elsif params[:sort] && (params[:order]  == 'open')
+      courses = Course.find_by_sql("SELECT * FROM courses WHERE name like '%#{name}%' ORDER BY is_public #{params[:sort]},id desc")
+      @order = params[:order]
+      @sort = params[:sort]
+
     else
       courses = Course.like(name).order('created_at desc')
     end

app/controllers/boards_controller.rb

@@ -125,7 +125,9 @@ class BoardsController < ApplicationController
     if @order.to_i == 2
       @type = 2
       @topics.each do |topic|
-        topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+        all_comments = []
+        count=get_all_children(all_comments, topic).count
+        topic[:infocount] = get_praise_num(topic) + count
         if topic[:infocount] < 0
           topic[:infocount] = 0
         end

app/controllers/courses_controller.rb

@@ -1090,7 +1090,7 @@ class CoursesController < ApplicationController
   #删除课程
   #删除课程只是将课程的is_deleted状态改为false，is_deleted为false状态的课程只有管理员可以看到
   def destroy
-    @course.update_attributes(:is_delete => true)
+    @course.delete!
     @course = nil
     redirect_to user_url(User.current)
   end

app/controllers/exercise_controller.rb

@@ -511,7 +511,7 @@ class ExerciseController < ApplicationController
   def commit_exercise
     # 老师不需要提交
     if User.current.allowed_to?(:as_teacher,@course)
-      if @exercise.publish_time.nil?
+      if @exercise.publish_time.nil? || @exercise.publish_time <= Time.now
         @exercise.update_attributes(:show_result => params[:show_result])
         @exercise.update_attributes(:exercise_status => 2)
         @exercise.update_attributes(:publish_time => Time.now)

app/controllers/homework_common_controller.rb

@@ -27,6 +27,7 @@ class HomeworkCommonController < ApplicationController
       #@homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
       @homework_commons = @course.homework_commons.where("name like '%#{search}%' and publish_time <= '#{Date.today}'").order("created_at desc")
     end
+    #update_homework_time @homework_commons
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
 
@@ -178,7 +179,7 @@ class HomeworkCommonController < ApplicationController
     @statue = 4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
     @statue = 5 and return if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
     if @homework_detail_manual.comment_status == 1
-      student_works = @homework.student_works
+      student_works = @homework.student_works.has_committed
       if student_works && student_works.size >= 2
         if @homework.homework_type == 3
           student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
@@ -232,8 +233,8 @@ class HomeworkCommonController < ApplicationController
     @homework_detail_manual.update_column('comment_status', 3)
     @homework_detail_manual.update_column('evaluation_end', Date.today)
     #计算缺评扣分
-    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
-    @homework.student_works.each do |student_work|
+    work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")"
+    @homework.student_works.has_committed.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
       student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
@@ -263,11 +264,11 @@ class HomeworkCommonController < ApplicationController
     @totle_size = 0
     if @homework_detail_manual.comment_status == 1
       @totle_size = @course.student.count
-      @cur_size = @homework.student_works.size
+      @cur_size = @homework.student_works.has_committed.size
     elsif @homework_detail_manual.comment_status == 2
-      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
+      @homework.student_works.has_committed.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
       @cur_size = 0
-      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
+      @homework.student_works.has_committed.map { |work| @cur_size += work.student_works_scores.select("distinct user_id").where(:reviewer_role => 3).count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     @user_activity_id = params[:user_activity_id].to_i
@@ -409,8 +410,8 @@ class HomeworkCommonController < ApplicationController
   def update_homework_time homeworks
     unless homeworks.nil?
       homeworks.each do |h|
-        if h.homework_type == 3
-          student_works = h.student_work_projects.where("is_leader = 1")
+        if h.homework_type == 3 && h.homework_detail_group.base_on_project == 1
+          student_works = h.student_work_projects.where("is_leader = 1 && project_id != -1")
           time = h.updated_at
           unless student_works.nil?
             student_works.each do |s|
@@ -418,7 +419,7 @@ class HomeworkCommonController < ApplicationController
               unless project.nil? && project.gpid.nil?
                 project_time=project.updated_on
                 project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last
-                if format_time(time) < format_time(project_time)
+                if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S')
                   time = project_time
                 end
                 begin
@@ -428,21 +429,30 @@ class HomeworkCommonController < ApplicationController
                   changesets = g.commits(project.gpid, :ref_name => default_branch)
                   changesets_latest_coimmit = changesets[0]
                   unless changesets[0].blank?
-                    if format_time(time) < format_time(changesets_latest_coimmit.created_at)
+                    if time.strftime('%Y-%m-%d %H:%M:%S') <changesets_latest_coimmit.created_at.strftime('%Y-%m-%d %H:%M:%S')
                       time = changesets_latest_coimmit.created_at
                     end
                   end
                 rescue
-                  logger.error("############## ==> update homework project time")
                 end
               end
             end
           end
-          puts h.updated_at
-          puts time
           s_time = time
-          if format_time(time) > format_time(h.updated_at)
+          if time.strftime('%Y-%m-%d %H:%M:%S') > h.updated_at.strftime('%Y-%m-%d %H:%M:%S')
             h.update_column('updated_at', s_time)
+            course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first
+            if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              course_activity.update_column('updated_at', s_time)
+            end
+            user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first
+            if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              user_activity.update_column('updated_at', s_time)
+            end
+            org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first
+            if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S'))
+              org_activity.update_column('updated_at', s_time)
+            end
           end
         end
       end

app/controllers/messages_controller.rb

@@ -44,7 +44,8 @@ class MessagesController < ApplicationController
       offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
       page = 1 + offset / REPLIES_PER_PAGE
     end
-    @reply_count = @topic.children.count
+    all_comments = []
+    @reply_count = get_all_children(all_comments, @topic).count
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
       messages_replies =  @topic.children.
@@ -137,26 +138,32 @@ class MessagesController < ApplicationController
 
   # Reply to a topic
   def reply
-    if params[:reply][:content] == ""
-      if params[:is_board]
-        if @project
-          (redirect_to project_boards_path(@project), :notice => l(:label_reply_empty);return)
-        elsif @course
-          (redirect_to course_boards_path(@course), :notice => l(:label_reply_empty);return)
-        end
-      else
-        (redirect_to board_message_url(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
-      end
+    if params[:parent_id]
+      parent = Message.find params[:parent_id]
+      @reply = Message.new
+      @reply.author = User.current
+      @reply.board = parent.board
+      @reply.content = params[:content]
+      @reply.subject = "RE: #{parent.subject}"
+      @reply.reply_id = params[:reply_id]
+      # @reply.reply_id = params[:id]
+      parent.children << @reply
+      @topic = params[:activity_id].nil? ? parent : Message.find(params[:activity_id].to_i)
+      @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+      @is_course = params[:is_course] if params[:is_course]
+      @is_board = params[:is_board] if params[:is_board]
+    else
+      @quote = params[:quote][:quote]
+      @reply = Message.new
+      @reply.author = User.current
+      @reply.board = @board
+      @reply.safe_attributes = params[:reply]
+      @reply.content = @quote + @reply.content
+      @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+      @topic.children << @reply
+      # @reply.reply_id = params[:id]
     end
-    @quote = params[:quote][:quote]
-    @reply = Message.new
-    @reply.author = User.current
-    @reply.board = @board
-    @reply.safe_attributes = params[:reply]
-    @reply.content = @quote + @reply.content
-    @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
-    # @reply.reply_id = params[:id]
-    @topic.children << @reply
+
     update_course_activity(@topic.class,@topic.id)
     update_user_activity(@topic.class,@topic.id)
     update_forge_activity(@topic.class,@topic.id)
@@ -182,14 +189,10 @@ class MessagesController < ApplicationController
       respond_to do |format|
         format.js
       end
-    elsif params[:is_board]
-      if @project
-        redirect_to project_boards_path(@project)
-      elsif @course
-        redirect_to course_boards_path(@course)
-      end
+      return
     else
-      redirect_to board_message_url(@board, @topic, :r => @reply)
+      redirect_to board_message_url(@board, @topic)
+      return
     end
 
   end
@@ -251,6 +254,17 @@ class MessagesController < ApplicationController
 
   # Delete a messages
   def destroy
+    if params[:user_activity_id]
+      @message.destroy
+      @topic = Message.find(params[:activity_id].to_i)
+      @user_activity_id = params[:user_activity_id]
+      @is_course = params[:is_course]
+      @is_board = params[:is_board]
+      respond_to do |format|
+        format.js
+      end
+      return
+    end
     if @project
       (render_403; return false) unless @message.destroyable_by?(User.current)
     elsif @course
@@ -299,12 +313,12 @@ class MessagesController < ApplicationController
   end
 
   def quote
-    @subject = @message.subject
-    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
-
-    @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
-    @temp = Message.new
-    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
+    # @subject = @message.subject
+    # @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+    #
+    # @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
+    # @temp = Message.new
+    # @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview

app/controllers/quality_analysis_controller.rb

@@ -26,14 +26,25 @@ class QualityAnalysisController < ApplicationController
       job_name = "#{user_name}-#{rep_id}"
       sonar_name = "#{user_name}:#{rep_id}"
 
+      # 考虑到历史数据：有些用户创建类job但是build失败,即sonar没有结果，这个时候需要把job删除,并且删掉quality_analyses表数据
+      # 如果不要这句则需要迁移数据
+      @sonar_address = Redmine::Configuration['sonar_address']
+      projects_date = open(@sonar_address + "/api/projects/index").read
+      arr = JSON.parse(projects_date).map {|m| m["nm"]}   # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+      quality_an = QualityAnalysis.where(:sonar_name => sonar_name).first
+      if @client.job.exists?(job_name) && QualityAnalysis.where(:sonar_name => sonar_name).select{|qa| arr.include?(qa.sonar_name)}.blank?
+        logger.info("88888888888888888888")
+        aa = @client.job.delete("#{job_name}")
+        quality_an.delete unless quality_an.blank?
+      end
       # Checks if the given job exists in Jenkins.
       unless @client.job.exists?(job_name)
         @g = Gitlab.client
         branch = params[:branch]
         language = swith_language_type(params[:language])
         path = params[:path].blank? ? "./" : params[:path]
-        qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
-        version = qa.nil? ? 1 : qa.sonar_version + 1
+        # qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
+        version = quality_an.nil? ? 1 : quality_an.sonar_version + 1
         properties = "sonar.projectKey=#{sonar_name}
         sonar.projectName=#{sonar_name}
         sonar.projectVersion=#{version}
@@ -60,37 +71,64 @@ class QualityAnalysisController < ApplicationController
 
         # 判断调用sonar分析是否成功
         # 等待启动时间处理, 最长时间为30分钟
-        for i in 0..60 do
-          sleep(60)
+        for i in 0..360 do
+          sleep(5)
           @current_build_status = @client.job.get_current_build_status("#{job_name}")
-          if (@current_build_status != "not_run" || @current_build_status != "running")
+          if (@current_build_status == "success" || @current_build_status == "failure")
             break
-            if i == 60
+            if i == 360
               @build_console_result = false
               break
             end
           end
         end
 
-        @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+        # sonar 缓冲，取数据
+        sleep(5)
+
+        # 获取sonar output结果
+        console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
         logger.info("@current_build_status is ==> #{@current_build_status}")
-        logger.info("@console_build is ==> #{@console_build}")
 
-        d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
-        logger.error("delete result ==> #{code}")
-        if qa.blank? && @current_build_status == "success"
-          QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
-                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
+        # 两种情况需要删除job：
+        # 1/创建成功但是build失败则删除job
+        # 2/creat和build成功，调用sonar启动失败则删除job
+        # 错误信息存储需存到Trustie数据库，否则一旦job删除则无法获取这些信息
+        if jenkins_job == '200' && code != '201'
+          @client.job.delete("#{job_name}")
         else
-          qa.update_attribute(:sonar_version, version)
+          if @current_build_status == "failure"
+            reg_console = /Exception:.*?\r/.match(console_build)
+            output = reg_console[0].gsub("\r", "") unless reg_console.nil?
+            se = SonarError.where(:jenkins_job_name => job_name).first
+            se.nil? ? SonarError.create(:project_id => @project.id, :jenkins_job_name => job_name, :output => output) : se.update_column(:output, output)
+            @client.job.delete("#{job_name}")
+          elsif @current_build_status == "success"
+            if quality_an.blank?
+              QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+                                     :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
+            else
+              qa.update_attribute(:sonar_version, version)
+            end
+          end
         end
       end
     rescue => e
-      puts e
+      @message = e.message
     end
     respond_to do |format|
-      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
-      # format.js{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+      if @current_build_status == "success"
+        format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
+      elsif @current_build_status == "failure"
+        format.html{redirect_to error_list_project_quality_analysi_path(:project_id => @project.id, :job_name => job_name)}
+      end
+    end
+  end
+
+  def error_list
+    @error_list = SonarError.where(:jenkins_job_name => params[:job_name]).first
+    respond_to do |format|
+      format.html
     end
   end
 
@@ -145,7 +183,7 @@ class QualityAnalysisController < ApplicationController
       get_current_build_status = @client.job.get_current_build_status("Hjqreturn-1280")
       logger.error("Failed to update job: ==> #{jenkins_job}") unless jenkins_job == '200'
 
-      # 数据更新到Trustie数据库
+      # 数据更新到Trustie数据
       if jenkins_job == '200'
         logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
         @quality_analysis.path = path
@@ -168,27 +206,31 @@ class QualityAnalysisController < ApplicationController
       @branch = params[:branch]
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
-      @jenkins_address = Redmine::Configuration['jenkins_address']
       if params[:resource_id].nil?
         @name_flag = true
         projects_date = open(@sonar_address + "/api/projects/index").read
         arr = JSON.parse(projects_date).map {|m| m["nm"]} # eg: ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
         @quality_analyses = QualityAnalysis.where(:project_id => @project.id).select{|qa| arr.include?(qa.sonar_name)}
-
       else
-        if params[:current_build_status] == "failure"
-          job_name = params[:job_name]
-          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
-        end
-        complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+        filter = "sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,files,functions,classes,directories,blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations"
+        complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=#{filter}").read
         @complexity =JSON.parse(complexity_date).first
-        issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
-        @sonar_issues = JSON.parse(issue_date).first
+
+        # 按名称转换成hash键值对
+        @ha = {}
+        @complexity["msr"].each do |com|
+          key = com["key"]
+          if key == "sqale_index"
+            value = com["frmt_val"]
+          else
+            value = com["val"].to_i
+          end
+          @ha.store(key,value)
+        end
       end
     rescue => e
       puts e
     end
-
   end
 
   # Find project of id params[:project_id]

app/controllers/repositories_controller.rb

@@ -38,7 +38,9 @@ class RepositoriesController < ApplicationController
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff, :project_archive, :quality_analysis]
   # 链接gitlab
-  before_filter :connect_gitlab, :only => [:quality_analysis]
+  before_filter :connect_gitlab, :only => [:quality_analysis, :show]
+  # 版本库新增权限
+  before_filter :show_rep, :only => [:show]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -361,44 +363,42 @@ update
 
   def show
     ## TODO: the below will move to filter, done.
-    if !User.current.member_of?(@project) && @project.hidden_repo
-      render_403
-      return
-    end
+
+    # 获取版本库目录结构
     @entries = @repository.entries(@path, @rev)
-    @changeset = @repository.find_changeset_by_name(@rev)
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      g = Gitlab.client
-      @changesets = g.commits(@project.gpid, :ref_name => @rev)
-      g_project = g.project(@project.gpid)
+      @changesets = @g.commits(@project.gpid, :ref_name => @rev)
+      # 最近一次提交
+      @changesets_latest_coimmit = @changesets[0]
+      g_project = @g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : commit_count(@project, @rev)
+      @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
+
+      # 获取默认分支
       @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
-      # 访问该页面的是会后则刷新
-      if @project.project_score.nil?
+
+      # 访问版本庫后更新project_score表数据；changeset_num为提交总数
+      project_score = @project.project_score
+      if project_score.nil?
         ProjectScore.create(:project_id => @project.id, :score => false)
+      else
+        project_score.update_column(:changeset_num, @changesets_all_count)
       end
-      # 刷新改页面的时候，更新统计数
-      if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0
-        update_commits_count(@project, @changesets_all_count)
-      end
-      # 最近一次提交
-      @changesets_latest_coimmit = @changesets[0]
-      unless @changesets[0].blank?
-        update_commits_date(@project, @changesets_latest_coimmit)
-      end
-      @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
+
+      # unless @changesets_latest_coimmit.blank?
+      #   update_commits_date(@project, @changesets_latest_coimmit)
+      # end
+      @creator = @project.owner.to_s
       gitlab_address = Redmine::Configuration['gitlab_address']
+
       # REDO:需优化，仅测试用
       @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
+
+      # 获取版本库路径，主要分为两种，一种随Gitlab类型，另一种为Git类型，Git类型为无用数据，最终需要删掉这种类型。
       if @repository.type.to_s == "Repository::Gitlab"
-        @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git"
+        @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @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
@@ -653,9 +653,20 @@ update
 
   # 链接gitlab
   def connect_gitlab
-    @g = Gitlab.client
-    unless @project.gpid.nil?
-      @g_project = @g.project(@project.gpid)
+    begin
+      @g = Gitlab.client
+      unless @project.gpid.nil?
+        @g_project = @g.project(@project.gpid)
+      end
+    rescue => e
+      logger.error("failed to connect gitlab ==> #{e}")
+    end
+  end
+
+  def show_rep
+    if !User.current.member_of?(@project) && @project.hidden_repo
+      render_403
+      return
     end
   end
 

app/controllers/student_work_controller.rb

@@ -110,9 +110,9 @@ class StudentWorkController < ApplicationController
           #status 0:答案正确 -5program_test_ex 函数出错 -4judge代码出错 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
           resultObj[:status] = -3
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
-        rescue
+        rescue => e
           #-4 judge代码 出错
-          logger.debug "program_test_error 1"
+          logger.debug "program_test_error #{e}"
           resultObj[:status] = -4
           tmpstatus = -4
           CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>0,:wait_time=>0,:student_work_id=>student_work.id)
@@ -197,7 +197,7 @@ class StudentWorkController < ApplicationController
                   resultObj[:status] = 0
                 end
                 student_work.save!
-                resultObj[:time] = student_work_test.created_at.to_s(:db)
+                resultObj[:time] = student_work_test.created_at.strftime(format='%Y-%m-%d %H:%M:%S')
                 resultObj[:index] = student_work.student_work_tests.count
               end
 
@@ -390,7 +390,7 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
-      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 && @course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.has_committed.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
@@ -409,7 +409,7 @@ class StudentWorkController < ApplicationController
               @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -420,7 +420,7 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.where(:user_id => User.current.id)
           end
           @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
@@ -432,17 +432,17 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -454,9 +454,9 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
+      if (@homework.is_open == 1 &&@course.is_public == 1) || (@homework.is_open == 1 && @course.is_public == 0 && User.current.member_of_course?(@course)) || @is_teacher || User.current.admin? || (User.current.member_of_course?(@course) && @homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.has_committed.where(:user_id => User.current.id).empty?)
         if @order == 'lastname'
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
         elsif @order == 'student_id'
@@ -475,7 +475,7 @@ class StudentWorkController < ApplicationController
               @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -486,7 +486,7 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.where(:user_id => User.current.id)
           end
           @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
         elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
@@ -498,17 +498,17 @@ class StudentWorkController < ApplicationController
               my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
             if @order == 'lastname'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins(:user).order("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, login #{@b_sort}"),@name
             elsif @order == 'student_id'
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
             else
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
+              @stundet_works = search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
             end
             @show_all = true
           end
@@ -519,7 +519,7 @@ class StudentWorkController < ApplicationController
         render_403
         return
       end
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.has_committed.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count
 
     end
     @score = @b_sort == "desc" ? "asc" : "desc"
@@ -547,10 +547,10 @@ class StudentWorkController < ApplicationController
       return
     end
     @user = User.current
-    @student_work = @homework.student_works.where("user_id = ?",User.current.id).first
-    if @student_work.nil?
+    #@student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    #if @student_work.nil?
       @student_work = StudentWork.new
-    end
+    #end
     respond_to do |format|
       format.html{ render :layout => "new_base_user"}
     end
@@ -560,7 +560,7 @@ class StudentWorkController < ApplicationController
     # 提交作品前先判断是否已经提交
     @has_commit = false;
     if hsd_committed_work?(User.current.id, @homework.id)
-      @work = StudentWork.where("user_id =? and homework_common_id =?", User.current.id, @homework.id).first
+      @work = StudentWork.where("user_id =? and homework_common_id =? and work_status != 0", User.current.id, @homework.id).first
       @has_commit = true;
       #flash[:notice] = l(:notice_successful_create)
       #redirect_to edit_student_work_url(params[:student_work])
@@ -572,6 +572,7 @@ class StudentWorkController < ApplicationController
     if params[:student_work]
       @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      student_work = StudentWork.where("user_id =? and homework_common_id =? and work_status = 0", User.current.id, @homework.id).first
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name] == "#{@homework.name}的作品提交(可修改)" ? "#{@homework.name}的作品提交" : params[:student_work][:name]
       student_work.description = params[:student_work][:description]
@@ -586,8 +587,10 @@ class StudentWorkController < ApplicationController
       #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
+        student_work.work_status = 2
       else
         student_work.late_penalty = 0
+        student_work.work_status = 1
       end
       if student_work.save
         if @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1
@@ -800,6 +803,9 @@ class StudentWorkController < ApplicationController
     @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
     @new_score.user_id = User.current.id
     @new_score.student_work_id = @work.id
+    if @is_teacher && @work.work_status == 0
+      @work.update_column('work_status', 1)
+    end
     if User.current.admin?
       @new_score.reviewer_role = 1
     else
@@ -1148,7 +1154,7 @@ class StudentWorkController < ApplicationController
   end
 
   def hsd_committed_work?(user, homework)
-    sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
+    sw = StudentWork.where("user_id =? and homework_common_id =? and work_status != 0", user, homework).first
     sw.nil? ? result = false : result = true
     result
   end
@@ -1225,7 +1231,7 @@ class StudentWorkController < ApplicationController
         sheet1[count_row,3] = homework.user.user_extensions.student_id
         sheet1[count_row,4] = homework.user.mail
         sheet1[count_row,5] = homework.name
-        sheet1[count_row,6] = strip_html homework.description
+        sheet1[count_row,6] = strip_html homework.description if !homework.description.nil?
         sheet1[count_row,7] = homework.teacher_score.nil? ? l(:label_without_score) : homework.teacher_score.round(2)
         sheet1[count_row,8] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : homework.teaching_asistant_score.round(2)
         if @homework.anonymous_comment ==0

app/controllers/syllabuses_controller.rb

@@ -6,7 +6,7 @@ class SyllabusesController < ApplicationController
   include CoursesHelper
 
   before_filter :is_logged, :only => [:index, :show, :edit, :new, :update, :destroy, :delete_syllabus]
-  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :update_base_info, :delete_syllabus, :delete_des]
+  before_filter :find_syllabus, :only => [:show, :edit, :update, :destroy, :syllabus_courselist, :edit_syllabus_eng_name, :edit_syllabus_title, :update_base_info, :delete_syllabus, :delete_des]
   def index
     user = User.current
     @syllabuses = user.syllabuses
@@ -140,6 +140,16 @@ class SyllabusesController < ApplicationController
     end
   end
 
+  #修改课程名称
+  def edit_syllabus_title
+    if @syllabus && params[:title] != ""
+      @syllabus.update_column("title",params[:title])
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   #修改英文名称
   def edit_syllabus_eng_name
     if @syllabus

app/controllers/users_controller.rb

@@ -90,6 +90,8 @@ class UsersController < ApplicationController
     case params[:type]
       when 'JournalsForMessage'
         @comment = JournalsForMessage.find params[:comment].to_i
+      when 'Message'
+        @comment = Message.find params[:comment].to_i
     end
   end
 
@@ -111,6 +113,13 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @type = 'JournalsForMessage'
+      when 'Message'
+        @reply = Message.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @is_course = params[:is_course]
+        @is_board = params[:is_board]
+        @type = 'Message'
     end
     respond_to do |format|
       format.js
@@ -941,8 +950,10 @@ class UsersController < ApplicationController
       #提交作品时，计算是否迟交
       if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = homework.late_penalty
+        student_work.work_status = 2
       else
         student_work.late_penalty = 0
+        student_work.work_status = 1
       end
 
       student_work.save
@@ -1033,6 +1044,26 @@ class UsersController < ApplicationController
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
           homework_detail_group.save if homework_detail_group
+
+          if homework.homework_type != 3
+            students = homework.course.student
+            if !homework.course.nil? && !students.empty?
+              name = homework.name
+              name_str = name + "的作品提交"
+              str = ""
+              students.each do |student|
+                if str != ""
+                  str += ","
+                end
+                str += "('#{name_str}',#{homework.id},#{student.student_id}, '#{format_time(Time.now)}', '#{format_time(Time.now)}')"
+              end
+              #('#{name}的作品提交',#{homework.id},#{student.student_id}, '#{format_time(Time.now)}', '#{format_time(Time.now)}')
+              sql = "insert into student_works (name, homework_common_id,user_id, created_at, updated_at) values" + str
+              #StudentWork.create(:name => "#{name}的作品提交", :homework_common_id => homework.id, :user_id => student.student_id)
+              ActiveRecord::Base.connection.execute sql
+            end
+          end
+
           if params[:quotes] && !params[:quotes].blank?
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
             quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
@@ -1991,44 +2022,8 @@ class UsersController < ApplicationController
   def add_exist_file_to_course
     @flag = true
     if params[:send_id].present?
-      send_id  = params[:send_id]
-      @ori = Attachment.find_by_id(send_id)
-      course_ids = params[:course_ids]
-      if course_ids.nil?
-        @flag = false
-      end
-      unless course_ids.nil?
-        course_ids.each do |id|
-          next if @ori.blank?
-          @exist = false
-          Course.find(id).attachments.each do |att|  #如果课程中包含该资源
-            if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
-              att.created_on = Time.now
-              att.save
-              @exist = true
-              break
-            end
-          end
-          next if @exist
-          attach_copied_obj = @ori.copy
-          attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
-          attach_copied_obj.container = Course.find(id)
-          attach_copied_obj.created_on = Time.now
-          attach_copied_obj.author_id = User.current.id
-          attach_copied_obj.is_public = 0
-          attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
-          if attach_copied_obj.attachtype == nil
-            attach_copied_obj.attachtype = 4
-          end
-          if attach_copied_obj.save
-            # 更新引用次数
-            quotes = @ori.quotes.to_i + 1
-            @ori.update_attribute(:quotes, quotes) unless @ori.nil?
-            @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
-          end
-          @save_message = attach_copied_obj.errors.full_messages
-        end
-      end
+      rs = ResourcesService.new
+      @ori, @flag, @save_message = rs.send_resource_to_course(User.current, params)
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(",")
       course_ids = params[:course_ids]
@@ -2773,8 +2768,8 @@ class UsersController < ApplicationController
 
   # 获取我的课程资源
   def get_course_resources author_id, user_course_ids, order, score
-    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
-                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and container_type = 'Course')"+
+                                      "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
@@ -3281,7 +3276,12 @@ class UsersController < ApplicationController
           @journals = obj.children.reorder("created_at desc")
         when 'Message'
           obj = Message.where('id = ?', params[:id].to_i).first
-          @journals = obj.children.reorder("created_on desc")
+          @type = 'Message'
+          @is_course = params[:is_course]
+          @is_board = params[:is_board]
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
+          comments = []
+          @journals = get_all_children(comments, obj)
         when 'News'
           obj = News.where('id = ?', params[:id].to_i).first
           @journals = obj.comments.reorder("created_on desc")

app/controllers/wechats_controller.rb

@@ -8,7 +8,11 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-    sendBindClass(request, {invite_code: content})
+    if join_request(request)
+      sendBindClass(request, {invite_code: content})
+    else
+      request.reply.text '您的意见已收到，感谢您的反馈！'
+    end
   end
 
   # When receive 'help', will trigger this responder
@@ -142,6 +146,11 @@ class WechatsController < ActionController::Base
     end
   end
 
+  def join_request(request)
+    openid = request[:FromUserName]
+    wl = WechatLog.where("openid = '#{openid}' and request_raw like '%\"Event\":\"click\"%'").order('id desc').first
+    wl && JSON(wl.request_raw)["EventKey"] == 'JOIN_CLASS'
+  end
 
   def sendBindClass(request, params)
     begin

app/helpers/application_helper.rb

@@ -2631,7 +2631,7 @@ module ApplicationHelper
   def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
     if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
-    elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
+    elsif homework.student_works.has_committed.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
         link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
@@ -2681,40 +2681,41 @@ module ApplicationHelper
 
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
+    count = homework.student_works.has_committed.count
     if User.current.member_of_course?(homework.course)
       if is_teacher #老师显示作品数量
-        link_to "作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
+        link_to "作品(#{count})", student_work_index_url_in_org(homework.id), :class => "c_blue"
       else #学生显示提交作品、修改作品等按钮
         work = cur_user_works_for_homework homework
         project = cur_user_projects_for_homework homework
         if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-            link_to "提交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
+            link_to "提交作品(#{count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再提交作品'
           else
-            link_to "提交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_blue'
+            link_to "提交作品(#{count})",  new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           end
         elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
           if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-            link_to "补交作品(#{homework.student_works.count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
+            link_to "补交作品(#{count})","javascript:void(0)", :class => 'c_grey',:style=>"cursor:not-allowed",:title => '请先关联项目再补交作品'
           else
-            link_to "补交作品(#{homework.student_works.count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
+            link_to "补交作品(#{count})",  new_student_work_url_without_domain(homework.id),:class => 'c_red'
           end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-            link_to "查看作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
+            link_to "查看作品(#{count})",student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "匿评已结束"
           elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
+            link_to "修改作品(#{count})", new_student_work_url_without_domain(homework.id),:class => 'c_blue'
           elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
-            link_to "修改作品(#{homework.student_works.count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
+            link_to "修改作品(#{count})", edit_student_work_url_without_domain(work.id),:class => 'c_blue'
           else
-            link_to "查看作品(#{homework.student_works.count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
+            link_to "查看作品(#{count})", student_work_index_url_in_org(homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end
     else
-      link_to "作品(#{homework.student_works.count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
+      link_to "作品(#{count})",student_work_index_url_in_org(homework.id),:class => "c_blue"
     end
 
   end
@@ -2752,7 +2753,7 @@ module ApplicationHelper
 
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_works_for_homework homework
-    work = homework.student_works.where("user_id = ?",User.current).first
+    work = homework.student_works.where("user_id = ? && work_status != 0",User.current).first
     if homework.homework_type == 3
       pro = homework.student_work_projects.where("user_id = #{User.current.id}").first
       if pro.nil? || pro.student_work_id == "" || pro.student_work_id.nil?
@@ -3138,9 +3139,9 @@ def get_reply_parents_no_root parents_rely, comment
   parents_rely
 end
 
-#获取留言的所有子节点
+#获取所有子节点
 def get_all_children result, jour
-  if jour.kind_of? JournalsForMessage
+  if (jour.kind_of? JournalsForMessage) || (jour.kind_of? Message)
     jour.children.each do |jour_child|
       result << jour_child
       get_all_children result, jour_child
@@ -3281,7 +3282,7 @@ end
 
 def strip_html(text,len=0,endss="...")
   ss = ""
-  if text.length>0
+  if !text.nil? && text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip
     ss = ss.gsub(/&nbsp;/, ' ')
 
@@ -3322,3 +3323,21 @@ def get_group_member_names work
   end
   result
 end
+
+def course_syllabus_option user = User.current
+  syllabuses = user.syllabuses
+  type = []
+  option1 = []
+  option1 << "请选择课程"
+  option1 << 0
+  type << option1
+  unless syllabuses.empty?
+    syllabuses.each do |syllabus|
+      option = []
+      option << syllabus.title
+      option << syllabus.id
+      type << option
+    end
+  end
+  type
+end