Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/courses_controller.rb

@@ -25,6 +25,7 @@ class CoursesController < ApplicationController
   before_filter :authorize_course, :only => [:show, :settings,  :update,  :course]
   before_filter :authorize_course_global, :only => [:new,:create]
   before_filter :toggleCourse, :only => [:finishcourse, :restartcourse]
+  before_filter :is_deleted, :only => [:show, :settings]
 
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
@@ -55,11 +56,11 @@ class CoursesController < ApplicationController
 
   def join
     if User.current.logged?
-        cs = CoursesService.new
-        @user = User.current
-        join = cs.join_course params,@user
-        @state = join[:state]
-        @course = join[:course]
+      cs = CoursesService.new
+      @user = User.current
+      join = cs.join_course params,@user
+      @state = join[:state]
+      @course = join[:course]
       # else
       #   @course = Course.find_by_id params[:object_id]
       #   CourseMessage.create(:user_id => @course.tea_id, :course_id => @course.id, :viewed => false,:content=> params[:role],:course_message_id=>User.current.id,:course_message_type=>'JoinCourseRequest')
@@ -70,7 +71,7 @@ class CoursesController < ApplicationController
     end
     @object_id = params[:object_id]
     respond_to do |format|
-        format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
+      format.js #{ render :partial => 'set_join', :locals => {:user => @user, :course => @course, :object_id => params[:object_id]} }
     end
 
   end
@@ -85,7 +86,7 @@ class CoursesController < ApplicationController
     end
   end
 
-  
+
   def join_private_courses
     respond_to do |format|
       format.js
@@ -98,14 +99,14 @@ class CoursesController < ApplicationController
     c = cs.edit_course params,@course,User.current
     @course = c[:course]
     if @course.errors.full_messages.count <= 0
-        respond_to do |format|
-          format.html {
-            # render :layout => 'base_courses'
-            flash[:notice] = l(:notice_successful_update)
-            redirect_to settings_course_url(@course)
-          }
-          format.api  { render_api_ok }
-        end
+      respond_to do |format|
+        format.html {
+          # render :layout => 'base_courses'
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to settings_course_url(@course)
+        }
+        format.api  { render_api_ok }
+      end
     else
       respond_to do |format|
         format.html {
@@ -134,8 +135,8 @@ class CoursesController < ApplicationController
       courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
-   @name = params[:name]
-   @type = 'courses'
+    @name = params[:name]
+    @type = 'courses'
     respond_to do |format|
       format.html {
         render :layout => 'course_base'
@@ -277,7 +278,7 @@ class CoursesController < ApplicationController
   def member
     ## 有角色参数的才是课程，没有的就是项目
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
-      
+
       @render_file = 'new_member_list'
       @score_sort_by = "desc"
       @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1'
@@ -312,7 +313,7 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     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|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
@@ -427,7 +428,7 @@ class CoursesController < ApplicationController
   end
 
   def course
-     @school_id = params[:school_id]
+    @school_id = params[:school_id]
     per_page_option = 10
     if @school_id == "0" or @school_id.nil?
       @courses_all = Course.active.visible.
@@ -515,8 +516,8 @@ class CoursesController < ApplicationController
 
   def index
     if !User.current.admin?
-       render_404
-       return
+      render_404
+      return
     end
     @course_type = params[:course_type]
     @school_id = params[:school_id]
@@ -565,7 +566,7 @@ class CoursesController < ApplicationController
 
     respond_to do |format|
       format.html {
-         render :layout => 'base'
+        render :layout => 'base'
       }
       format.atom {
         courses = Course.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
@@ -581,6 +582,13 @@ class CoursesController < ApplicationController
     end
   end
 
+  def is_deleted
+    if @course.is_delete == 1 and !User.current.admin?
+      render_404
+      return
+    end
+  end
+
   def get_courses
     @user = User.current
     membership = @user.coursememberships.all
@@ -634,6 +642,11 @@ class CoursesController < ApplicationController
   end
 
   def show
+    # 被删除的课程只有超级管理员才能看到，is_delete为1的时候，标记课程被删除
+    # if @course.is_delete == 1 && !User.current.admin?
+    #   render_403
+    #   return
+    # end
     #更新创建课程消息状态
     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)
@@ -684,10 +697,10 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-   @course.journals_for_messages.each do |messages|
-     query = messages.course_messages.where("user_id = ?", User.current.id)
-     query.update_all(:viewed => true);
-   end
+    @course.journals_for_messages.each do |messages|
+      query = messages.course_messages.where("user_id = ?", User.current.id)
+      query.update_all(:viewed => true);
+    end
 
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
@@ -738,20 +751,20 @@ class CoursesController < ApplicationController
 
   #从课程创建的老师那里选择课程大纲
   def course_outline
-      @teacher = User.find(@course.tea_id)
-      @blog_articles = @teacher.blog.articles
-      @is_in_show_outline_page = params[:is_in_show_outline_page]
-      respond_to do |format|
-        format.js
-      end
+    @teacher = User.find(@course.tea_id)
+    @blog_articles = @teacher.blog.articles
+    @is_in_show_outline_page = params[:is_in_show_outline_page]
+    respond_to do |format|
+      format.js
+    end
   end
 
   #根据关键字搜索，查找方法一样的，但返回内容不一样
   def search_course_outline
-     @article_title = params[:title]
-     @teacher = User.find(@course.tea_id)
-     @blog_articles = @teacher.blog.articles.like(@article_title)
-     render :json=>@blog_articles.to_json
+    @article_title = params[:title]
+    @teacher = User.find(@course.tea_id)
+    @blog_articles = @teacher.blog.articles.like(@article_title)
+    render :json=>@blog_articles.to_json
   end
 
   #设置或者更改课程的大纲
@@ -771,10 +784,23 @@ class CoursesController < ApplicationController
       format.html {render :layout => 'base_courses'}
     end
   end
+
   #删除课程
-  #删除课程只是将课程的is_delete状态改为false，is_delete为false状态的课程只有管理员可以看到
+  #删除课程只是将课程的is_deleted状态改为false，is_deleted为false状态的课程只有管理员可以看到
   def destroy
+    @course.update_attributes(:is_delete => true)
+    @course = nil
+    redirect_to user_url(User.current)
+  end
 
+  # 恢复已删除的课程
+  def renew
+    if User.current.admin?
+      @course.update_attributes(:is_delete => false)
+      redirect_to course_path(@course)
+    else
+      return 404
+    end
   end
 
   private
@@ -797,7 +823,7 @@ class CoursesController < ApplicationController
   def can_show_course
     @first_page = FirstPage.find_by_page_type('project')
     if @first_page.try(:show_course) == 2
-       render_404
+      render_404
     end
   end
 

app/controllers/exercise_controller.rb

@@ -18,13 +18,13 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    if @course.is_public == 0 && !User.current.member_of_course?(@course)
+    if @course.is_public == 0 && !(User.current.member_of_course?(@course)||User.current.admin?)
       render_403
       return
     end
     remove_invalid_exercise(@course)
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-    if @is_teacher
+    if @is_teacher || User.current.admin?
       exercises = @course.exercises.order("created_at asc")
     else
       exercises = @course.exercises.where(:exercise_status => 2).order("created_at asc")
@@ -48,13 +48,13 @@ class ExerciseController < ApplicationController
     end_exercises.each do |exercise|
       exercise.update_column('exercise_status', 3)
     end
-    unless User.current.member_of_course?(@course)
+    unless User.current.member_of_course?(@course) || User.current.admin?
       render_403
       return
     end
     @exercise = Exercise.find params[:id]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    if @exercise.exercise_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
+    if @exercise.exercise_status != 2 && (!(User.current.allowed_to?(:as_teacher,@course) || User.current.admin?))
       render_403
       return
     end

app/controllers/homework_common_controller.rb

@@ -126,14 +126,33 @@ class HomeworkCommonController < ApplicationController
     if @homework_detail_manual.comment_status == 1
       student_works = @homework.student_works
       if student_works && student_works.size >= 2
-        student_works.each_with_index do |work, index|
-          user = work.user
-          n = @homework_detail_manual.evaluation_num
-          n = n < student_works.size ? n : student_works.size - 1
-          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
-          assigned_homeworks.each do |h|
-            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
-            student_works_evaluation_distributions.save
+        if @homework.homework_type == 3
+          student_work_projects = @homework.student_work_projects.where("student_work_id is not null")
+          student_work_projects.each_with_index do |pro_work, pro_index|
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            work_index = -1
+            student_works.each_with_index do |stu_work, stu_index|
+              if stu_work.id.to_i == pro_work.student_work_id.to_i
+                work_index = stu_index
+              end
+            end
+            assigned_homeworks = get_assigned_homeworks(student_works, n, work_index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
+          end
+        else
+          student_works.each_with_index do |work, index|
+            user = work.user
+            n = @homework_detail_manual.evaluation_num
+            n = n < student_works.size ? n : student_works.size - 1
+            assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+            assigned_homeworks.each do |h|
+              student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+              student_works_evaluation_distributions.save
+            end
           end
         end
         @homework_detail_manual.update_column('comment_status', 2)
@@ -143,7 +162,8 @@ class HomeworkCommonController < ApplicationController
         Mailer.send_mail_anonymous_comment_open(@homework).deliver
       else
         @statue = 2
-      end
+
+    end
     else
       @statue = 3
     end
@@ -277,6 +297,7 @@ class HomeworkCommonController < ApplicationController
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
     @homework_detail_programing = @homework.homework_detail_programing
+    @homework_detail_group = @homework.homework_detail_group
     @course = @homework.course
   rescue
     render_404

app/controllers/my_controller.rb

@@ -129,7 +129,7 @@ class MyController < ApplicationController
         @user.safe_attributes = params[:user]
         @user.pref.attributes = params[:pref]
         @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
-        @user.login = params[:login]
+        #@user.login = params[:login]
         unless @user.user_extensions.nil?
           if @user.user_extensions.identity == 2
             @user.firstname = params[:enterprise_name]

app/controllers/projects_controller.rb

@@ -697,7 +697,11 @@ class ProjectsController < ApplicationController
         flash[:error] = l(:error_can_not_archive_project)
       end
     end
-    redirect_to admin_projects_url(:status => params[:status])
+    if params[:type] == "project"
+      redirect_to user_path(User.current)
+    else
+      redirect_to admin_projects_url(:status => params[:status])
+    end
   end
 
   def unarchive

app/controllers/repositories_controller.rb

@@ -75,6 +75,9 @@ class RepositoriesController < ApplicationController
         redirect_to repository_url(@repository)
       else
         g = Gitlab.client
+        if User.current.gid.nil?
+          g.sync_user(User.current)
+        end
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject
           copy_project(@project, gproject)

app/controllers/users_controller.rb

@@ -551,12 +551,21 @@ class UsersController < ApplicationController
               )
             end
           end
+        end
 
+        #分组作业
+        if homework.homework_type == 3
+          homework_detail_group = HomeworkDetailGroup.new
+          homework.homework_detail_group = homework_detail_group
+          homework_detail_group.min_num = params[:min_num].to_i
+          homework_detail_group.max_num = params[:max_num].to_i
+          homework_detail_group.base_on_project = params[:base_on_project].to_i
         end
 
         if homework.save
           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 params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)

app/controllers/welcome_controller.rb

@@ -161,7 +161,7 @@ class WelcomeController < ApplicationController
                                                                  query: @name,
                                                                  type:"most_fields",
                                                                  operator: "or",
-                                                                 fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                                 fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                              }
                                                          },
                                                          highlight: {
@@ -173,10 +173,12 @@ class WelcomeController < ApplicationController
                                                                  lastname: {},
                                                                  name:{},
                                                                  description:{},
-                                                                 filename:{}
+                                                                 filename:{},
+                                                                 subject:{},
+                                                                 content:{}
                                                              }
                                                          }
-                                                     },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
+                                                     },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
       when 'user'
               @users = User.search(@name).page(params[:page] || 1).per(20)
       when 'project'
@@ -185,6 +187,8 @@ class WelcomeController < ApplicationController
               @courses = Course.search(@name).page(params[:page] || 1).per(20).results
       when 'attachment'
               @attachments = Attachment.search(@name).page(params[:page] || 1).per(20).results
+      when 'memo'
+             @memos = Memo.search(@name).page(params[:page] || 1).per(20).results
       else
               @alls = Elasticsearch::Model.search({
                                                                      query: {
@@ -192,7 +196,7 @@ class WelcomeController < ApplicationController
                                                                              query: @name,
                                                                              type:"most_fields",
                                                                              operator: "or",
-                                                                             fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                                             fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                                          }
                                                                      },
                                                                      highlight: {
@@ -204,10 +208,12 @@ class WelcomeController < ApplicationController
                                                                              lastname: {},
                                                                              name:{},
                                                                              description:{},
-                                                                             filename:{}
+                                                                             filename:{},
+                                                                             subject:{},
+                                                                             content:{}
                                                                          }
                                                                      }
-                                                                 },[User,Course,Attachment,Project] ).page(params[:page] || 1).per(20).results
+                                                                 },[User,Course,Attachment,Project,Memo] ).page(params[:page] || 1).per(20).results
 
     end
 
@@ -216,13 +222,14 @@ class WelcomeController < ApplicationController
     @course_count = Course.search(@name).results.total
     @attach_count = Attachment.search(@name).results.total
     @project_count = Project.search(@name).results.total
+    @memo_count = Memo.search(@name).results.total
     @total_count = Elasticsearch::Model.search({
                                                    query: {
                                                        multi_match: {
                                                            query: @name,
                                                            type:"most_fields",
                                                            operator: "or",
-                                                           fields: ['login', 'firstname','lastname','name','description^0.5','filename']
+                                                           fields: ['login', 'firstname','lastname','name','description^0.5','filename','subject','content^0.5']
                                                        }
                                                    },
                                                    highlight: {
@@ -234,10 +241,12 @@ class WelcomeController < ApplicationController
                                                            lastname: {},
                                                            name:{},
                                                            description:{},
-                                                           filename:{}
+                                                           filename:{},
+                                                           subject:{},
+                                                           content:{}
                                                        }
                                                    }
-                                               },[User,Course,Attachment,Project] ).results.total
+                                               },[User,Course,Attachment,Project,Memo] ).results.total
     # search_type = params[:search_type].to_sym unless search_condition.blank?
     # search_by = params[:search_by]
     #

app/helpers/application_helper.rb

@@ -2435,10 +2435,19 @@ module ApplicationHelper
         link_to "作品(#{homework.student_works.count})",student_work_index_path(:homework => 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")
-          link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          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 => '请先关联项目再提交作品'
+          else
+            link_to "提交作品(#{homework.student_works.count})",  new_student_work_path(:homework => 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")
-          link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          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 => '请先关联项目再补交作品'
+          else
+            link_to "补交作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_red'
+          end
         else
           if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
@@ -2459,6 +2468,24 @@ module ApplicationHelper
 
   end
 
+  def relate_project homework,is_teacher,is_in_course,user_activity_id,course_activity
+    if User.current.member_of_course?(homework.course)
+      if is_teacher
+        #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      else
+        projects = cur_user_projects_for_homework homework
+        works = cur_user_works_for_homework homework
+        if works.nil? && projects.nil?
+          link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目'
+        elsif works.nil?
+          link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => homework.id,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目'
+        else
+          #link_to "已关联(#{homework.student_work_projects.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+        end
+      end
+    end
+  end
+
   def student_anonymous_comment homework
     if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
@@ -2474,7 +2501,20 @@ module ApplicationHelper
 
   #获取当前用户在指定作业下提交的作业的集合
   def cur_user_works_for_homework homework
-    homework.student_works.where("user_id = ?",User.current).first
+    work = homework.student_works.where("user_id = ?",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?
+        work = nil
+      else
+        work = StudentWork.find pro.student_work_id
+      end
+    end
+    work
+  end
+  #获取当前用户在指定作业下关联的项目的集合
+  def cur_user_projects_for_homework homework
+    homework.student_work_projects.where("user_id = ?",User.current).first
   end
 
   def file_preview_tag(file, html_options={})

app/models/attachment.rb

@@ -47,7 +47,7 @@ class Attachment < ActiveRecord::Base
   settings index: { number_of_shards: 5 } do
     mappings dynamic: 'false' do
       indexes :filename, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :downloads, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :downloads, index:"not_analyzed",index_options: 'offsets'
     end
   end
 

app/models/course.rb

@@ -16,11 +16,11 @@ class Course < ActiveRecord::Base
     mappings dynamic: 'false' do
       indexes :name, analyzer: 'smartcn',index_options: 'offsets'
       indexes :description, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :updated_at, analyzer: 'smartcn',index_options: 'offsets',type:"date"
+      indexes :updated_at, index:"not_analyzed",type:"date"
     end
   end
   
-  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name
+  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete
   #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
@@ -86,7 +86,8 @@ class Course < ActiveRecord::Base
   'is_public',
   'description',
   'class_period',
-  'open_student'
+  'open_student',
+  'is_delete'
 
   acts_as_customizable
 
@@ -94,7 +95,7 @@ class Course < ActiveRecord::Base
   scope :active, lambda { where(:status => STATUS_ACTIVE) }
   scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
   scope :all_public, lambda { where(:is_public => true) }
-  scope :visible, lambda {|*args| where(Course.visible_condition(args.shift || User.current, *args)) }
+  scope :visible, lambda {|*args| where(Course.where("is_delete =?", 0).visible_condition(args.shift || User.current, *args)) }
   scope :allowed_to, lambda {|*args|
     user = User.current
     permission = nil
@@ -114,7 +115,7 @@ class Course < ActiveRecord::Base
       where(" LOWER(name) LIKE :p ", :p => pattern)
     end
   }
-  scope :indexable,lambda { where('is_public = 1') }
+  scope :indexable,lambda { where('is_public = 1 and is_delete = 0') }
   def self.search(query)
     __elasticsearch__.search(
         {
@@ -399,12 +400,12 @@ class Course < ActiveRecord::Base
   #   __elasticsearch__.delete_document
   # end
   def create_course_ealasticsearch_index
-    if self.is_public == 1
+    if self.is_public == 1 and self.is_delete == 0  #公开 和 没有被删除的课程才被索引
       self.__elasticsearch__.index_document
     end
   end
   def update_course_ealasticsearch_index
-    if self.is_public == 1 #如果是初次更新成为公开的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
+    if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
         self.__elasticsearch__.update_document
       rescue => e

app/models/homework_common.rb

@@ -9,6 +9,8 @@ class HomeworkCommon < ActiveRecord::Base
   belongs_to :user
   has_one :homework_detail_manual, :dependent => :destroy
   has_one :homework_detail_programing, :dependent => :destroy
+  has_one :homework_detail_group, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   has_many :homework_tests, :dependent => :destroy
   has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
   has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
@@ -74,6 +76,10 @@ class HomeworkCommon < ActiveRecord::Base
     self.homework_type == 2 && self.homework_detail_programing
   end
 
+  def is_group_homework?
+    self.homework_type == 3 && self.homework_detail_group
+  end
+
   ###添加回复
   def self.add_homework_jour(user, notes, id , options = {})
     homework = HomeworkCommon.find(id)

app/models/homework_detail_group.rb

@@ -0,0 +1,4 @@
+class HomeworkDetailGroup < ActiveRecord::Base
+  belongs_to :homework_common
+  attr_accessible :base_on_project, :homework_common_id, :max_num, :min_num
+end

app/models/memo.rb

@@ -1,7 +1,9 @@
+require 'elasticsearch/model'
 class Memo < ActiveRecord::Base
 	include Redmine::SafeAttributes
   include UserScoreHelper
   include ApplicationHelper
+  include Elasticsearch::Model
 	belongs_to :forum
   has_many_kindeditor_assets :assets, :dependent => :destroy
 	belongs_to :author, :class_name => "User", :foreign_key => 'author_id'
@@ -12,6 +14,18 @@ class Memo < ActiveRecord::Base
 	validates_length_of :content, maximum: 30000
 	validate :cannot_reply_to_locked_topic, :on => :create
 
+
+  #elasticsearch kaminari init
+  Kaminari::Hooks.init
+  Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
+  settings index: { number_of_shards: 5 } do
+    mappings dynamic: 'false' do
+      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :content, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :updated_at,index:"not_analyzed" ,type:'date'
+    end
+  end
+
 	acts_as_tree :counter_cache => :replies_count, :order => "#{Memo.table_name}.created_at ASC"
 	acts_as_attachable
   has_many :user_score_details,  :class_name => 'UserScoreDetails',:as => :score_changeable_obj
@@ -47,9 +61,9 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message
-	# after_update :update_memos_forum
-	after_destroy :reset_counters!,:delete_kindeditor_assets#,:down_user_score  -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :send_mail, :send_message,:create_memo_ealasticsearch_index
+	after_update :update_memo_ealasticsearch_index
+	after_destroy :reset_counters!,:delete_kindeditor_assets,:delete_memo_ealasticsearch_index#,:down_user_score  -- 公共区发帖暂不计入得分,
 	# after_create :send_notification
 	# after_save :plusParentAndForum
 	# after_destroy :minusParentAndForum
@@ -57,6 +71,36 @@ class Memo < ActiveRecord::Base
 	# scope :visible, lambda { |*args|
 	# 	includes(:forum => ).where()
 	# }
+  scope :indexable,lambda {
+    where('parent_id is null')
+  }
+
+  def self.search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['subject','content^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_at:{order: "desc" }
+            },
+            highlight: {
+                pre_tags: ['<span class="c_red">'],
+                post_tags: ['</span>'],
+                fields: {
+                    subject: {},
+                    content: {}
+                }
+            }
+        }
+    )
+  end
 
   def send_mail
       Mailer.run.forum_message_added(self) if Setting.notified_events.include?('forum_message_added')
@@ -203,6 +247,22 @@ class Memo < ActiveRecord::Base
   # Author lizanle
   # Description 从硬盘上删除资源
   def delete_kindeditor_assets
-    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MEMO
+      delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MEMO
+  end
+
+  def create_memo_ealasticsearch_index
+    if self.parent_id.nil?
+      self.__elasticsearch__.index_document
+    end
+  end
+  def update_memo_ealasticsearch_index
+    if self.parent_id.nil?
+        self.__elasticsearch__.update_document
+    end
+  end
+  def delete_memo_ealasticsearch_index
+    if self.parent_id.nil?
+      self.__elasticsearch__.delete_document
+    end
   end
 end

app/models/project.rb

@@ -39,10 +39,11 @@ class Project < ActiveRecord::Base
     mappings dynamic: 'false' do
       indexes :name, analyzer: 'smartcn',index_options: 'offsets'
       indexes :description, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :updated_on, analyzer: 'smartcn',index_options: 'offsets', type:'date'
+      indexes :updated_on, index:"not_analyzed", type:'date'
     end
   end
 
+  has_many :student_work_projects,:dependent => :destroy
   has_many :student_works
   has_many :time_entry_activities
   has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
@@ -86,6 +87,7 @@ class Project < ActiveRecord::Base
 
   # end
   #ADDED BY NIE
+  has_one :project_score, :dependent => :destroy
   has_many :project_infos, :dependent => :destroy 
   has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   has_many :user_grades, :class_name => "UserGrade", :dependent => :destroy

app/models/student_work.rb

@@ -4,6 +4,7 @@ class StudentWork < ActiveRecord::Base
 
   belongs_to :homework_common
   belongs_to :user
+  has_many :student_work_projects
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project

app/models/student_work_project.rb

@@ -0,0 +1,7 @@
+class StudentWorkProject < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :homework_common
+  belongs_to :student_work
+  belongs_to :project
+  belongs_to :user
+end

app/models/user.rb

@@ -35,7 +35,7 @@ class User < Principal
       indexes :login, analyzer: 'smartcn',index_options: 'offsets'
       indexes :firstname, analyzer: 'smartcn',index_options: 'offsets'
       indexes :lastname, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :last_login_on, analyzer: 'smartcn',index_options: 'offsets',type: 'date'
+      indexes :last_login_on,  index:"not_analyzed",type: 'date'
     end
   end
 
@@ -107,6 +107,7 @@ class User < Principal
   has_many :student_works, :dependent => :destroy
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
+  has_many :student_work_projects, :dependent => :destroy
   #end
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},

app/views/courses/_courses_jours.html.erb

@@ -27,14 +27,14 @@
     </div>
   <% else %>
       <div nhname='new_message_' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%>
+        <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_course_message'}, :html=>{:id => "course_feedback_new"},:method => "post") do |f|%>
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
             <div nhname='toolbar_container_' style="float:left;padding-top:3px;margin-bottom: 15px;"></div>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
-            <a id="new_message_submit_btn_" href="javascript:void(0)" class="blue_btn fr ml10 mt10">留言</a>
-        <% end%>
+            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
+        <% end %>
       </div>
   <% end %>
 </div>
@@ -50,7 +50,11 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 
 <script type="text/javascript">
-  $(function(){
+
+    $(function(){
+        $("#submit_feedback_course").one('click',function() {
+            $("#course_feedback_new").submit();
+        });
     KindEditor.ready(function(K){
       $("a[nhname='reply_btn']").live('click',function(){
         var params = {};
@@ -83,4 +87,5 @@
       });
     });
   });
+
 </script>

app/views/courses/_member.html.erb

@@ -1,6 +1,7 @@
 <% @members.each do |member| %>
     <li >
-      <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+      <%#= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
+      <%= link_to "#{member.principal}（#{member.principal.show_name}）", user_path(member.principal), :class => "w150 linkBlue fl" %>
       <span class="w150 fl">
         <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %>
         <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),

app/views/courses/member.html.erb

@@ -12,3 +12,4 @@
     <%= render :partial => 'course_teacher', :locals => {:members => @members} %>
 <% end%>
 
+

app/views/courses/settings.html.erb

@@ -88,6 +88,15 @@
           </li>
       <% end %>
     </ul>
+    <% if @course.is_delete == 1 %>
+        <div class="mt30 fr"><img src="/images/pic_del.gif" class="mr5"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
+    <% else %>
+        <div class="mt30">
+          <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>
+          <span>（友情提示：删除该课程后如果您想恢复该课程，请联系系统管理员！）</span>
+        </div>
+    <% end %>
+
   </div>
 
   <div class="hwork_undis" id="tbc_02">

app/views/homework_common/index.html.erb

@@ -4,7 +4,7 @@
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
         $("#course_id").val($("#option_select").val());
-        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true })%>");
+        $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         homework_description_editor.html("");
         $("#homework_editor").toggle();
     }

app/views/layouts/base_projects.html.erb

@@ -103,17 +103,17 @@
 
       <!--邀请加入-->
       <div class="subNavBox">
-        <% if User.current.member_of?(@project) %>
-          <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" nhtype="toggle4cookie" data-id="expand_invit" data-target="#navContent_invit" data-val="expand">
-            <%= l(:label_invite)%>
-          </div>
-          <ul class="navContent " style="display:block" id="navContent_invit">
-            <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
-            <!--<%# if User.current.allowed_to?(:manage_members, @project) %>-->
+        <%# if User.current.member_of?(@project) %>
+          <!--<div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" nhtype="toggle4cookie" data-id="expand_invit" data-target="#navContent_invit" data-val="expand">-->
+            <!--<%#= l(:label_invite)%>-->
+          <!--</div>-->
+          <!--<ul class="navContent " style="display:block" id="navContent_invit">-->
+            <!--<li><%#=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>-->
+            <!--&lt;!&ndash;<%# if User.current.allowed_to?(:manage_members, @project) %>&ndash;&gt;-->
               <!--<li><%#=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>-->
             <!--<%# end %>-->
-          </ul>
-        <% end %><!--end-->
+          <!--</ul>-->
+        <%# end %><!--end-->
         <!--menu 左侧工具栏 -->
         <%#--project_new_type: 1为开发组；2为科研组；3为朋友圈子--%>