Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange

2015-11-27 11:27:03 +08:00 · 2015-11-27 11:27:03 +08:00 · ee85cc35ed
parent 1115d54d9a ee746b2d64
commit ee85cc35ed
1627 changed files with 31346 additions and 3827 deletions
--- a/app/assets/javascripts/org_courses.js.coffee
+++ b/app/assets/javascripts/org_courses.js.coffee
@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
--- a/app/assets/stylesheets/org_courses.css.scss
+++ b/app/assets/stylesheets/org_courses.css.scss
@ -0,0 +1,3 @@
+// Place all the styles related to the org_courses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -29,6 +29,30 @@ class CoursesController < ApplicationController
  before_filter :require_login, :only => [:join, :unjoin]
  #before_filter :allow_join, :only => [:join]

+  #查找组织
+  def search_public_orgs_not_in_course
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
+    if course_org_ids.empty?
+      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+    else
+      course_org_ids = "(" + course_org_ids.join(',') +  ")"
+      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+    end
+    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
+    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @hint_flag = params[:hint_flag]
+    #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
+    respond_to do |format|
+      format.js
+    end
+  end
+
  def join
    if User.current.logged?
        cs = CoursesService.new
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@ -0,0 +1,612 @@
+class ExerciseController < ApplicationController
+  layout "base_courses"
+
+  before_filter :find_exercise_and_course, :only => [:create_exercise_question, :edit, :update, :show, :destroy, :commit_exercise, :commit_answer,:publish_exercise,:republish_exercise]
+  before_filter :find_course, :only => [:index,:new,:create,:student_exercise_list]
+  include ExerciseHelper
+
+  include ExerciseHelper
+  def index
+    remove_invalid_exercise(@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    if @is_teacher
+      exercises = @course.exercises
+    else
+      exercises = @course.exercises.where(:exercise_status => 2)
+    end
+    @exercises = paginateHelper exercises,20 #分页
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def show
+    unless User.current.member_of_course?(@course)
+      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?)
+      render_403
+      return
+    end
+    @can_edit_excercise = (!has_commit_exercise?(@exercise.id,User.current.id)) || User.current.admin?
+    @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
+      # 学生点击的时候即创建关联,自动保存
+      #eu = ExerciseUser.create(:user_id => User.current, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
+
+    # 已提交问卷的用户不能再访问该界面
+    if has_commit_exercise?(@exercise.id, User.current.id) && (!User.current.admin?)
+      respond_to do |format|
+        format.html {render :layout => 'base_courses'}
+      end
+    else
+      if !@is_teacher && !has_click_exercise?(@exercise.id, User.current.id)
+        eu = ExerciseUser.create(:user_id => User.current.id, :exercise_id => @exercise.id, :start_at => Time.now, :status => false)
+        @exercise_user = ExerciseUser.where("user_id=? and exercise_id=?", User.current.id, @exercise.id).first
+      end
+      # @percent = get_percent(@exercise,User.current)
+      exercise_questions = @exercise.exercise_questions
+      @exercise_questions = paginateHelper exercise_questions,5 #分页
+      respond_to do |format|
+        format.html {render :layout => 'base_courses'}
+      end
+    end
+  end
+
+  def new
+    option = {
+        :exercise_name => "",
+        :course_id => @course.id,
+        :exercise_status => 1,
+        :user_id => User.current.id,
+        :time => "",
+        :end_time => "",
+        :publish_time => "",
+        :exercise_description => "",
+        :show_result => "",
+        :show_result => 1
+    }
+    @exercise = Exercise.create option
+    if @exercise
+      redirect_to edit_exercise_url @exercise.id
+    end
+  end
+
+  def create
+    if params[:exercise]
+      exercise = Exercise.find(params[:exercise_id]) if params[:exercise_id]
+      exercise ||= Exercise.new
+      exercise.exercise_name = params[:exercise][:exercise_name]
+      exercise.exercise_description = params[:exercise][:exercise_description]
+      exercise.end_time = params[:exercise][:end_time]
+      exercise.publish_time = params[:exercise][:publish_time]
+      exercise.user_id = User.current.id
+      exercise.time = params[:exercise][:time]
+      exercise.course_id = params[:course_id]
+      exercise.exercise_status = 1
+      if exercise.save
+        @exercise = exercise
+        respond_to do |format|
+          format.js
+        end
+      end
+    end
+  end
+
+  def edit
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+  end
+  end
+
+  def update
+    @exercise.exercise_name = params[:exercise][:exercise_name]
+    @exercise.exercise_description = params[:exercise][:exercise_description]
+    @exercise.time =  params[:exercise][:time]
+    @exercise.end_time = params[:exercise][:end_time]
+    @exercise.publish_time = params[:exercise][:publish_time]
+    @exercise.show_result = params[:exercise][:show_result]
+    if @exercise.save
+      respond_to do |format|
+        format.js
+      end
+    else
+      render_404
+      end
+  end
+
+  def destroy
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    if @exercise && @exercise.destroy
+      if @is_teacher
+        exercises = Exercise.where("course_id =?", @course.id)
+      else
+        exercises = Exercise.where("course_id =? and exercise_status =?", @course.id, 2)
+      end
+      @exercises = paginateHelper exercises,20 #分页
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  # 统计结果
+  def statistics_result
+    @exercise = Exercise.find(params[:id])
+    exercise_questions = @exercise.exercise_questions
+    @exercise_questions = paginateHelper exercise_questions, 5
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+
+  # 添加题目
+  # question_type 1：单选 2：多选 3：填空题
+  def create_exercise_question
+    question_title = params[:question_title].nil? || params[:question_title].empty? ? l(:label_enter_single_title) : params[:question_title]
+    option = {
+        :question_title => question_title,
+        :question_type => params[:question_type] || 1,
+        :question_number => params[:question_type] == "1"? @exercise.exercise_questions.where("question_type = 1").count + 1 :
+                              (params[:question_type] == "2" ? (@exercise.exercise_questions.where("question_type = 2").count + 1) :
+                              @exercise.exercise_questions.where("question_type = 3").count + 1),
+        :question_score => params[:question_score]
+    }
+    @exercise_questions = @exercise.exercise_questions.new option
+    # params[:question_answer] 题目选项
+    if params[:question_answer]
+      for i in 1..params[:question_answer].count
+        answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1]
+        question_option = {
+            :choice_position => i,
+            :choice_text => answer
+        }
+        @exercise_questions.exercise_choices.new question_option
+      end
+    end
+    # 如果是插入的话，那么从插入的这个id以后的question_num都将要+1
+    if params[:quest_id]
+      @is_insert = true
+      if @exercise_questions.question_type == 1
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number + 1")
+        #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1")
+      elsif @exercise_questions.question_type == 2
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number + 1")
+      else
+        ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number + 1")
+      end
+      # @exercise_question_num = params[:quest_num].to_i
+      @exercise_questions.question_number = params[:quest_num].to_i + 1
+    end
+    if @exercise_questions.save
+      # params[:exercise_choice] 标准答案参数
+      # 问答题标准答案有三个，单独处理
+      if @exercise_questions.question_type == 3
+        for i in 1..params[:exercise_choice].count
+          standart_answer = ExerciseStandardAnswer.new
+          standart_answer.exercise_question_id =  @exercise_questions.id
+          standart_answer.answer_text = params[:exercise_choice].values[i-1]
+          standart_answer.save
+        end
+      else
+        standart_answer = ExerciseStandardAnswer.new
+        standart_answer.exercise_question_id =  @exercise_questions.id
+        if  @exercise_questions.question_type == 1
+          standart_answer.exercise_choice_id = sigle_selection_standard_answer(params[:exercise_choice])
+        else
+          standart_answer.exercise_choice_id = multiselect_standard_answer(params[:exercise_choice])
+        end
+        standart_answer.save
+      end
+      respond_to do |format|
+        format.js
+      end
+    end
+
+  end
+
+  # 修改题目
+  # params[:exercise_question]  The id of exercise_question
+  # params[:question_answer]  eg:A、B、C选项
+  def update_exercise_question
+    @exercise_question = ExerciseQuestion.find params[:exercise_question]
+    @exercise_question.question_title = params[:question_title].nil? || params[:question_title].empty? ? l(:label_enter_single_title) : params[:question_title]
+    @exercise_question.question_score = params[:question_score]
+    # 处理选项:如果选了某个选项，那么则要删除之前的选项
+    if params[:question_answer]
+      @exercise_question.exercise_choices.each do |answer|
+        answer.destroy unless params[:question_answer].keys.include? answer.id.to_s
+      end
+      for i in 1..params[:question_answer].count
+        question = @exercise_question.exercise_choices.find_by_id params[:question_answer].keys[i-1]
+        answer = (params[:question_answer].values[i-1].nil? || params[:question_answer].values[i-1].empty?) ? l(:label_new_answer) : params[:question_answer].values[i-1]
+        if question
+          question.choice_position = i
+          question.choice_text = answer
+          question.save
+        else
+          question_option = {
+              :choice_position => i,
+              :choice_text => answer
+          }
+          @exercise_question.exercise_choices.new question_option
+        end
+      end
+    end
+    # 更新标准答案
+    if params[:exercise_choice]
+      if @exercise_question.question_type == 3
+        # 删除不合理的选项
+        @exercise_question.exercise_standard_answers.each do |answer|
+          answer.destroy unless params[:exercise_choice].keys.include? answer.id.to_s
+        end
+        for i in 1..params[:exercise_choice].count
+          # 找到对应的标准答案
+          question_standart = @exercise_question.exercise_standard_answers.find_by_id params[:exercise_choice].keys[i-1]
+          # 标准答案值
+          answer_standart = (params[:exercise_choice].values[i-1].nil? || params[:exercise_choice].values[i-1].empty?) ? l(:label_new_answer) : params[:exercise_choice].values[i-1]
+          if question_standart
+            question_standart.answer_text = answer_standart
+            question_standart.save
+          else
+            standart_answer_option = {
+                :answer_text => answer_standart
+            }
+            @exercise_question.exercise_standard_answers.new standart_answer_option
+          end
+        end
+      else
+        answer_standart = @exercise_question.exercise_standard_answers.first
+        answer_standart.exercise_choice_id = @exercise_question.question_type == 1 ? sigle_selection_standard_answer(params[:exercise_choice]) : multiselect_standard_answer(params[:exercise_choice])
+        answer_standart.save
+      end
+      @exercise_question.save
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  # 删除题目
+  def delete_exercise_question
+    @exercise_question = ExerciseQuestion.find params[:exercise_question]
+    @exercise = @exercise_question.exercise
+
+    if @exercise_question.question_type == 1
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 1).update_all(" question_number = question_number - 1")
+      #@exercise.exercise_questions.where("question_number > #{params[:quest_num].to_i} and question_type == 1").update_all(" question_number = question_number + 1")
+    elsif @exercise_question.question_type == 2
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 2).update_all(" question_number = question_number - 1")
+    else
+      ExerciseQuestion.where("question_number>? and question_type=?",params[:quest_num].to_i, 3).update_all(" question_number = question_number - 1")
+    end
+    # @exercise_question_num = params[:quest_num].to_i
+    # @exercise_questions.question_number = params[:quest_num].to_i - 1
+    #
+    # exercise_questions = @exercise.exercise_questions.where("question_number > #{@exercise_question.question_number}")
+    # exercise_questions.each do |question|
+    #   question.question_number -= 1
+    #   question.save
+    # end
+    if @exercise_question && @exercise_question.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  # 发布试卷
+  def publish_exercise
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @exercise.exercise_status = 2
+    @exercise.publish_time = Time.now
+    if @exercise.save
+      #redirect_to exercise_index_url(:course_id=> @course.id)
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  # 重新发布试卷
+  # 重新发布的时候会删除所有的答题
+  def republish_exercise
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @exercise.exercise_questions.each do |exercise_question|
+      exercise_question.exercise_answers.destroy_all
+    end
+    @exercise.exercise_users.destroy_all
+    @exercise.exercise_status = 1
+    @exercise.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def student_exercise_list
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @exercise = Exercise.find params[:id]
+    @all_exercises = @course.exercises.order("created_at desc")
+    @exercise_count = @exercise.exercise_users.where('score is not NULL').count
+    if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S"))
+      @exercise_users_list = @exercise.exercise_users.where('score is not NULL')
+      @show_all = true;
+    elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && Time.parse(@exercise.end_time.to_s).strftime("%Y-%m-%d-%H-%M-%S") > Time.now.strftime("%Y-%m-%d-%H-%M-%S")
+      @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id)
+    else
+      @exercise_users_list = []
+    end
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  # 学生提交答卷，选中答案的过程中提交
+  def commit_answer
+    eq = ExerciseQuestion.find(params[:exercise_question_id])
+    # 已提交过的则不允许答题
+    if has_commit_exercise?(@exercise.id,User.current.id) && (!User.current.admin?)
+      render :json => {:text => "failure"}
+      return
+    end
+    if eq.question_type == 1
+      # 单选题
+      ea = ExerciseAnswer.find_by_exercise_question_id_and_user_id(params[:exercise_question_id],User.current.id)
+      if ea.nil?
+        # 尚未答该题，添加答案
+        ea = ExerciseAnswer.new
+        ea.user_id = User.current.id
+        ea.exercise_question_id = params[:exercise_question_id]
+      end
+      #修改该题对应答案
+      ea.exercise_choice_id = params[:exercise_choice_id]
+      if ea.save
+        # 保存成功返回成功信息及当前以答题百分比
+        @percent = get_percent(@exercise,User.current)
+        render :json => {:text => "ok" ,:percent => format("%.2f" ,@percent)}
+      else
+        #返回失败信息
+        render :json => {:text => "failure"}
+      end
+    elsif eq.question_type == 2
+      #多选题
+      ea = ExerciseAnswer.find_by_exercise_choice_id_and_user_id(params[:exercise_choice_id],User.current.id)
+      if ea.nil?
+        #尚未答该题，添加答案
+        ea = ExerciseAnswer.new
+        ea.user_id = User.current.id
+        ea.exercise_question_id = params[:exercise_question_id]
+        ea.exercise_choice_id = params[:exercise_choice_id]
+        if ea.save
+          @percent = get_percent(@exercise,User.current)
+          render :json => {:text => "ok",:percent => format("%.2f" ,@percent)}
+        else
+          render :json => {:text => "failure"}
+        end
+      else
+        #pv不为空，则当前选项之前已被选择，再次点击则是不再选择该项，故删除该答案
+        if ea.delete
+          @percent = get_percent(@exercise, User.current)
+          render :json => {:text => "false" ,:percent => format("%.2f" , @percent)}
+        else
+          render :json => {:text => "failure"}
+        end
+      end
+    elsif eq.question_type == 3
+      #单行文本，多行文本题
+      ea = ExerciseAnswer.find_by_exercise_question_id_and_user_id(params[:exercise_question_id], User.current.id)
+      if ea.nil?
+        # ea为空之前尚未答题，添加答案
+        if params[:answer_text].nil? || params[:answer_text].blank?
+          #用户提交空答案，视作不作答
+          @percent = get_percent(@exercise,User.current)
+          render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+        else
+          #添加答案
+          ea = ExerciseAnswer.new
+          ea.user_id = User.current.id
+          ea.exercise_question_id = params[:exercise_question_id]
+          ea.answer_text = params[:answer_text]
+          if ea.save
+            @percent = get_percent(@exercise,User.current)
+            render :json => {:text => ea.answer_text,:percent => format("%.2f",@percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
+      else
+        # ea不为空说明用户之前已作答
+        if params[:answer_text].nil? || params[:answer_text].blank?
+          # 用户提交空答案，视为删除答案
+          if ea.delete
+            @percent = get_percent(@exercise,User.current)
+            render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        else
+          #用户修改答案
+          ea.answer_text = params[:answer_text]
+          if ea.save
+            @percent = get_percent(@exercise,User.current)
+            render :json => {:text => pv.vote_text,:percent => format("%.2f", @percent)}
+          else
+            render :json => {:text => "failure"}
+          end
+        end
+      end
+
+    else
+      render :json => {:text => "failure"}
+    end
+  end
+
+  # 提交问卷
+  def commit_exercise
+    # 老师不需要提交
+    if User.current.allowed_to?(:as_teacher,@course)
+      @exercise.update_attributes(:show_result => params[:show_result])
+      redirect_to exercise_url(@exercise)
+      # REDO: 提示提交成功
+    else
+      # 更新提交状态
+      cur_exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", User.current, @exercise.id).first
+      cur_exercise_user.update_attributes(:status => 1)
+      # 答题过程中需要统计完成量
+      @uncomplete_question = get_uncomplete_question(@exercise, User.current)
+      # 获取改学生的考试得分
+      @score = calculate_student_score(@exercise, User.current)
+      # @score = 100
+      if @uncomplete_question.count < 1
+        # 查看是否有已提交记录
+        eu = get_exercise_user(@exercise.id, User.current.id)
+        eu.user_id = User.current.id
+        eu.exercise_id = @exercise.id
+        eu.score = @score
+        if eu.save
+          #redirect_to poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course')
+          @status = 0 #提交成功
+        else
+          @status = 2 #未知错误
+        end
+      else
+        @status = 1 #有未做得必答题
+      end
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  # 计算学生得分
+  def calculate_student_score(exercise, user)
+    score = 0
+    score1 = 0
+    score2 = 0
+    score3 = 0
+    exercise_qustions = exercise.exercise_questions
+    exercise_qustions.each do |question|
+      answer = get_user_answer(question, user)
+      standard_answer = get_user_standard_answer(question, user)
+      unless answer.nil?
+        # 问答题有多个答案
+        if question.question_type == 3
+          if standard_answer.include?(answer.first.answer_text)
+            score1 = score1+ question.question_score unless question.question_score.nil?
+          end
+        elsif question.question_type == 1
+          if answer.first.exercise_choice.choice_position == standard_answer.exercise_choice_id
+            score2 = score2 + question.question_score unless question.question_score.nil?
+          end
+        else
+          arr = get_mulscore(question, user)
+          if arr.to_i == standard_answer.exercise_choice_id
+            score3 = score3 + question.question_score unless question.question_score.nil?
+          end
+          # ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id)
+          # arr = []
+          # ecs.each do |ec|
+          #   arr << ec.exercise_choice.choice_position
+          # end
+          # arr.sort
+          # arr = arr.join("")
+          # if arr.to_i == standard_answer.exercise_choice_id
+          #   score3 = score + question.question_score unless question.question_score.nil?
+          # end
+        end
+      end
+    end
+    score = score1 + score2 + score3
+  end
+
+  private
+
+  # ExerciseUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
+  def get_exercise_user exercise_id,user_id
+    eu = ExerciseUser.find_by_exercise_id_and_user_id(exercise_id,user_id)
+    if eu.nil?
+      eu = ExerciseUser.new
+    end
+    eu
+  end
+
+  #获取未完成的题目
+  def get_uncomplete_question exercise,user
+    all_questions = exercise.exercise_questions
+    uncomplete_question = []
+    all_questions.each do |question|
+      answers = get_user_answer(question, user)
+      if answers.nil?
+        uncomplete_question << question
+      end
+    end
+    uncomplete_question
+  end
+
+  # 获取当前学生回答问题的答案
+  def get_user_answer(question,user)
+    # user_answer = ExerciseAnswer.where("user_id=? and exercise_question_id=?", user.id, question.id).first
+    user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}")
+    user_answer
+  end
+
+  # 获取问题的标准答案
+  def get_user_standard_answer(question,user)
+    if question.question_type == 3
+      standard_answer =[]
+      question.exercise_standard_answers.each do |answer|
+        standard_answer << answer.answer_text
+      end
+    else
+      standard_answer = question.exercise_standard_answers.first
+    end
+    standard_answer
+  end  # 是否完成了答题
+  def get_complete_question(exercise,user)
+    questions = exercise.exercise_questions
+    complete_question = []
+    questions.each do |question|
+      answers = get_user_answer(question,user)
+      if !(answers.nil? || answers.count < 1)
+        complete_question << question
+      end
+    end
+    complete_question
+  end
+
+  # 获取答题百分比
+  def get_percent exercise,user
+    complete_count = get_complete_question(exercise,user).count
+    if exercise.exercise_questions.count == 0
+      return 0
+    else
+      return (complete_count.to_f / exercise.exercise_questions.count.to_f)*100
+    end
+  end
+
+  def remove_invalid_exercise(course)
+    exercises = course.exercises.where("exercise_name=?","")
+    unless exercises.empty?
+      exercises.each do |exercise|
+        if exercise.exercise_questions.empty?
+          exercise.destroy
+        end
+      end
+    end
+  end
+
+  def find_exercise_and_course
+    @exercise = Exercise.find params[:id]
+    @course = Course.find @exercise.course_id
+  rescue Exception => e
+    render_404
+  end
+
+  def find_course
+    @course = Course.find params[:course_id]
+  rescue Exception => e
+    render_404
+  end
+end
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@ -24,7 +24,7 @@ class FilesController < ApplicationController
  before_filter :auth_login1, :only => [:index]
  before_filter :logged_user_by_apptoken,:only => [:index]
  before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]

  helper :sort
  include SortHelper
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@ -20,11 +20,11 @@ class IssuesController < ApplicationController
  default_search_scope :issues

  before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org]
  before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
  before_filter :find_project, :only => [:new, :create, :update_form]
  #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]

  before_filter :find_optional_project, :only => [:index]
  before_filter :check_for_default_issue_status, :only => [:new, :create]
@ -397,6 +397,23 @@ class IssuesController < ApplicationController
    end
  end

+  def add_journal_in_org
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save
+      org_activity = OrgActivity.where("org_act_type='Issue' and org_act_id =#{@issue.id}").first
+      org_activity.updated_at = jour.created_on
+      org_activity.save
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
  private

  def find_project
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@ -174,6 +174,11 @@ class MessagesController < ApplicationController
      user_activity.updated_at = Time.now
      user_activity.save
    end
+    org_activity = OrgActivity.where("org_act_type='Message' and org_act_id =#{@topic.id}").first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
    #@topic.update_attribute(:updated_on, Time.now)
    if !@reply.new_record?
      if params[:asset_id]
--- a/app/controllers/org_courses_controller.rb
+++ b/app/controllers/org_courses_controller.rb
@ -0,0 +1,18 @@
+class OrgCoursesController < ApplicationController
+  def create
+    org_ids = params[:orgNames]
+    @course = Course.find(params[:course_id])
+    org_ids.each do |org_id|
+      OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    @course = Course.find(params[:course_id])
+    @org_course = OrgCourse.find(params[:id])
+    @org_course.destroy
+  end
+end
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@ -12,7 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
    @org_document_comment.title = params[:org_document_comment][:title]
    @org_document_comment.content = params[:org_document_comment][:content]
    if @org_document_comment.save
-      #flash[:notice] = 'success'
+      flash.keep[:notice] = l(:notice_successful_create)
      OrgActivity
      redirect_to organization_org_document_comments_path(@organization)
    else
@ -20,15 +20,23 @@ class OrgDocumentCommentsController < ApplicationController
    end
  end
  def show
-
+    @document = OrgDocumentComment.find(params[:id])
  end

  def index
-    @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc")
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc")
+    else
+      render_403
+    end
  end
  def update
    @org_document =  OrgDocumentComment.find(params[:id])
    @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    if @org_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
+      act.update_attributes(:updated_at => @org_document.updated_at)
+    end
    respond_to do |format|
      format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)}
    end
@ -41,12 +49,24 @@ class OrgDocumentCommentsController < ApplicationController

  def add_reply
    @document = OrgDocumentComment.find(params[:id]).root
+    @act = OrgActivity.find(params[:id])
    @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
    @comment.content = params[:org_content]
    @document.children << @comment
    @document.save
  end

+  def add_reply_in_doc
+    @document = OrgDocumentComment.find(params[:id]).root
+    @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:org_comment][:org_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+
  def find_organization
    @organization = Organization.find(params[:organization_id])
  end
@ -59,5 +79,66 @@ class OrgDocumentCommentsController < ApplicationController
        org.home_id == nil
      end
    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def delete_reply
+    @org_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @org_document_comment.root
+    org = @org_document_comment.organization
+    @org_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
  end
 end
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@ -16,7 +16,7 @@ class OrgMemberController < ApplicationController
      member_ids = params[:membership][:user_ids]
      role_id = params[:orgRole]
      member_ids.each do |user_id|
-        member =  OrgMember.create(:user_id=>user_id)
+        member =  OrgMember.create(:user_id=>user_id, :created_at => Time.now)
        @org.org_members << member
        OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id)
      end
--- a/app/controllers/org_projects_controller.rb
+++ b/app/controllers/org_projects_controller.rb
@ -4,7 +4,6 @@ class OrgProjectsController < ApplicationController
    @project = Project.find(params[:project_id])
    org_ids.each do |org_id|
      OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
-      p 1
    end
    respond_to do |format|
      format.js
@ -14,18 +13,5 @@ class OrgProjectsController < ApplicationController
    @project = Project.find(params[:project_id])
    @org_project = OrgProject.find(params[:id])
    @org_project.destroy
-
-    condition = '%%'
-    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id)
-    if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10)
-      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
-    else
-      project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10)
-      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
-    end
-    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
-    @orgs_page = Paginator.new @org_count, 10,1
  end
 end
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@ -55,22 +55,38 @@ class OrganizationsController < ApplicationController
  def show
    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
      @organization = Organization.find(params[:id])
-      @org_activities  = OrgActivity.where('container_id =? and container_type =? ',
-                                       @organization.id, 'Organization ').order('updated_at desc').page(params[:page]).per(10)
-      @org_activities_count  = OrgActivity.where('container_id =? and container_type =? ',
-                                           @organization.id, 'Organization ').order('updated_at desc').count
      project_ids = @organization.projects.map(&:id) << 0
-      @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page]  || 1).per(10)
-      @org_project_activties_count =  ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
-      #@org_activities = paginateHelper @org_activities, 10
+      course_ids = @organization.courses.map(&:id) << 0
+      course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+      case params[:type]
+        when nil
+          @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
+                                             "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                             "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+                                             @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_issue'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_message'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'org'
+          @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_homework'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_news'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_message'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_poll'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+      end
      @page = params[:page]
+      respond_to do |format|
+        format.html
+        format.js
+      end
    else
      render_403
    end
-    respond_to do |format|
-      format.html
-      format.js
-    end
  end

  def update
@ -135,13 +151,26 @@ class OrganizationsController < ApplicationController
  end

  def members
-    @members = OrgMember.where("organization_id =?", @organization.id)
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @members = OrgMember.where("organization_id =?", @organization.id)
+    else
+      render_403
+    end
  end

  def  more_org_projects
    @organization = Organization.find params[:id]
    @page = params[:page]
-    @org_projects = @organization.org_projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def more_org_courses
+    @organization = Organization.find(params[:id])
+    @page = params[:page]
+    @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5)
    respond_to do |format|
      format.js
    end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -86,6 +86,7 @@ class ProjectsController < ApplicationController
    end
   # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @no_roll_hint = params[:hint_flag]
    #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json
    respond_to do |format|
      format.js
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -42,7 +42,7 @@ class RepositoriesController < ApplicationController
  include RepositoriesHelper
  helper :project_score
  #@root_path = RepositoriesHelper::ROOT_PATH
-
+  $g=Gitlab.client

  rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
  def new
@ -315,14 +315,34 @@ update
      #Modified by young
      #  (show_error_not_found; return) unless @entries
      g = Gitlab.client
-      count = 0
-      (0..100).each do |page|
-        if g.commits(@project.gpid,:page => page).count == 0
-          break
-        else
-          count = count + g.commits(@project.gpid,:page => page).count
-        end
+
+      # count = 0
+      # (0..100).each do |page|
+      #   if g.commits(@project.gpid,:page => page).count == 0
+      #     break
+      #   else
+      #     count = count + g.commits(@project.gpid,:page => page).count
+      #   end
+      # end
+
+
+      #add by hx
+      if g.commits(@project.gpid , :page=>25).count==0
+        count = count_commits(@project.gpid , 0 , 25)
+      elsif g.commits(@project.gpid , :page=>50).count ==0
+        count = count_commits(@project.gpid , 25 , 50)+ 25 * 20
+      elsif g.commits(@project.gpid , :page=>75).count ==0
+        count = count_commits(@project.gpid , 50 , 75)+ 50 * 20
+      elsif g.commits(@project.gpid , :page=>100).count== 0
+        count = count_commits(@project.gpid , 75 , 100) + 75 * 20
+      elsif g.commits(@project.gpid , :page=>125).count==0
+        count = count_commits(@project.gpid , 100 , 125) + 100 * 20
+      elsif g.commits(@project.gpid , :page=>150).count==0
+        count = count_commits(@project.gpid , 125 , 150) + 125 * 20
+      else
+        count = count_commits(@project.gpid , 150 ,200) + 150 * 20
      end
+
      @changesets = g.commits(@project.gpid)
      # @changesets = @repository.latest_changesets(@path, @rev)
      # @changesets_count = @repository.latest_changesets(@path, @rev).count
@ -349,33 +369,27 @@ update

  alias_method :browse, :show

-
-  #add by houxiang
-
-  def get_commits(id)
-    g = Gitlab.client
-    tmp_commit_count = g.commits(id,page:0).count
-    commit_count = 0
-    i=0
-    while tmp_commit_count!=0
-      commit_count = commit_count+tmp_commit_count
-      i=i+1
-      tmp_commit_count = g.commits(id,page:i).count
+  #add by hx
+  def count_commits(project_id , left , right)
+    count = 0
+    (left..right).each do |page|
+      if $g.commits(project_id,:page => page).count == 0
+        break
+      else
+        count = count + $g.commits(project_id,:page => page).count
+      end
    end
-
-    return  commit_count
-
+    return count
  end

-
  def changes
    @entry = @repository.entry(@path, @rev)
    (show_error_not_found; return) unless @entry
    g = Gitlab.client
    limit = 20
-
-
+    #每次页面的换回值从1开始,但是gitlab的页面查询是从0开始,所以先改变page的类型减一在改回来
    @commits = g.commits(@project.gpid, page:(params[:page].to_i - 1).to_s)
+    #页面传递必须要str类型,但是Paginator的初始化必须要num类型,需要类型转化
    @commits_count = params[:commit_count].to_i
    @commits_pages = Redmine::Pagination::Paginator.new @commits_count,limit,params[:page]

@ -387,6 +401,7 @@ update
    render :layout => 'base_projects'
  end

+
  def revisions
    @changeset_count = @repository.changesets.count
    @changeset_pages = Paginator.new @changeset_count,
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -167,6 +167,18 @@ class StudentWorkController < ApplicationController
  end

  def create
+    # 提交作品前先判断是否已经提交
+    @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
+      @has_commit = true;
+      #flash[:notice] = l(:notice_successful_create)
+      #redirect_to edit_student_work_url(params[:student_work])
+      respond_to do |format|
+        format.js
+      end
+      return
+    end
    if params[:student_work]
      @submit_result = true
      student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
@ -499,6 +511,12 @@ class StudentWorkController < ApplicationController
  end

  private
+  def hsd_committed_work?(user, homework)
+    sw = StudentWork.where("user_id =? and homework_common_id =?", user, homework).first
+    sw.nil? ? result = false : result = true
+    result
+  end
+
  #获取作业
  def find_homework
    @homework = HomeworkCommon.find params[:homework]
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1918,6 +1918,20 @@ class UsersController < ApplicationController
    end
  end

+  def search_user_orgs
+    name=""
+    if !params[:search_orgs].nil?
+      name = params[:search_orgs].strip
+    end
+    name = "%"+name+"%"
+    @orgs = User.current.organizations.where("name like ?", name)
+    @user = User.current
+    respond_to do |format|
+      format.html {render :layout => 'static_base'}
+      format.js
+    end
+  end
+
  private

  def find_user
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -2374,8 +2374,10 @@ 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
-        if work.nil?
+        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'
+        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'
        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 => "开启匿评后不可修改作品"
--- a/app/helpers/exercise_helper.rb
+++ b/app/helpers/exercise_helper.rb
@ -0,0 +1,139 @@
+# encoding: utf-8
+module ExerciseHelper
+
+  # 单选
+  def sigle_selection_standard_answer(params)
+    size = params.ord - 96
+    if size > 0 # 小写字母答案
+      answer = params.ord - 96
+    else
+      answer = params.ord - 64
+    end
+  end
+
+  # 多选
+  def multiselect_standard_answer(params)
+    size = params.ord - 96
+    answer = []
+    if size > 0 # 小写字母答案
+      for i in 0..(params.length-1)
+        answer << (params[i].ord - 96).to_s
+      end
+    else
+      for i in 0..(params.length-1)
+        answer << (params[i].ord - 64)
+      end
+    end
+    answer = answer.sort
+    answer.join("")
+  end
+
+  #
+  def fill_standart_answer(params, standart_answer)
+    params.each do |param|
+      standart_answer.answer_text = param.value
+      standart_answer.save
+    end
+  end
+
+  # 获取多选的得分
+  def get_mulscore(question, user)
+    ecs = ExerciseAnswer.where("user_id =? and exercise_question_id =?", user.id, question.id)
+    arr = []
+    ecs.each do |ec|
+      arr << ec.exercise_choice.choice_position
+    end
+    arr.sort
+    arr = arr.join("")
+  end
+
+  # 判断用户是否已经提交了问卷
+  # status 为0的时候是用户点击试卷。为1表示用户已经提交
+  def has_commit_exercise?(exercise_id, user_id)
+    pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, true)
+    if pu.empty?
+      false
+    else
+      true
+    end
+  end
+
+  # 判断学生是否点击过问卷，点击则为他保存一个记录，记录start_at
+  def has_click_exercise?(exercise_id, user_id)
+    pu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise_id, user_id, false)
+    if pu.empty?
+      false
+    else
+      true
+    end
+  end
+
+  def convert_to_char(str)
+    result = ""
+    length = str.length
+    unless str.nil?
+      if length === 1
+        result += (str.to_i + 64).chr
+        return result
+      elsif length > 1
+        for i in 0...length
+          result += (str[i].to_i + 64).chr
+        end
+        return result
+      end
+    end
+    return result
+  end
+
+  def get_current_score exercise
+    score = 0
+    unless exercise.nil?
+      exercise.exercise_questions.each do |exercise_question|
+        unless exercise_question.question_score.nil?
+          score += exercise_question.question_score
+        end
+      end
+      return score
+    end
+    return score
+  end
+
+  def answer_be_selected?(answer,user)
+    pv = answer.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id} ")
+    if !pv.nil? && pv.count > 0
+      true
+    else
+      false
+    end
+  end
+
+  #获取文本题答案
+  def get_anwser_vote_text(question_id,user_id)
+    pv = ExerciseAnswer.find_by_exercise_question_id_and_user_id(question_id,user_id)
+    if pv.nil?
+      ''
+    else
+      pv.answer_text
+    end
+  end
+
+  # 获取当前学生回答问题的答案
+  def get_user_answer(question,user)
+    user_answer = question.exercise_answers.where("#{ExerciseAnswer.table_name}.user_id = #{user.id}")
+    user_answer
+  end
+
+  # 获取问题的标准答案
+  def get_user_standard_answer(question,user)
+    if question.question_type == 3
+      standard_answer =[]
+      question.exercise_standard_answers.each do |answer|
+        standard_answer << answer.answer_text
+      end
+    else
+      standard_answer = question.exercise_standard_answers
+    end
+    standard_answer
+  end
+
+end
--- a/app/helpers/org_courses_helper.rb
+++ b/app/helpers/org_courses_helper.rb
@ -0,0 +1,2 @@
+module OrgCoursesHelper
+end
--- a/app/models/course.rb
+++ b/app/models/course.rb
@ -18,6 +18,8 @@ class Course < ActiveRecord::Base
           :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
  has_many :principals, :through => :member_principals, :source => :principal
  has_many :users, :through => :members
+  has_many :org_courses
+  has_many :organizations, :through => :org_courses
  # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
  # has_many :homework_for_courses, :dependent => :destroy
@ -39,6 +41,7 @@ class Course < ActiveRecord::Base
  has_many :course_activities
  # 课程消息
  has_many :course_messages,  :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
+  has_many :exercises, :dependent => :destroy

  acts_as_taggable
  acts_as_nested_set :order => 'name', :dependent => :destroy
--- a/app/models/course_activity.rb
+++ b/app/models/course_activity.rb
@ -5,8 +5,8 @@ class CourseActivity < ActiveRecord::Base
  belongs_to :course
  belongs_to :user
  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity
-  before_destroy :destroy_user_activity
+  after_save :add_user_activity, :add_course_activity
+  before_destroy :destroy_user_activity, :destroy_org_activity

  #在个人动态里面增加当前动态
  def add_user_activity
@ -30,8 +30,34 @@ class CourseActivity < ActiveRecord::Base
    end
  end

+  def add_course_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'").first
+    if org_activity
+      org_activity.save
+    else
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.course_act.parent.id}").first
+        org_activity.created_at = self.created_at
+        org_activity.save
+      else
+        OrgActivity.create(:user_id => self.user_id,
+                       :org_act_id => self.course_act_id,
+                       :org_act_type => self.course_act_type,
+                       :container_id => self.course_id,
+                       :container_type => 'Course',
+                       :created_at => self.created_at,
+                       :updated_at => self.updated_at)
+        end
+      end
+  end
+
  def destroy_user_activity
    user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'")
    user_activity.destroy_all
  end
+
+  def destroy_org_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'")
+    org_activity.destroy_all
+  end
 end
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@ -0,0 +1,8 @@
+class Exercise < ActiveRecord::Base
+  #exercise_status: 1,新建；2，发布；3，关闭
+  include Redmine::SafeAttributes
+  belongs_to :user
+  has_many :exercise_questions, :dependent => :destroy,:order => "#{ExerciseQuestion.table_name}.question_number"
+  has_many :exercise_users, :dependent => :destroy
+  has_many :users, :through => :exercise_users #该测试被哪些用户提交答案过
+end
--- a/app/models/exercise_answer.rb
+++ b/app/models/exercise_answer.rb
@ -0,0 +1,8 @@
+class ExerciseAnswer < ActiveRecord::Base
+  #学生答题
+  include Redmine::SafeAttributes
+
+  belongs_to :user
+  belongs_to :exercise_question
+  belongs_to :exercise_choice
+end
--- a/app/models/exercise_choice.rb
+++ b/app/models/exercise_choice.rb
@ -0,0 +1,7 @@
+class ExerciseChoice < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
+  belongs_to :exercise_question
+  has_many :exercise_answers, :dependent => :destroy
+  has_many :exercise_standard_answers, :dependent => :destroy
+end
--- a/app/models/exercise_question.rb
+++ b/app/models/exercise_question.rb
@ -0,0 +1,8 @@
+class ExerciseQuestion < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
+  belongs_to :exercise
+  has_many :exercise_choices, :order => "#{ExerciseChoice.table_name}.choice_position",:dependent => :destroy
+  has_many :exercise_answers, :dependent => :destroy
+  has_many :exercise_standard_answers, :dependent => :destroy
+end
--- a/app/models/exercise_standard_answer.rb
+++ b/app/models/exercise_standard_answer.rb
@ -0,0 +1,7 @@
+class ExerciseStandardAnswer < ActiveRecord::Base
+  #标准答案
+  include Redmine::SafeAttributes
+
+  belongs_to :exercise_question
+  belongs_to :exercise_choice
+end
--- a/app/models/exercise_user.rb
+++ b/app/models/exercise_user.rb
@ -0,0 +1,6 @@
+class ExerciseUser < ActiveRecord::Base
+  include Redmine::SafeAttributes
+
+  belongs_to :user
+  belongs_to :exercise
+end
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@ -20,8 +20,8 @@ class ForgeActivity < ActiveRecord::Base
  validates :forge_act_id,presence: true
  validates :forge_act_type, presence: true
  has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity
-  before_destroy :destroy_user_activity
+  after_save :add_user_activity, :add_org_activity
+  before_destroy :destroy_user_activity, :destroy_org_activity

  #在个人动态里面增加当前动态
  def add_user_activity
@ -45,8 +45,29 @@ class ForgeActivity < ActiveRecord::Base
    end
  end

+  def add_org_activity
+    if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+      org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
+      org_activity.created_at = self.created_at
+      org_activity.save
+    else
+      OrgActivity.create(:user_id => self.user_id,
+                       :org_act_id => self.forge_act_id,
+                       :org_act_type => self.forge_act_type,
+                       :container_id => self.project_id,
+                       :container_type => 'Project',
+                       :created_at => self.created_at,
+                       :updated_at => self.updated_at)
+    end
+  end
+
  def destroy_user_activity
    user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'")
    user_activity.destroy_all
  end
+
+  def destroy_org_activity
+    org_acts = OrgActivity.where("org_act_type='#{self.forge_act_type.to_s}' and org_act_id = '#{self.forge_act_id}'")
+    org_acts.destroy_all
+  end
 end
--- a/app/models/org_course.rb
+++ b/app/models/org_course.rb
@ -0,0 +1,5 @@
+class OrgCourse < ActiveRecord::Base
+  #attr_accessible :organization, :course, :created_at
+  belongs_to :organization
+  belongs_to :course
+end
--- a/app/models/org_document_comment.rb
+++ b/app/models/org_document_comment.rb
@ -11,6 +11,10 @@ class OrgDocumentComment < ActiveRecord::Base
  def document_save_as_org_activity
    if(self.parent().nil?)
      self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization')
+    else
+      act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
    end
  end
+
 end
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@ -3,7 +3,9 @@ class Organization < ActiveRecord::Base
  has_many :org_members, :dependent => :destroy
  has_many :org_projects ,:dependent => :destroy
  has_many :projects,:through => :org_projects
+  has_many :courses, :through => :org_courses
  has_many :org_document_comments, :dependent => :destroy
+  has_many :org_courses
  has_many :users, :through => :org_members
  validates_uniqueness_of :name
  after_create :save_as_org_activity
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -81,6 +81,12 @@ class User < Principal
  has_many :poll, :dependent => :destroy #用户创建的问卷
  has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷
  # end
+  #在线测验相关关系
+  has_many :exercise_user, :dependent => :destroy  #答卷中间表
+  has_many :exercise_answer, :dependent => :destroy  #针对每个题目学生的答案
+  has_many :exercises, :dependent => :destroy  #创建的试卷
+  has_many :exercises_answers, :source => :exercise, :through => :exercise_user, :dependent => :destroy #用户已经完成问答的试卷
+  #end
  #作业相关关系
  has_many :homework_commons, :dependent => :destroy
  has_many :student_works, :dependent => :destroy
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@ -186,6 +186,7 @@ class CoursesService
  #params[:setup_time]：暂不传（貌似已经没用了）
  #params[:endup_time]: 暂不传（貌似已经没用了）
  #params[:class_period]:学时总数
+  #params[:course][:publish_resource]允许学生上传资源
  def create_course(params,current_user)
    if current_user.user_extensions.identity
      @course = Course.new
@ -202,6 +203,7 @@ class CoursesService
      @course.class_period = params[:class_period].to_i
      params[:course][:is_public] ? @course.is_public = 1 : @course.is_public = 0
      params[:course][:open_student] ? @course.open_student = 1 : @course.open_student = 0
+      params[:course][:publish_resource] ? @course.publish_resource = 1 : @course.publish_resource = 0
    else

    end
@ -243,6 +245,7 @@ class CoursesService
  #params[:term]：学期（秋季学期或春季学期）
  #params[:time]: 年份（例：2014）
  #params[:class_period]:学时总数
+  #params[:publish_resource] 允许学生上传资源 0 不允许 1 允许
  def edit_course(params,course,current_user)
    course.send(:safe_attributes=, params[:course], current_user)
    #course.safe_attributes = params[:course]
@ -251,6 +254,7 @@ class CoursesService
    course.class_period = params[:class_period].to_i
    params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
    params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
+    params[:course][:publish_resource] ? course.publish_resource = 1 : course.publish_resource = 0
    if course.save
      if params[:course][:is_public] == '0'
        course_status = CourseStatus.find_by_course_id(course.id)
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@ -50,6 +50,12 @@
        <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
        <div class="cl"></div>
      </li>
+       <li class=" mb5 ml30">
+          <label >学生上传资源&nbsp;&nbsp;：</label>
+          <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" />
+          <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+          <div class="cl"></div>
+       </li>
      <li class=" ml90" >
        <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
        <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
--- a/app/views/courses/search_public_orgs_not_in_course.js.erb
+++ b/app/views/courses/search_public_orgs_not_in_course.js.erb
@ -0,0 +1,19 @@
+<% if @hint_flag.nil? %>
+    if($("#join_orgs_for_course input:checked").size() > 0)
+    {
+        alert("翻页或搜索后将丢失当前选择的用户数据");
+    }
+<% end %>
+$("#search_orgs_result_list").html("");
+$("#search_orgs_result_list").append('<ul class="ml20">');
+<% @orgs_not_in_course.each do |org|%>
+    link = "<li><label><input type='checkbox'class='mr5 fl mt3' name='orgNames[]' value='<%=org.id%>'/><span class='relateOrgName fl'> <%=org.name %> </span></label></li><div class='cl mt5'></div>";
+    $("#search_orgs_result_list").append(link );
+<%end %>
+$("#search_orgs_result_list").append('</ul>')
+<% if @org_count > 10 %>
+    $("#paginator").html(' <%=  pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>');
+    $("#paginator").css("display", "block");
+<% else %>
+    $("#paginator").css("display", "none");
+<% end %>
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@ -10,6 +10,9 @@
      <li id="tb_2" class="hwork_normaltab" onclick="course_setting(2);">
        成员
      </li>
+      <li id="tb_3" class="hwork_normaltab" onclick="course_setting(3);">
+        组织
+      </li>
    </ul>
  </div>
  <div class="hwork_dis" id="tbc_01" style="padding-top: 10px;">
@ -65,6 +68,12 @@
            <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
            <div class="cl"></div>
          </li>
+          <li class=" mb5 ml30">
+            <label >学生上传资源&nbsp;&nbsp;：</label>
+            <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" style="margin-left: 1px;"/>
+            <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+            <div class="cl"></div>
+          </li>
          <li class=" ml90" >
            <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_edit_course(<%= @course.id%>);" >提交</a>
            <%= link_to l(:button_cancel), course_path(@course), :class => "blue_btn grey_btn fl c_white" %>
@ -91,6 +100,10 @@
      <%= render :partial => "course_members" %>
    </div>
  </div><!---成员结束-->
+
+  <div class="hwork_undis" id="tbc_03">
+    <%= render :partial => 'courses/settings/join_org' %>
+  </div>
 </div><!--talknew end-->
 <div class="cl"></div>
 <script type="text/javascript">
@ -105,4 +118,4 @@
  }
  $("#time_selected").click(select);
  $("#term_selected").click(select);
-</script>
+</script>
--- a/app/views/courses/settings/_added_orgs.html.erb
+++ b/app/views/courses/settings/_added_orgs.html.erb
@ -0,0 +1,12 @@
+<ul>
+  <li><span class="relatedListName fb fl">名称</span><span class="relatedListOption fb fl">操作</span></li>
+  <% orgs.each do |org| %>
+      <li>
+        <a href="<%= organization_path(org) %>" class="relatedListName linkBlue fl"><%= org.name %></a>
+        <a href="javascript:void(0);" onclick="cancel_org_course_relation(<%= OrgCourse.where(:organization_id => org.id, :course_id => course_id).first.id %>, '<%= course_id %>');"
+           class = "relatedListOption fl linkGrey3">取消关联</a>
+        <%#= link_to "取消关联", org_course_path(:id => OrgCourse.where(:organization_id => org.id, :course_id => course_id).first.id, :course_id => course_id),
+                    :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %>
+      </li>
+  <% end %>
+</ul>
--- a/app/views/courses/settings/_join_org.html.erb
+++ b/app/views/courses/settings/_join_org.html.erb
@ -0,0 +1,86 @@
+<!--<div class="members_left">-->
+<!--<input type="text" id="orgs_not_course_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、昵称搜索" class="orgAddSearch mb20" />-->
+<!--<%#= javascript_tag "observeSearchfield('orgs_not_course_member_search', null, '#{ escape_javascript autocomplete_search_organizations_path(:course_id=> @course.id, :format => 'js') }')" %>-->
+<!--<div id="new_orgs_for_course">-->
+
+<!--</div>-->
+<!--</div>-->
+<%= stylesheet_link_tag 'org' %>
+
+<div>
+  <div class="relateOrg fl">
+    <span class="pic_add fl mr5 mt3"></span><span class="f14 fontBlue fl">关联组织</span>
+    <div class="cl mb5"></div>
+    <%= form_tag url_for(:controller => 'org_courses', :action => 'create', :course_id => @course.id), :id => 'join_orgs_for_course', :remote => true do %>
+        <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
+        <div id="search_orgs_result_list" class="ml20"></div>
+        <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
+        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="course_join_org(<%= @course.id %>);">关联</a>
+        <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+    <% end %>
+  </div>
+  <div class="relatedList fr">
+    <div class="fr mr15">
+      <span class="f14 fontBlue">已关联组织</span>
+      <div id="added_orgs">
+        <%= render :partial => 'courses/settings/added_orgs', :locals => {:orgs => @course.organizations, :course_id => params[:id]} %>
+      </div>
+      <div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var page = 1;
+    var count = 0;
+    var maxPage = 0;
+    function search_orgs(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        page = 1;
+        $.ajax({
+            url: '<%= url_for(:controller => 'courses', :action => 'search_public_orgs_not_in_course') %>'+'?name='+ e.target.value+'&page='+page,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询组织
+    $("input[name='orgs']").on('input', function (e) {
+        throttle(search_orgs,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'courses', :action => 'search_public_orgs_not_in_course') %>'+'?page=1',
+            type:'get'
+        });
+    });
+    function cancel_join_orgs() {
+        $("#search_orgs_result_list").html("");
+        $("#paginator").css("display", "none")
+    }
+    function course_join_org(courseId) {
+        $.ajax({
+            url: "/org_courses?" + $("#join_orgs_for_course").serialize() + "&course_id=" + courseId,
+            type: "post",
+            success: function (data) {
+                $.ajax({
+                    url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true&name=" + $("input[name='orgs']").val().trim(),
+                    type: "get"
+                });
+            }
+        });
+    }
+</script>
--- a/app/views/exercise/_alert.html.erb
+++ b/app/views/exercise/_alert.html.erb
@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <script type="text/javascript">
+      function close_alert_form(){hideModal("#alert_form");}
+  </script>
+</head>
+
+<body>
+<div id="alert_form">
+  <div class="upload_con">
+    <div class="polls_alert_upload_box">
+      <p class="polls_alert_box_p">
+        <%= message%>
+      </p>
+      <div class="polls_alert_btn_box">
+        <a class="upload_btn" onclick="close_alert_form();">
+          确&nbsp;&nbsp;定
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+</body>
+</html>
+
--- a/app/views/exercise/_commit_alert.html.erb
+++ b/app/views/exercise/_commit_alert.html.erb
@ -0,0 +1,12 @@
+<div id="popbox" style="text-align: center;margin-top: 25px">
+  <% if status == 0 %>
+      <h3 style="font-weight: normal;color: green">提交成功!您的分数是：<%=@score %>分。</h3>
+      <%= link_to "确定", exercise_path(),:class => 'commit'%>
+  <% elsif status == 1 %>
+      <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后再提交!</h3>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% else %>
+      <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
+  <% end %>
+</div>
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@ -0,0 +1,63 @@
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+              <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                  <li class="ur_item">
+                    <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                    <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                  </li>
+                  <div class="cl"></div>
+              <% end %>
+          </div>
+          <li class="ur_item">
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+          </li>
+          <div class="cl"></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,1);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@ -0,0 +1,63 @@
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<%=convert_to_char (index+1).to_s %><span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input maxlength='200' type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value='<%=exercise_choice.choice_text %>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+            <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                <li class="ur_item">
+                  <label>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <input maxlength="200" type='text' name='question_answer[<%= exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
+                  <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                </li>
+                <div class="cl"></div>
+            <% end %>
+          </div>
+          <li class="ur_item">
+            <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input id="poll_question_standard_answer_<%=exercise_question.id %>" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text" value="<%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>">
+          </li>
+          <div class="cl"></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,2);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@ -0,0 +1,33 @@
+<%= form_for @exercise, :remote=>true  do |f| %>
+    <div class="testContainer">
+      <div>
+        <input name="exercise[exercise_name]" maxlength="100" id="exercise_name" class="testTitle mb10" type="text" placeholder="测验标题" value="<%=@exercise.exercise_name%>" />
+      </div>
+      <%# if edit_mode %>
+      <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
+      <%# end %>
+      <div class="calendar_div fl mr10">
+        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if exercise.publish_time %>"  >
+        <%= calendar_for('exercise_publish_time')%>
+      </div>
+      <%# if edit_mode %>
+      <!--<label class="fl c_grey f14" style="margin-top: 4px;">截止日期：</label>-->
+      <%# end %>
+      <div class="calendar_div fl">
+        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"  >
+        <%= calendar_for('exercise_end_time')%>
+      </div>
+      <div class="fl ml10 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" value="<%=exercise.time %>" />分钟</div>
+      <div class="cl"></div>
+      <textarea class="testDes mt10" name="exercise[exercise_description]" id="exercise_description" placeholder="发布须知：试题类型有选择和填空两种，其中选择题包括单选题和多选题。您可以在此处填写测验相关说明。" ><%=exercise.exercise_description %></textarea>
+      <div class="ur_editor_footer" style="padding-top: 10px;">
+        <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
+          保存
+        </a>
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end %>
--- a/app/views/exercise/_edit_single.html.erb
+++ b/app/views/exercise/_edit_single.html.erb
@ -0,0 +1,59 @@
+<%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%>
+    <!--编辑单选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=exercise_question.id%>()
+        {
+            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
+            $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
+            $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>" +
+                    "<input  name='exercise_choice[<%=exercise_choice.id %>]' placeholder='请输入候选答案' type='text' value='<%=exercise_choice.answer_text %>'/>" +
+
+                    "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
+
+    <div class="questionContainer" style="width: 680px;">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
+        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" value="<%=exercise_question.question_title %>">
+      </div>
+      <div class="ur_editor_content">
+        <ul>
+          <li class="ur_item">
+            <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" id="poll_question_score_<%=exercise_question.id %>" name="question_score" style="width:40px; text-align:center; padding-left:0px;" value="<%= exercise_question.question_score %>">分
+          </li>
+          <div class="cl"></div>
+          <div id="poll_answers_<%=exercise_question.id%>">
+            <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
+                <li class="ur_item">
+                  <label>候选答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                  <input  name="exercise_choice[<%=exercise_choice.id %>]" placeholder="请输入候选答案" type="text" value="<%=exercise_choice.answer_text %>"/>
+                  <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+                  <a class="icon_remove" title="删除" onclick="remove_single_answer($(this));"></a>
+                </li>
+                <div class="cl"></div>
+            <% end %>
+          </div>
+          <div class="cl"></div>
+        </ul>
+      </div>
+      <div class="ur_editor_footer">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= exercise_question.id %>,3);">
+          保存
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=exercise_question.id%>();pollQuestionCancel(<%= exercise_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    <!--编辑单选 end-->
+<% end%>
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@ -0,0 +1,61 @@
+<%# has_commit = has_commit_poll?(poll.id ,User.current)%>
+<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
+<% if @is_teacher%>
+    <li title="<%= exercise.exercise_name %>">
+      <div style="width: 310px;float: left;">
+        <%# if has_commit %>
+            <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
+        <%# else %>
+            <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+        <%# end %>
+        <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
+      </div>
+    </li>
+
+    <% if exercise.exercise_status == 1%>
+        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
+    <% else %>
+        <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%></li>
+    <% end%>
+
+    <% if exercise.exercise_status == 1 %>
+        <li><a href="javascript:" class="pollsbtn btn_pu fl ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
+    <% elsif exercise.exercise_status == 2%>
+        <li><a href="javascript:" class="pollsbtn btn_de fl ml5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
+    <% else%>
+        <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
+    <% end%>
+
+    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+
+    <% if exercise.exercise_status == 1 %>
+        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
+    <% else%>
+        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
+    <% end%>
+
+    <%# if exercise.exercise_status == 2 %>
+        <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
+    <%# else %>
+        <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
+    <%# end%>
+
+    <%# if exercise.exercise_status == 1%>
+        <!--<li class="polls_de_grey fr ml5">导出</li>-->
+    <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
+        <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
+    <%# end%>
+
+
+    <li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
+<% else%>
+    <% if exercise.exercise_status == 2%>
+        <%# if has_commit%>
+            <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
+            <li class="pollsbtn_tip fl ml5">已答</li-->
+        <%#else%>
+            <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%#end%>
+    <% end%>
+    <li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
+<% end%>
--- a/app/views/exercise/_exercise_content.html.erb
+++ b/app/views/exercise/_exercise_content.html.erb
@ -0,0 +1,42 @@
+<% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
+<% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
+<% single_question_list = exercise.exercise_questions.where("question_type=3") %>
+<div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">单选题</h3>
+  <% mc_question_list.each do |exercise_question| %>
+      <div id="poll_questions_<%= exercise_question.id%>">
+        <div id="show_poll_questions_<%= exercise_question.id %>">
+          <%= render :partial => 'show_MC', :locals => {:exercise_question => exercise_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= exercise_question.id %>" style="display: none;">
+          <%= render :partial => 'edit_MC', :locals => {:exercise_question => exercise_question} %>
+        </div>
+      </div>
+  <% end %>
+</div>
+<div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">多选题</h3>
+  <% mcq_question_list.each do |exercise_question| %>
+      <div id="poll_questions_<%= exercise_question.id%>">
+        <div id="show_poll_questions_<%= exercise_question.id %>">
+          <%= render :partial => 'show_MCQ', :locals => {:exercise_question => exercise_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= exercise_question.id %>" style="display: none;">
+          <%= render :partial => 'edit_MCQ', :locals => {:exercise_question => exercise_question} %>
+        </div>
+      </div>
+  <% end %>
+</div>
+<div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">填空题</h3>
+  <% single_question_list.each do |exercise_question| %>
+      <div id="poll_questions_<%= exercise_question.id%>">
+        <div id="show_poll_questions_<%= exercise_question.id %>">
+          <%= render :partial => 'show_single', :locals => {:exercise_question => exercise_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= exercise_question.id %>" style="display: none;">
+          <%= render :partial => 'edit_single', :locals => {:exercise_question => exercise_question} %>
+        </div>
+      </div>
+  <% end %>
+</div>
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@ -0,0 +1,194 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+    //编辑问卷描述之后
+    var popWindow ; //弹出框的引用
+    var importPollPopWindow; //选择导入的弹出框引用
+    function edit_head(){
+        $("#polls_description").val($("#polls_description_div").html());
+    }
+    $(function(){
+        //点击空白处
+        $(document).bind('click',function(e){
+            //弹出框非空 不是a标签 点击的不是弹出框 ，那么弹出框就会隐藏
+            if(popWindow && e.target.nodeName != 'A' && !popWindow.is(e.target) && popWindow.has(e.target).length === 0){ // Mark 1
+                popWindow.css('display', 'none');
+            }
+            if(importPollPopWindow && e.target.nodeName != 'A' && !importPollPopWindow.is(e.target) && importPollPopWindow.has(e.target).length === 0){
+                importPollPopWindow.css('display', 'none');
+            }
+        });
+    })
+
+    function dismiss(quest_type,quest_id){
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+    }
+
+    function chooseQuestionType(quest_type,quest_id){
+        //quest_type 分为 mc mcq single multi
+        //quest_id 是quetion的id  下同
+        if(popWindow){
+            popWindow.css('display', 'none');
+        }
+        popWindow = $("#div_"+quest_type+"_"+quest_id);
+        $("#div_"+quest_type+"_"+quest_id).click(function(e){
+            e.stopPropagation(); //组织冒泡到document.body中去
+        });
+        $("#div_"+quest_type+"_"+quest_id).css("position", "absolute");
+
+        $("#div_"+quest_type+"_"+quest_id).css("top", $("#add_"+quest_type+"_"+quest_id).offset().top+30);
+
+        $("#div_"+quest_type+"_"+quest_id).css("left", $("#add_"+quest_type+"_"+quest_id).offset().left-10);
+        if( $("#div_"+quest_type+"_"+quest_id).css('display') == 'block') {
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'none');
+        }
+        else{
+            $("#div_"+quest_type+"_"+quest_id).css('display', 'block');
+        }
+    }
+
+    //选择导入调查问卷
+    function importPoll(){
+        importPollPopWindow = $("#import_poll");
+        $("#import_poll").css("position", "absolute");
+
+        $("#import_poll").css("top", $("#import_btn").offset().top+30);
+
+        $("#import_poll").css("left", $("#import_btn").offset().left-65);
+        $("#import_poll").css("display","block")
+    }
+
+    function remote_import(){
+        importPollPopWindow.css('display', 'none');
+        if($("#import_poll").val() === 0){
+            return;
+        }else{
+            if(confirm("确认导入问卷"+$("#import_poll").find("option:selected").text()+"?")){
+                $("#import_form").submit();
+            }else{
+                return;
+            }
+        }
+
+    }
+
+    //添加标题时确定按钮
+    function add_poll_question(doc,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title").val());
+        var score = $.trim($("#question_score").val());
+        var standard_ans = $.trim($("#question_standard_ans").val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+    //修改标题时确定按钮
+    function edit_poll_question(doc,id,quest_type)
+    {
+        var title = $.trim($("#poll_questions_title_" + id).val());
+        var score = $.trim($("#poll_question_score_"+ id).val());
+        var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
+        if(title.length == 0 || score.length == 0){
+            alert("题目标题/分数不能为空");
+        }else if(quest_type !=3 && standard_ans.length == 0) {
+            alert("标准答案不能为空");
+        }else{
+            doc.parent().parent().parent().submit();}
+    }
+
+    //问卷头
+    function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+    function pollsSubmit(doc){
+        var title = $.trim($("#exercise_name").val());
+        if(title.length == 0){
+            alert("测验标题不能为空");
+        } else if($.trim($("#exercise_publish_time").val()) =="") {
+            alert("发布时间不能为空");
+        } else if($.trim($("#exercise_end_time").val()) =="") {
+            alert("截止时间不能为空");
+        } else if($.trim($("#exercise_time").val()) =="") {
+            alert("考试时长不能为空");
+        } else if(Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
+            alert("截止时间必须大于发布时间");
+        }
+        else {
+            doc.parent().parent().parent().submit();
+        }
+    }
+    function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+    //
+    function pollQuestionCancel(question_id){
+        $("#show_poll_questions_"+question_id).show();
+        $("#edit_poll_questions_"+question_id).hide();
+    }
+    function pollQuestionEdit(question_id){
+        $("#show_poll_questions_"+question_id).hide();
+        $("#edit_poll_questions_"+question_id).show();
+        $("#poll_questions_title_"+question_id).focus();
+    }
+    //单选题
+    function add_single_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='输入选项内容'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function add_candidate_answer(doc)
+    {
+        doc.parent().after("<li class='ur_item'><label>候选答案<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='exercise_choice["+new Date().getTime()+"]' placeholder='请输入候选答案（选填）'/>" +
+                "<a class='icon_add' title='向下插入选项' onclick='add_candidate_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+                "</li><div class='cl'></div>");
+    }
+    function remove_single_answer(doc)
+    {
+        if(doc.parent().siblings("li").length == 0)
+        {
+            alert("选择题至少有一个选项");
+        }
+        else
+        {
+            doc.parent().remove();
+        }
+    }
+</script>
+<div class="homepageRight mt0 ml10">
+<div class="resources">
+  <!-- 头部 -->
+  <div id="polls_head_show"  style="display: none;">
+    <%= render :partial => 'show_head', :locals => {:exercise => @exercise}%>
+  </div>
+  <div id="polls_head_edit">
+    <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
+  </div>
+  <% current_score = get_current_score @exercise %>
+  <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%=current_score %>分</span></div>
+  <!-- 问题 -->
+  <div id="poll_content">
+    <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
+  </div>
+
+  <div class="testQuestion" id="new_exercise_question">
+    <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+  </div><!--选项 end-->
+
+  <!-- 新增问题 -->
+  <div id="new_poll_question">
+  </div>
+
+  <div id="exercise_submit">
+    <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+  </div>
+  <div class="cl"></div>
+  <!--contentbox end-->
+</div>
+</div><!--编辑end-->
--- a/app/views/exercise/_exercise_republish.html.erb
+++ b/app/views/exercise/_exercise_republish.html.erb
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@ -0,0 +1,208 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+        /*start_time = new Date();
+        start_time.setFullYear(<%#=exercise_user.start_at.year%>);
+        start_time.setMonth(<%#=exercise_user.start_at.month%>);
+        start_time.setDate(<%#=exercise_user.start_at.day%>);
+        start_time.setHours(<%#=exercise_user.start_at.hour%>);
+        start_time.setMinutes(<%#=exercise_user.start_at.min%>);
+        start_time.setSeconds(<%#=exercise_user.start_at.sec%>);
+        //alert(start_time);
+        end_time = start_time.getTime()  + 1000*60*<%#=exercise.time %>;
+        getTime(end_time);*/
+    });
+    function getTime(end_time) {
+        //alert(end_time);
+        now = new Date();
+        var total_seconds = (now.getTime() - end_time)/1000;
+        //start = new Date(start_time);
+        //end_time = start_time;
+        //var total_seconds = total_seconds - 1;
+        var hours = total_seconds / 60 / 60;
+        var hoursRound = Math.floor(hours);
+        var minutes = total_seconds /60 - (60 * hoursRound);
+        var minutesRound = Math.floor(minutes);
+        var seconds =  total_seconds - (60 * 60 * hoursRound) - (60 * minutesRound);
+        var secondsRound = Math.round(seconds);
+        $("#rest_hours").html(hoursRound);
+        $("#rest_minutes").html(minutesRound);
+        $("#rest_seconds").html(secondsRound);
+        //if(total_seconds >0) {
+            setTimeout("getTime("+end_time+");", 1000);
+        //}
+    }
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="resources">
+    <div class="testStatus"><!--头部显示 start-->
+      <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
+      <div id="start_time" style="display: none"><%=exercise_user.start_at %></div>
+      <div class="fontGrey2">
+        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s)%></span>
+        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+<!--
+        <span class="fr">剩余时长：<span class="c_red" id="rest_hours"></span>&nbsp;小时&nbsp;<span class="c_red" id="rest_minutes"></span>&nbsp;分钟&nbsp;<span class="c_red" id="rest_seconds"></span>&nbsp;秒</span>
+-->
+      </div>
+      <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+      <div class="cl"></div>
+      <div class="cl"></div>
+    </div>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1").shuffle %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2").shuffle %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3").shuffle %>
+    <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">单选题</h3>
+      <% mc_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table"  style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <script>
+                                  function click_<%= exercise_choice.id %>(obj)
+                                  {
+                                      $.ajax({
+                                          type: "post",
+                                          url: "<%= commit_answer_exercise_path(exercise) %>",
+                                          data: {
+                                              exercise_choice_id: <%= exercise_choice.id %>,
+                                              exercise_question_id: <%= exercise_question.id %>
+                                          },
+                                          success: function (data) {
+                                              var dataObj = eval(data);
+                                              if(dataObj.text == "ok")
+                                              {
+                                                  obj.checked = true;
+                                              }
+                                              else
+                                              {
+                                                  obj.checked = false;
+                                              }
+                                          }
+                                      });
+                                  }
+                              </script>
+                              <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:onclick =>"click_#{exercise_choice.id}(this);return false;",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %>
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">多选题</h3>
+      <% mcq_question_list.each_with_index do |exercise_question,list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table" style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <script>
+                                  function click_<%= exercise_choice.id %>(obj)
+                                  {
+                                      $.ajax({
+                                          type: "post",
+                                          url: "<%= commit_answer_exercise_path(exercise) %>",
+                                          data: {
+                                              exercise_choice_id: <%= exercise_choice.id %>,
+                                              exercise_question_id: <%= exercise_question.id %>
+                                          },
+                                          success: function (data) {
+                                              var dataObj = eval(data);
+                                              if(dataObj.text == "ok")
+                                              {
+                                                  obj.checked = true;
+                                              }
+                                              else
+                                              {
+                                                  obj.checked = false;
+                                              }
+                                          }
+                                      });
+                                  }
+                              </script>
+                              <input class="ur_radio" type="checkbox" onclick="click_<%= exercise_choice.id %>(this);return false;" <%= answer_be_selected?(exercise_choice,User.current) ? "checked":"" %> <%= @can_edit_excercise?"":"disabled=disabled" %> >
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div><!--多选题显示 end-->
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">填空题</h3>
+      <% single_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                </div>
+                <div class="cl"></div>
+                <div>
+                  <script>
+                      function onblur_<%= exercise_question.id %>(obj)
+                      {
+                          $(window).unbind('beforeunload');
+                          $.ajax({
+                              type: "post",
+                              url: "<%= commit_answer_exercise_path(exercise) %>",
+                              data: {
+                                  exercise_question_id: <%= exercise_question.id %> ,
+                                  answer_text: obj.value
+                              },
+                              success: function (data) {
+                                  var dataObj = eval(data);
+                                  obj.value = dataObj.text;
+                              }
+                          });
+
+                      }
+                  </script>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="" onblur="onblur_<%= exercise_question.id %>(this);" <%= @can_edit_excercise?"":"disabled=disabled" %>>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="ur_buttons">
+      <%= link_to l(:button_submit),commit_exercise_exercise_path(exercise), :method => :post,:class => "ur_button_submit",:style => "margin-left:80px;",:format => 'js',:remote=>true %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+  <!--RSide end-->
+</div>
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@ -0,0 +1,137 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="resources">
+    <div class="testStatus"><!--头部显示 start-->
+      <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
+      <div class="fontGrey2">
+        <span class="mr130">开始时间：<%=format_time(exercise_user.start_at.to_s) %></span>
+        <span class="mr130">测验时长：<%=exercise.time %>分钟</span>
+        <%# time = exercise_user.end_at - exercise_user.start_at %>
+        </div>
+      <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+      <div class="cl"></div>
+    </div>
+    <div class="mb5">得分：<span class="c_red"><%=exercise_user.score %>分</span></div>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
+    <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">单选题</h3>
+      <% mc_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <span class="ml15 c_red">
+                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% if answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %>
+                        √
+                    <% else %>
+                        ×
+                    <% end %></span><br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table"  style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <%= radio_button "exercise",exercise_question.id.to_s+"exercise_choice_id",exercise_choice.id,:class=>"ur_radio",:checked => answer_be_selected?(exercise_choice,User.current),:disabled => !@can_edit_excercise %>
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">多选题</h3>
+      <% mcq_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <span class="ml15 c_red">
+                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% if get_mulscore(exercise_question, User.current).to_i == standard_answer.first.exercise_choice_id %>
+                        √
+                    <% else %>
+                        ×
+                    <% end %></span><br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table" style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <input class="ur_radio" type="checkbox" <%= answer_be_selected?(exercise_choice,User.current) ? "checked":"" %> <%= @can_edit_poll?"":"disabled=disabled" %> >
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div><!--多选题显示 end-->
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">填空题</h3>
+      <% single_question_list.each_with_index do |exercise_question,list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <span class="ml15 c_red">
+                    <% answer = get_user_answer(exercise_question, User.current)%>
+                    <% standard_answer = get_user_standard_answer(exercise_question, User.current)%>
+                    <% if standard_answer.include?(answer.first.answer_text) %>
+                        √
+                    <% else %>
+                        ×
+                    <% end %></span><br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div>
+                  <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
+                      候选答案：<%= exercise_choice.answer_text%><br />
+                  <% end %>
+                </div>
+                <div>
+                  <input class="fillInput" placeholder="在此填入答案" type="text" value="<%= get_anwser_vote_text(exercise_question.id,User.current.id).html_safe %>" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+  <!--RSide end-->
+</div>
--- a/app/views/exercise/_exercise_submit.html.erb
+++ b/app/views/exercise/_exercise_submit.html.erb
@ -0,0 +1,37 @@
+<%= form_for('',
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'commit_exercise',
+                      :id => exercise.id
+             },:remote=>true ) do |f| %>
+<div class="ur_buttons">
+  <a class="ur_button_submit" onclick="poll_submit();"> 提交 </a>
+  <div class="polls_cha">
+    <%= f.check_box 'show_result', :value => exercise.show_result%>
+    <%= label_tag '_show_result', '允许学生查看测验结果' %>
+    <!--<input name="exercise[show_result]" value="<%#exercise.show_result %>" type="checkbox" checked="true">
+    <label for="">允许学生查看测验结果</label>-->
+  </div>
+</div>
+<% end %>
+
+<script type="text/javascript">
+    function poll_submit() {
+        var question_form = $("form.new_exercise_question");
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        } else if(question_form.length > 0) {
+            alert("请先保存正在编辑的题目。");
+        } else{
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'exercise_submit_info', locals: { :exercise => exercise}) %>');
+            showModal('ajax-modal', '400px');
+            //$('#ajax-modal').css('height','120px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().removeClass("alert_praise");
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+        }
+    }
+</script>
--- a/app/views/exercise/_exercise_submit_info.html.erb
+++ b/app/views/exercise/_exercise_submit_info.html.erb
@ -0,0 +1,45 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <script type="text/javascript">
+      function clickCanel(){hideModal("#popbox02");}
+      function exercise_submit(){
+          $("#exercise_submit>form")[0].submit();
+          hideModal("#popbox02");
+      }
+  </script>
+</head>
+
+<body>
+<div id="popbox02">
+  <div class="upload_con">
+    <div class="upload_box">
+      <% current_score = get_current_score exercise %>
+      <% question_count = exercise.exercise_questions.count %>
+      <% mc_count = exercise.exercise_questions.where("question_type=1").count %>
+      <% mcq_count = exercise.exercise_questions.where("question_type=2").count %>
+      <% single_count = exercise.exercise_questions.where("question_type=3").count %>
+      <p class="f14">当前测验
+        <% if question_count > 0 %>共有<%= question_count %>道题，其中<% end %>
+        <% if mc_count > 0 %><%= mc_count %>道单选、<% end %>
+        <% if mcq_count > 0 %><%= mcq_count %>道多选、<% end %>
+        <% if single_count > 0%><%= single_count %>道填空,<% end %>
+        总分为<span class="c_red"><%=current_score %></span>分。
+        <br /><br />
+        是否确定提交该测验？
+      </p>
+      <div class="polls_btn_box">
+        <a class="upload_btn" onclick="exercise_submit();">
+          确&nbsp;&nbsp;定
+        </a>
+        <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
+          取&nbsp;&nbsp;消
+        </a>
+      </div>
+      <div class="cl"></div>
+    </div>
+  </div>
+</div>
+</body>
+</html>
+
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@ -0,0 +1,121 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="resources">
+    <div class="testStatus"><!--头部显示 start-->
+      <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
+      <div class="fontGrey2">
+        <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
+        <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+      </div>
+      <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+      <div class="cl"></div>
+    </div>
+    <% mc_question_list = exercise.exercise_questions.where("question_type=1") %>
+    <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %>
+    <% single_question_list = exercise.exercise_questions.where("question_type=3") %>
+    <div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">单选题</h3>
+      <% mc_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table"  style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">多选题</h3>
+      <% mcq_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table" style="width:675px;">
+                    <tbody>
+                    <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+                        <tr>
+                          <td>
+                            <label>
+                              <input class="ur_radio" type="checkbox" name="<%= exercise_question  %>" value="<%= exercise_choice.choice_text%>" >
+                              <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </div><!--多选题显示 end-->
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
+      <h3 class="fontGrey3">填空题</h3>
+      <% single_question_list.each_with_index do |exercise_question, list_index| %>
+          <div id="poll_questions_<%= exercise_question.id%>">
+            <div id="show_poll_questions_<%= exercise_question.id %>">
+              <div>
+                <div class="testEditTitle"> 第<%= list_index+1%>题：<%= exercise_question.question_title %>&nbsp;&nbsp;(<%= exercise_question.question_score %>分)
+                  <br />
+                  标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>
+                </div>
+                <div class="cl"></div>
+                <div>
+                  <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
+                      候选答案：<%= exercise_choice.answer_text%><br />
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div>
+    <div class="ur_buttons">
+      <%= link_to "确定",exercise_index_path(:course_id => @course.id),:class => "ur_button_submit" %>
+      <% if exercise.exercise_status == 1 %>
+        <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "ur_button_submit", :style => "float:right"%>
+      <% else %>
+        <span class="ur_button_submit" style="float:right; background:#a3a3a3" title="测验已发布，不可再编辑">编辑</span>
+        <%#= link_to l(:button_edit), '', :class => "ur_button_submit", :style => "float:right; background:#a3a3a3"%>
+      <% end %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
+  </div>
+  <!--RSide end-->
+</div>
--- a/app/views/exercise/_exercises_list.html.erb
+++ b/app/views/exercise/_exercises_list.html.erb
@ -0,0 +1,25 @@
+<div class="polls_head">
+  <h2>所有试卷
+    <span>（<%= @obj_count%>）</span>
+  </h2>
+  <% if @is_teacher%>
+      <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
+      <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
+  <% end%>
+</div>
+<div class="cl"></div>
+<div id="polls_list" class="polls_list">
+
+  <% @exercises.each do |exercise|%>
+      <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
+        <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
+      </ul>
+      <div class="cl"></div>
+  <% end%>
+
+  <ul class="wlist">
+    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+  </ul>
+
+  <div class="cl"></div>
+</div><!--列表end-->
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@ -0,0 +1,60 @@
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="1" type="hidden">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %>
+         <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+         <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A，在此输入A即可" type="text">
+      </li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);"> 保存 </a>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  </div>
+  <div class="cl"></div>
+</div>
+<% end %>
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@ -0,0 +1,60 @@
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="2" type="hidden">
+    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %>
+        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_score" value="<%=score %>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'>
+        <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_standard_ans" name="exercise_choice" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">
+      </li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);"> 保存 </a>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  </div>
+  <div class="cl"></div>
+</div>
+<% end %>
--- a/app/views/exercise/_new_question.html.erb
+++ b/app/views/exercise/_new_question.html.erb
@ -0,0 +1,45 @@
+<ul class="tabs_list">
+  <li class="tab_item02 mr118"> <a title="单选题" class="tab_icon icon_radio" onclick="add_MC();"> 新建单选题 </a> </li>
+  <li class="tab_item02 mr118"> <a title="多选题" class=" tab_icon icon_checkbox" onclick="add_MCQ();"> 新建多选题 </a> </li>
+  <li class="tab_item02 "> <a title="单行主观" class="tab_icon icon_text" onclick="add_single();"> 新建填空题 </a> </li>
+</ul>
+<div class="cl"></div>
+
+<script type="text/javascript">
+    function add_MC(){
+        var forms = $("form.new_exercise_question");
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
+    }
+
+    function add_MCQ(){
+        var forms = $("form.new_exercise_question");
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
+    }
+
+    function add_single(){
+        var forms = $("form.new_exercise_question");
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        }else if(forms.length > 0){
+            alert("请先保存正在编辑的题目再新建。");
+        } else{
+            $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single', :locals => {:exercise=>exercise}) %>");
+            $("#poll_questions_title").focus();
+        }
+    }
+
+</script>
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@ -0,0 +1,48 @@
+<%= form_for(ExerciseQuestion.new,
+             :html => { :multipart => true },
+             :url=>create_exercise_question_exercise_path(exercise.id),
+             :remote=>true ) do |f| %>
+<div class="questionContainer">
+  <div class="ur_editor_title">
+    <label>问题：&nbsp;&nbsp;</label>
+    <input name="question_type" value="3" type="hidden">
+    <input maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
+  </div>
+  <div class="ur_editor_content">
+    <ul>
+      <li class="ur_item">
+        <% score = exercise.exercise_questions.where("question_type=3").last.nil? ? "": exercise.exercise_questions.where("question_type=3").last.question_score %>
+        <label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input id="question_score" value="<%= score%>" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;">分
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input  name="exercise_choice[0]" placeholder="请输入候选答案一" type="text">
+        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input  name="exercise_choice[1]" placeholder="请输入候选答案二（选填）" type="text">
+        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+      <li class="ur_item">
+        <label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+        <input  name="exercise_choice[2]" placeholder="请输入候选答案三（选填）" type="text">
+        <a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>
+        <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+      </li>
+      <div class="cl"></div>
+    </ul>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);"> 保存 </a>
+    <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();"> 取消 </a>
+  </div>
+  <div class="cl"></div>
+</div>
+<% end %>
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@ -0,0 +1,111 @@
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+  </div>
+
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table"  style="width:675px;">
+      <tbody>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--单选题显示 end-->
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
+</div>
+
+<script type="text/javascript">
+    function insert_MC(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else{
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="1"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A，在此输入A即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),1);">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title").focus();
+                }
+       }
+        else {
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+        }
+    }
+</script>
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@ -0,0 +1,109 @@
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+    <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
+  </div>
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_mcq_<%=exercise_question.id%>" onclick="dismiss('mcq',<%=exercise_question.id%>);insert_MCQ('mcq',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" style="width:675px;">
+      <tbody>
+      <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
+          <tr>
+            <td>
+              <label>
+                <input class="ur_radio" type="checkbox" name="<%= exercise_question  %>" value="<%= exercise_choice.choice_text%>" >
+                <%= convert_to_char((index+1).to_s)%>&nbsp;&nbsp;<%= exercise_choice.choice_text%>
+              </label>
+            </td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+</div><!--多选题显示 end-->
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_mcq_<%=exercise_question.id%>">
+</div>
+
+<script type="text/javascript">
+    function insert_MCQ(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == ""){
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else {
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="2"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>标准答案<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input name="exercise_choice" id="question_standard_ans" placeholder="若标准答案为A,B,C，在答案输入框填入ABC即可" type="text">'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),2);">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title").focus();
+        }
+        }else {
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+        }
+    }
+</script>
--- a/app/views/exercise/_show_head.html.erb
+++ b/app/views/exercise/_show_head.html.erb
@ -0,0 +1,12 @@
+<div class="testStatus"><!--头部显示 start-->
+  <a href="javascript:" class="testEdit" title="编辑" onclick="pollsEdit();"></a>
+  <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
+  <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
+  <div class="fontGrey2">
+    <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
+    <span>测验时长：<%= exercise.time %>分钟</span></div>
+  <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
+  <div class="cl"></div>
+  <div class="cl"></div>
+</div>
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@ -0,0 +1,85 @@
+<div>
+  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
+    <%= exercise_question.question_title %>
+  </div>
+  <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
+              method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de") %>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
+  <a class='ur_icon_add' title='向下插入' id="add_single_<%=exercise_question.id%>" onclick="dismiss('single',<%=exercise_question.id%>);insert_SINGLE('single',<%=exercise_question.question_number%>,<%=exercise_question.id%>);"></a>
+  <div class="cl"></div>
+  <div>
+    <% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>
+        候选答案：<%= exercise_choice.answer_text%><br />
+    <% end %>
+  </div>
+</div>
+<!-- 新增问题 -->
+<div id="insert_new_poll_question_single_<%=exercise_question.id%>">
+</div>
+
+<script type="text/javascript">
+    function insert_SINGLE(quest_type,quest_num,quest_id){
+        var forms = $("form.new_exercise_question");
+        if($.trim($("#insert_new_poll_question_"+quest_type+"_"+quest_id).html()) == "") {
+            if(forms.length > 0){
+                alert("请先保存正在编辑的题目再新建。");
+            } else {
+                <% score =exercise_question.question_score %>
+                $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(
+                                '<%= form_for(ExerciseQuestion.new,:html=>{:multipart=>true},:url=>create_exercise_question_exercise_path(exercise_question.exercise.id),:remote=>true) do |f|%>'+
+                                ' <div class="questionContainer" style="width: 680px;"> '+
+                                '<div class="ur_editor_title"> '+
+                                '<label>问题：&nbsp;&nbsp;</label>'+
+                                '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
+                                '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
+                                '<input type="hidden" name="question_type" value="3"/>'+
+                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
+                                '</div>'+
+                                '<div class="ur_editor_content">'+
+                                '<ul>'+
+                                '<li class="ur_item">'+
+                                '<label>分数<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input value="<%= score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
+                                '</li>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案一<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="text" name="exercise_choice[0]" placeholder="请输入候选答案一"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案二<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input type="text" name="exercise_choice[1]" placeholder="请输入候选答案二（选填）"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '<li class="ur_item">'+
+                                '<label>候选答案三<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<input maxlength="200" type="text" name="exercise_choice[2]" placeholder="请输入候选答案三（选填）"/>'+
+                                '<a class="icon_add" title="向下插入选项" onclick="add_candidate_answer($(this));"></a>'+
+                                '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
+                                '</li>'+
+                                '<div class="cl"></div>'+
+                                '</ul>'+
+                                '</div>'+
+                                '<div class="ur_editor_footer">'+
+                                '<a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this),3);">'+
+                                '保存'+
+                                '</a>'+
+                                '<a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">'+
+                                '<%= l(:button_cancel)%>'+
+                                '</a>'+
+                                '</div>'+
+                                '<div class="cl"></div>'+
+                                '</div>'+
+                                '<% end%>'
+                );
+                $("#poll_questions_title").focus();
+            }
+        } else {
+            $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");
+        }
+    }
+</script>
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@ -0,0 +1,73 @@
+<div class="fl" style="padding-bottom:10px; width:720px;">
+  <span class="c_dark f14 fb fl mr30">
+      测验
+      <font class="f12 c_red">
+        (<%= @exercise_count%>人已交)
+      </font>
+    <% if !@is_teacher && @exercise_users_list.empty?%>
+       <span class="f12 c_red">您尚未提交</span>
+    <% elsif !@is_teacher && !@exercise_users_list.empty?%>
+       <span class="f12 c_red">您已提交</span>
+    <% end %>
+  </span>
+  <%#if @is_teacher || @exercise.exercise_status == 3%>
+      <!--<div class="hworkSearchBox">
+        <input type="text" id="course_student_name" value="<%#= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%#= student_work_index_path(:homework => @homework.id)%>',event);"/>
+        <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%#= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
+      </div>-->
+      <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
+  <%# end%>
+  <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" style="display: none">[ 显示测验信息 ]</a> </span>
+</div>
+<div class="cl"></div>
+
+<div class="fl">
+  <%= render :partial => "student_table"%>
+</div>
+<div class="cl"></div>
+
+<% @exercise_users_list.each do |exercise|%>
+    <script type="text/javascript">
+        $(".student_work_<%= exercise.id%>").mouseenter(function(){
+            $("#work_click_<%= exercise.id%>").show();
+        }).mouseleave(function(){
+            $("#work_click_<%= exercise.id%>").hide();
+        });
+    </script>
+    <ul class="hworkListRow" id="student_work_<%= exercise.id%>">
+      <li class="hworkList340 width530">
+        <ul>
+          <li class="hworkPortrait mt15 mr10">
+            <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %>
+          </li>
+          <div onclick="" style="cursor: pointer;" class="student_work_<%= exercise.id%>">
+            <li>
+              <ul class="mt10 fl">
+                <li class="hworkStName mr15 mt16" title="姓名">
+                  <%= exercise.user.show_name%>
+                </li>
+                <li class="hworkStID mr10 mt16" title="学号">
+                  <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%>
+                </li>
+                <li class="hworkStID mt16" title="班级">
+                  --
+                </li>
+              </ul>
+            </li>
+          </div>
+        </ul>
+      </li>
+      <li class="hworkList130 c_grey student_work_<%= exercise.id%>" onclick="" style="cursor: pointer;">
+        <% if exercise.created_at%>
+            <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+        <% end %>
+      </li>
+
+      <li class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
+        <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
+      </li>
+      <li class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+    </ul>
+
+    <div class="cl"></div>
+<% end%>
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@ -0,0 +1,22 @@
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 width530">
+    <span class="c_dark f14 fb fl mr55">&nbsp;&nbsp;</span>
+    <span class="c_dark f14 fb fl mr60">姓名</span>
+    <span class="c_dark f14 fb fl mr60">学号</span>
+    <span class="c_dark f14 fb fl">班级</span>
+  </li>
+
+  <li class="hworkList130 hworkH30">
+    <%= link_to "时间",'',:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+    <%# if @show_all && @order == "created_at"%>
+        <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <%# end%>
+  </li>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "成绩",'',:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <%# if @show_all && @order == "score"%>
+        <%#= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <%# end%>
+  </li>
+</ul>
--- a/app/views/exercise/commit_exercise.js.erb
+++ b/app/views/exercise/commit_exercise.js.erb
@ -0,0 +1,9 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
+showModal('ajax-modal', '270px');
+$('#ajax-modal').css('height','110px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("alert_box");
--- a/app/views/exercise/create.js.erb
+++ b/app/views/exercise/create.js.erb
@ -0,0 +1,4 @@
+$("#polls_head_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:exercise => @exercise}) %>");
+$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:exercise => @exercise}) %>");
+$("#polls_head_edit").hide();
+$("#polls_head_show").show();
--- a/app/views/exercise/create_exercise_question.js.erb
+++ b/app/views/exercise/create_exercise_question.js.erb
@ -0,0 +1,42 @@
+<% if @is_insert %>
+    $("#poll_content").html('<%=  escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise})%>');
+    $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>");
+    $("#current_score_div").show();
+    $("#current_score").html("<%=get_current_score @exercise %>分");
+<% else %>
+    $("#new_exercise_question").html('<%= escape_javascript(render :partial => 'new_question', :locals => {:exercise => @exercise}) %>');
+    $("#new_poll_question").html("");
+    $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>");
+    <%if @exercise_questions.question_type == 1%>
+        $("#mc_question_list").show().append("<div id='poll_questions_<%= @exercise_questions.id%>'>" +
+                "<div id='show_poll_questions_<%= @exercise_questions.id %>'>" +
+                "<%= escape_javascript(render :partial => 'show_MC', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "<div id='edit_poll_questions_<%= @exercise_questions.id %>' style='display: none;'>" +
+                "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "</div>");
+    <% end %>
+    <%if @exercise_questions.question_type == 2%>
+        $("#mcq_question_list").show().append("<div id='poll_questions_<%= @exercise_questions.id%>'>" +
+                "<div id='show_poll_questions_<%= @exercise_questions.id %>'>" +
+                "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "<div id='edit_poll_questions_<%= @exercise_questions.id %>' style='display: none;'>" +
+                "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "</div>");
+    <% end %>
+    <%if @exercise_questions.question_type == 3%>
+        $("#single_question_list").show().append("<div id='poll_questions_<%= @exercise_questions.id%>'>" +
+                "<div id='show_poll_questions_<%= @exercise_questions.id %>'>" +
+                "<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "<div id='edit_poll_questions_<%= @exercise_questions.id %>' style='display: none;'>" +
+                "<%= escape_javascript(render :partial => 'edit_single', :locals => {:exercise_question => @exercise_questions}) %>" +
+                "</div>" +
+                "</div>");
+    <% end %>
+$("#current_score_div").show();
+$("#current_score").html("<%=get_current_score @exercise %>分");
+<% end %>
--- a/app/views/exercise/delete_exercise_question.js.erb
+++ b/app/views/exercise/delete_exercise_question.js.erb
@ -0,0 +1,3 @@
+$("#poll_content").html("<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise}) %>");
+$("#current_score").html("<%=get_current_score @exercise %>分");
+$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>");
--- a/app/views/exercise/destroy.js.erb
+++ b/app/views/exercise/destroy.js.erb
@ -0,0 +1 @@
+$("#exercise").html("<%= escape_javascript(render :partial => 'exercises_list') %>");
--- a/app/views/exercise/edit.html.erb
+++ b/app/views/exercise/edit.html.erb
@ -0,0 +1 @@
+<%= render :partial => 'exercise_form'%>
--- a/app/views/exercise/index.html.erb
+++ b/app/views/exercise/index.html.erb
@ -0,0 +1,63 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    function republish_exercise(exercise_id)
+    {
+        $('#ajax-modal').html("<div id='popbox02'>" +
+                "<div class='upload_con'>" +
+                "<div class='upload_box'>" +
+                "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
+                "<div class='polls_btn_box'>" +
+                "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                "</div>" +
+                "<div class='cl'></div>" +
+                "</div>" +
+                "</div>" +
+                "</div>");
+        showModal('ajax-modal', '310px');
+        $('#ajax-modal').css('height','120px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().removeClass("alert_praise");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function clickCanel(){hideModal("#popbox02");}
+
+    function exercise_submit(exercise_id,exercise_name)
+    {
+        if(exercise_name == 0)
+        {
+            alert("试卷标题不能为空");
+        }
+        else
+        {
+            $('#ajax-modal').html("<div id='popbox02'>" +
+                    "<div class='upload_con'>" +
+                    "<div class='upload_box'>" +
+                    "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
+                    "<div class='polls_btn_box'>" +
+                    "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                    "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "</div>" +
+                    "<div class='cl'></div>" +
+                    "</div>" +
+                    "</div>" +
+                    "</div>");
+            showModal('ajax-modal', '310px');
+            $('#ajax-modal').css('height','120px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+            $('#ajax-modal').parent().removeClass("alert_praise");
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+        }
+    }
+
+</script>
+<div class="polls_content02" id="exercise">
+  <%= render :partial => 'exercises_list'%>
+</div><!--问卷内容end-->
--- a/app/views/exercise/new.html.erb
+++ b/app/views/exercise/new.html.erb
@ -0,0 +1 @@
+<%= render :partial => 'exercise_form'%>
--- a/app/views/exercise/publish_exercise.js.erb
+++ b/app/views/exercise/publish_exercise.js.erb
@ -0,0 +1,10 @@
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
+showModal('ajax-modal', '250px');
+//$('#ajax-modal').css('height','111px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("poll_alert_form");
--- a/app/views/exercise/republish_exercise.js.erb
+++ b/app/views/exercise/republish_exercise.js.erb
@ -0,0 +1,10 @@
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise}) %>");
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
+showModal('ajax-modal', '250px');
+//$('#ajax-modal').css('height','80px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='close_alert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("poll_alert_form");
--- a/app/views/exercise/show.html.erb
+++ b/app/views/exercise/show.html.erb
@ -0,0 +1,10 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<% if @is_teacher %>
+    <%= render :partial => 'exercise_teacher', :locals =>{:exercise =>@exercise, :exercise_questions => @exercise_questions} %>
+<% else %>
+    <% if @can_edit_excercise %>
+        <%=render :partial => 'exercise_student', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %>
+    <% else %>
+        <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %>
+    <% end %>
+<% end %>
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@ -0,0 +1,138 @@
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+        $("#Container").css("width","1000px");
+    });
+
+    // 匿评弹框提示
+    <%# if @is_evaluation && !@stundet_works.empty?%>
+    //      $(function(){
+    //          $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'student_work/praise_alert') %>');
+    //          showModal('ajax-modal', '500px');
+    //          $('#ajax-modal').siblings().remove();
+    //          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+    //          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    //          $('#ajax-modal').parent().css("top","").css("left","");
+    //          $('#ajax-modal').parent().addClass("anonymos");
+    //      });
+    <%# end%>
+
+    //设置评分规则
+    function set_score_rule(){
+        $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework,:student_path => true}) %>');
+        showModal('ajax-modal', '350px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
+    }
+
+    $(function(){
+        $("#homework_info_hidden").click(function(){
+            $("#homeworkInformation").hide();
+            $("#homework_info_hidden").hide();
+            $("#homework_info_show").show();
+        });
+        $("#homework_info_show").click(function(){
+            $("#homework_info_show").hide();
+            $("#homeworkInformation").show();
+            $("#homework_info_hidden").show();
+        });
+
+        if($("#homework_description").height() > 54) {
+            $("#homeworkDetailShow").show();
+        }
+        $("#homeworkDetailShow").click(function(){
+            $("#homeworkDetail").toggleClass("max_h54");
+            $("#homeworkDetailShow").hide();
+            $("#homeworkDetailHide").show();
+        });
+        $("#homeworkDetailHide").click(function(){
+            $("#homeworkDetail").toggleClass("max_h54");
+            $("#homeworkDetailHide").hide();
+            $("#homeworkDetailShow").show();
+        });
+    });
+
+</script>
+
+<div class="homepageRight mt0 ml10">
+  <div class="resources" id="homework_page_right">
+    <div class="hworkListBanner">
+      <div id="menu_r" class="fl">
+        <ul class="menu_r">
+          <li>
+            <a href="javascript:void(0);" class="parent">
+              <% @all_exercises.each_with_index do |exercise,index |%>
+                  <% if exercise.id == @exercise.id %>
+                      <%="测验 #{@all_exercises.count - index}"  %>
+                  <% end %>
+              <% end%>
+            </a>
+            <ul>
+              <% @all_exercises.each_with_index do |exercise,index |%>
+                  <li class="pr10">
+                    <%= link_to "作业#{@all_exercises.count - index}：#{exercise.exercise_name}",''%>
+                    <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
+                  </li>
+              <% end%>
+            </ul>
+          </li>
+          <!---level1 end--->
+        </ul>
+        <!---menu_r end--->
+      </div>
+      <!--div class="hworkInfor"><a href="javascript:void(0);" class="linkBlue">作业信息</a></div-->
+      <div class="cl"></div>
+    </div>
+
+    <div class="homeworkInfo" id="homeworkInformation">
+      <div class="">
+        <div class="homepagePostTitle fl hidden m_w460" title="<%= @exercise.exercise_name %>"><%= @exercise.exercise_name %></div>
+            <% if @exercise.exercise_status == 1 %>
+                <span class="grey_homework_btn_cir ml5">未发布</span>
+            <% elsif @exercise.exercise_status == 2 %>
+                <span class="green_homework_btn_cir ml5">已发布</span>
+            <% elsif @exercise.exercise_status == 3 %>
+                <span class="grey_homework_btn_cir ml5">已截止</span>
+            <% end%>
+        <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_hidden">[ 隐藏测验信息 ]</a> </span>
+        <div class="cl"></div>
+        <div class="fontGrey2 db mb5">发布者：<%= @exercise.user.show_name %></div>
+        <div class="homeworkDetail upload_img break_word list_style max_h54" id="homeworkDetail">
+          <div id="homework_description"><%= @exercise.exercise_description.html_safe %></div>
+        </div>
+        <div id="homeworkDetailShow" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+        <div id="homeworkDetailHide" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <div class="fontGrey2 db fl">截止时间：<%= format_time @exercise.end_time %></div>
+          <% if @exercise.exercise_status == 1 %>
+              <div class="fontGrey2 db fl ml10">发布时间：<%= format_time @exercise.publish_time %></div>
+          <% end %>
+              <% end_time = @exercise.end_time.to_time.to_i %>
+              <% if end_time > Time.now.to_i %>
+                  <div class="fontGrey2 db fr">提交剩余时间： <span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
+                    <span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
+                    <span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分</div>
+              <% else %>
+                  <div class="fontGrey2 db fr c_red">提交已截止</div>
+              <% end %>
+          <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+
+    <div class="hworkListContainer">
+      <div class="ctt2">
+        <div class="dis" id="homework_student_work_list">
+          <%= render :partial => "exercise/student_exercise"%>
+        </div>
+      </div>
+    </div>
+
+    <div class="cl"></div>
+  </div>
+</div>
+<div class="cl"></div>
--- a/app/views/exercise/update.js.erb
+++ b/app/views/exercise/update.js.erb
@ -0,0 +1,5 @@
+$("#polls_head_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:exercise => @exercise}) %>");
+$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:exercise => @exercise}) %>");
+$("#polls_head_edit").hide();
+$("#polls_head_show").show();
+$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>");
--- a/app/views/exercise/update_exercise_question.js.erb
+++ b/app/views/exercise/update_exercise_question.js.erb
@ -0,0 +1,20 @@
+$("#poll_questions_<%= @exercise_question.id%>").html("<div id='show_poll_questions_<%= @exercise_question.id %>'>" +
+        "<% if @exercise_question.question_type == 1%>" +
+        "<%= escape_javascript(render :partial => 'show_MC', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% elsif @exercise_question.question_type == 2%>" +
+        "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% elsif @exercise_question.question_type == 3%>" +
+        "<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% end%>" +
+        "</div>" +
+        "<div id='edit_poll_questions_<%= @exercise_question.id %>' style='display: none;'>" +
+        "<% if @exercise_question.question_type == 1%>" +
+        "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% elsif @exercise_question.question_type == 2%>" +
+        "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% elsif @exercise_question.question_type == 3%>" +
+        "<%= escape_javascript(render :partial => 'edit_single', :locals => {:exercise_question => @exercise_question}) %>" +
+        "<% end%>" +
+        "</div>");
+$("#current_score").html("<%=get_current_score @exercise_question.exercise %>分");
+$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise_question.exercise}) %>");
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@ -72,7 +72,7 @@
          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
      <% end %>
-      <% if is_course_teacher(User.current,@course) %>  <!-- show_window('light','fade','20%','35%')-->
+      <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>  <!-- show_window('light','fade','20%','35%')-->
          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
          <p class="c_grey fr mt10 mr5">
            上传：
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@ -32,7 +32,7 @@
                  <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                      <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>

-                      <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
+                      <% if delete_allowed  && file.container_id == @course.id && file.container_type == "Course"  %>
                        <% if @course.is_public? %>
                          <span id="is_public_<%= file.id %>">
                            <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
@ -57,7 +57,7 @@
            <div class="mt5">
              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
              <%= link_to( l(:button_delete), attachment_path(file),
-                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"%>
              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
            </div>
            <div class="cl"></div>
--- a/app/views/issues/add_journal_in_org.js.erb
+++ b/app/views/issues/add_journal_in_org.js.erb
@ -0,0 +1,3 @@
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
--- a/app/views/layouts/_org_courses.html.erb
+++ b/app/views/layouts/_org_courses.html.erb
@ -0,0 +1,12 @@
+<% courses.each do |course|%>
+    <%# pro = Project.find course.course_id %>
+    <li class="homepageLeftMenuCoursesLine">
+      <%= link_to course.name, course_path(course.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => course.name%>
+    </li>
+<% end %>
+<% if courses.size == 5%>
+    <li class="homepageLeftMenuMore" id="show_more_org_course">
+      <input type="hidden" value="<%= page%>" id="org_course_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_course('<%=  more_org_courses_organization_path(org_id)%>');"></a>
+    </li>
+<% end%>
--- a/app/views/layouts/_org_projects.html.erb
+++ b/app/views/layouts/_org_projects.html.erb
@ -1,7 +1,7 @@
 <% projects.each do |project|%>
-    <% pro = Project.find project.project_id %>
+    <%# pro = Project.find project.project_id %>
    <li class="homepageLeftMenuCoursesLine">
-      <%= link_to pro.name, project_path(pro.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => pro.name%>
+      <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :class => "coursesLineGrey hidden", :title => project.name%>
    </li>
 <% end %>
 <% if projects.size == 5%>
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@ -18,6 +18,18 @@
 <!-- page specific tags -->
 <%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
 </head>
 <body class="<%=h body_css_classes %>" onload="prettyPrint();">

--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -21,6 +21,22 @@
  <%= javascript_include_tag "course","header","attachments",'prettify' %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!--<script type="text/javascript"-->
+          <!--src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">-->
+  <!--</script>-->
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
@ -138,7 +154,7 @@
        <div class="subNav">
          <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
          <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
-          <% if is_teacher %>
+          <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
              <!--link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white')-->
              <a class="subnav_green ml95 c_white" href="javascript:void(0);" onclick="course_files_upload();">+上传资源 </a>
          <% end %>
@ -157,6 +173,11 @@
          <%= link_to "(#{course_poll_count})", poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => "subnav_num c_orange" %>
          <%= link_to( "+#{l(:label_new_poll)}", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        </div>
+        <div class="subNav">
+          <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02"%>
+          <%= link_to "(#{User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count})", exercise_index_path(:course_id => @course.id), :class => "subnav_num c_orange" %>
+          <%= link_to( "+新建试卷", new_exercise_path(:course_id => @course.id), :class => 'subnav_green c_white') if is_teacher %>
+        </div>
      </div><!--项目侧导航 end-->
      <div class="cl"></div>
      <div class="project_intro">
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@ -16,6 +16,18 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<%= yield :header_tags -%>
      <%= stylesheet_link_tag 'base','header','new_user', :media => 'all'%>
+      <!-- MathJax的配置 -->
+      <script type="text/javascript"
+              src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+      </script>
+      <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+      <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
      <script>
        var desc;
        function edit_desc(){
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@ -22,6 +22,18 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>
+      <!-- MathJax的配置 -->
+      <script type="text/javascript"
+              src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+      </script>
+      <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+      <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>

        <style>
          .span_wping{}
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@ -16,6 +16,18 @@
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <!--add by huang-->
 <body class="<%= h body_css_classes %>">
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@ -86,17 +86,25 @@
            <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
          </div>
          <div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">项目</a>
-            <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
-          </div>
+          <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
+        </div>
          <div class="homepageLeftMenuCourses borderBottomNone">
            <ul >
-              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.org_projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
+              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
              <!--<%#= @organization.org_projects.each do |p|%>-->
              <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
              <!--<%# end %>-->
              <!--<li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>-->
            </ul>
          </div>
+          <div class="homepageLeftMenuBlock"><a href="javascript:void(0);" class="homepageMenuText">课程</a>
+            <!--<a href="javascript:void(0);" class="homepageMenuSetting fr" title="关联您的已有项目"></a>-->
+          </div>
+          <div class="homepageLeftMenuCourses borderBottomNone">
+            <ul >
+              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
+            </ul>
+          </div>
        </div>
      </div>
      <div class="homepageRight">
@ -112,6 +120,11 @@
    <div class="cl"></div>
    <%= render :partial => 'layouts/footer' %>
    <div class="cl"></div>
+    <div id="ajax-modal" style="display:none;"></div>
+
+    <div id="ajax-indicator" style="display:none;">
+      <span><%= l(:label_loading) %></span>
+    </div>
 </body>
 </html>

--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@ -17,7 +17,18 @@
  <%= call_hook :view_layouts_base_html_head %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
-
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>

 </head>
 <!--add by huang-->
--- a/app/views/layouts/base_tags.html.erb
+++ b/app/views/layouts/base_tags.html.erb
@ -21,6 +21,18 @@
 <!-- page specific tags -->
 <%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <body class="<%=h body_css_classes %>">

--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@ -21,6 +21,18 @@
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>
+      <!-- MathJax的配置 -->
+      <script type="text/javascript"
+              src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+      </script>
+      <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+      <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>

        <script type="text/javascript">
          function startXMLHttp()
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@ -22,7 +22,18 @@
 <%= call_hook :view_layouts_base_html_head %>
 <%= yield :header_tags -%>

-
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>

 </head>
 <body onload="prettyPrint();">
--- a/app/views/layouts/contest_base.html.erb
+++ b/app/views/layouts/contest_base.html.erb
@ -20,6 +20,18 @@
  <%= call_hook :view_layouts_base_html_head %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <body class="<%=h body_css_classes %>">
 <div id="wrapper">
--- a/app/views/layouts/course_base.html.erb
+++ b/app/views/layouts/course_base.html.erb
@ -22,6 +22,18 @@
  <!-- page specific tags -->
  <%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <body class="<%=h body_css_classes %>">
 <div class="cl"></div>
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@ -14,6 +14,18 @@
  <%= heads_for_theme %>
  <%= call_hook :view_layouts_base_html_head %>
  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <div class="navContainer">
    <% is_current_user = User.current.logged? && User.current == @user%>
--- a/app/views/layouts/new_base.html.erb
+++ b/app/views/layouts/new_base.html.erb
@ -17,6 +17,18 @@
  <%= javascript_include_tag "course","header",'prettify' %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+        MathJax.Hub.Config({
+        showMathMenu: false,
+        showMathMenuMSIE: false,
+          tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+        });
+      </script>
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -14,6 +14,19 @@
  <%= heads_for_theme %>
  <%= call_hook :view_layouts_base_html_head %>
  <%= yield :header_tags -%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
 </head>

 <body onload="prettyPrint();">
--- a/app/views/layouts/static_base.html.erb
+++ b/app/views/layouts/static_base.html.erb
@ -17,6 +17,18 @@
  <!-- page specific tags -->
  <%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
 </head>
 <body>
 <div class="cl"></div>
--- a/app/views/layouts/users_base.html.erb
+++ b/app/views/layouts/users_base.html.erb
@ -17,6 +17,18 @@
  <!-- page specific tags -->
  <%= yield :header_tags -%>
  <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
+  <!-- MathJax的配置 -->
+  <script type="text/javascript"
+          src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+  </script>
+  <!-- 配置 ： 在生成的公式图片上去掉Math定义的右键菜单，$$ $$ \( \) \[ \] 中的公式给予显示-->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+    showMathMenu: false,
+    showMathMenuMSIE: false,
+      tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
+    });
+  </script>
 </head>
 <body onload="prettyPrint();">
 <div class="cl"></div>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`$("#exercise").html("<%= escape_javascript(render :partial => 'exercises_list') %>");`