Merge branch 'szzh' into develop

2015-06-03 16:28:42 +08:00 · 2015-06-03 16:28:42 +08:00 · e436989519
parent 742ac5e7db 442c991500
commit e436989519
95 changed files with 4655 additions and 2320 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@
 *.swp
 /config/database.yml
 /config/configuration.yml
+/config/additional_environment.rb

 /files/*
 /log/*
--- a/5
+++ b/5
@ -6,10 +6,7 @@ unless RUBY_PLATFORM =~ /w32/
  gem 'iconv'
 end

-source 'http://rubygems.oneapm.com' do
-    gem 'oneapm_rpm'
-end
-
+gem 'rest-client'
 gem "mysql2", "= 0.3.18"
 gem 'redis-rails'
 gem 'rubyzip'
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@ -65,19 +65,22 @@ class AttachmentsController < ApplicationController
  def download
    # modify by nwb
    # 下载添加权限设置
-     candown = attachment_candown @attachment
+    candown = attachment_candown @attachment
    if candown || User.current.admin? || User.current.id == @attachment.author_id
      @attachment.increment_download
      if stale?(:etag => @attachment.digest)
-        send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                  :type => detect_content_type(@attachment),
-                  :disposition => 'attachment'    #inline can open in browser
+        convered_file = File.join(Rails.root, "files", "convered_office", @attachment.disk_filename + ".html")
+        if File.exist?(convered_file)
+          send_file convered_file,  :type => 'text/html; charset=utf-8', :disposition => 'inline'
+        else
+          send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+            :type => detect_content_type(@attachment),
+            :disposition => 'attachment'    #inline can open in browser
+        end
      end
-
    else
      render_403 :message => :notice_not_authorized
    end
-
  rescue => e
    redirect_to "http:  //" + (Setting.host_name.to_s) +"/file_not_found.html"
  end
@ -428,7 +431,7 @@ private
        @attachment.container.board.course)
      @course = @attachment.container.board.course
    else
-      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion'
+      unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWorks'
        @project = @attachment.project
      end
    end
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@ -298,7 +298,6 @@ class CoursesController < ApplicationController
    else
      page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
      @results = student_homework_score(0,page_from, 10,"desc")
-      @results = paginateHelper_for_members @results, 10
    end
  end

@ -317,14 +316,11 @@ class CoursesController < ApplicationController
        when '1'
          @subPage_title = l :label_teacher_list
          @all_members = searchTeacherAndAssistant(@course)
-          #@members = paginateHelper @all_members, 10
          @members =  @all_members
        when '2'
          @subPage_title = l :label_student_list
          page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
          @all_members = student_homework_score(0,page, 10,"desc")
-          # @all_members = @course.members
-         # @members = paginateHelper_for_members @all_members, 10
          @members =  @all_members
      end
      respond_to do |format|
@ -379,11 +375,9 @@ class CoursesController < ApplicationController
      if group_id == '0'
        page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
        @results = student_homework_score(0,page, 10,@score_sort_by)
-        @results = paginateHelper_for_members @results, 10
      else
        @group = CourseGroup.find(group_id)
        @results = student_homework_score(group_id, 0, 0,@score_sort_by)
-        @results = paginateHelper @results, 10
      end
    end
  end
@ -612,32 +606,6 @@ class CoursesController < ApplicationController
    end
  end

-  def homework
-    if @course.is_public != 0 || User.current.member_of_course?(@course) || User.current.admin?
-      bids = @course.homeworks.order('created_on DESC')
-      bids = bids.like(params[:name]) if params[:name].present?
-      @bids = paginateHelper bids,10
-      @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
-      @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-   end
-
-  # 新建作业
-  def new_homework
-    @homework = Bid.new
-    @homework.safe_attributes = params[:bid]
-    @homework.open_anonymous_evaluation = 1
-    @homework.deadline = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-  end
-
  def toggleCourse
    @course_prefs = Course.find_by_extra(@course.extra)
    unless (@course_prefs.teacher == User.current || User.current.admin?)
@ -712,8 +680,8 @@ class CoursesController < ApplicationController
        "show_course_news" => true,
        "show_course_messages" => true,
        #"show_course_journals_for_messages" => true,
-        "show_bids" => true,
-        "show_homeworks" => true,
+        # "show_bids" => true,
+        # "show_homeworks" => true,
        "show_polls" => true
    }
    @date_to ||= Date.today + 1
@ -863,44 +831,32 @@ class CoursesController < ApplicationController
  end

  def student_homework_score(groupid,start_from, nums, score_sort_by)
-    #teachers = find_course_teachers(@course)
    start_from = start_from * nums
    sql_select = ""
    if groupid == 0
-      if nums == 0
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id}) GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
-      else
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id})  GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
-
-      end
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.final_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{@course.id}
+          AND student_works.user_id = members.user_id
+        ) AS score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
    else
-      sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-        WHERE members.course_id = #{@course.id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{@course.id}) AND members.user_id = homework_attaches.user_id
-        and members.course_group_id = #{groupid} AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id})
-        GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{@course.id}
-        and members.course_group_id = #{groupid} AND
-        students_for_courses.course_id = #{@course.id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{@course.id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.final_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{@course.id}
+          AND student_works.user_id = members.user_id
+        ) AS score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{@course.id} AND members.course_group_id = #{groupid} ORDER BY score #{score_sort_by}"
    end
    sql = ActiveRecord::Base.connection()
    homework_scores = Member.find_by_sql(sql_select)
@ -922,7 +878,6 @@ class CoursesController < ApplicationController
    @score_sort_by = "desc"
    page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
    @results = student_homework_score(group.id,0,0, "desc")
-    @results = paginateHelper @results, 10

  end

--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -0,0 +1,207 @@
+class HomeworkCommonController < ApplicationController
+  layout "base_courses"
+  before_filter :find_course, :only => [:index,:new,:create]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+
+  def index
+    homeworks = @course.homework_commons
+    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
+    @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
+    @homeworks = paginateHelper homeworks,20
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def new
+    @homework = HomeworkCommon.new
+    @homework.safe_attributes = params[:homework_common]
+    @homework.late_penalty = 2
+    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+
+    #匿评作业相关属性
+    @homework_detail_manual = HomeworkDetailManual.new
+    @homework_detail_manual.ta_proportion = 0.6
+    @homework_detail_manual.absence_penalty = 2
+    @homework_detail_manual.evaluation_num = 3
+    @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+    @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.homework_detail_manual = @homework_detail_manual
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def create
+    if params[:homework_common]
+      homework = HomeworkCommon.new
+      homework.name = params[:homework_common][:name]
+      homework.description = params[:homework_common][:description]
+      homework.end_time = params[:homework_common][:end_time]
+      homework.publish_time = params[:homework_common][:publish_time]
+      homework.homework_type = params[:homework_common][:homework_type]
+      homework.late_penalty = params[:late_penalty]
+      homework.user_id = User.current.id
+      homework.course_id = @course.id
+
+      homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(homework)
+
+      #匿评作业相关属性
+      homework_detail_manual = HomeworkDetailManual.new
+      homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+      homework_detail_manual.comment_status = 1
+      homework_detail_manual.evaluation_start = params[:evaluation_start]
+      homework_detail_manual.evaluation_end = params[:evaluation_end]
+      homework_detail_manual.evaluation_num = params[:evaluation_num]
+      homework_detail_manual.absence_penalty = params[:absence_penalty]
+      homework.homework_detail_manual = homework_detail_manual
+
+      if homework.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_create)
+            redirect_to homework_common_index_path(:course => @course.id)
+          }
+        end
+        return
+      end
+    end
+
+    respond_to do |format|
+      format.html {
+        flash[:notice] = l(:notice_failed_create)
+        redirect_to new_homework_common_path(:course => @course.id)
+      }
+    end
+  end
+
+  def edit
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def update
+    @homework.name = params[:homework_common][:name]
+    @homework.description = params[:homework_common][:description]
+    @homework.end_time = params[:homework_common][:end_time]
+    @homework.publish_time = params[:homework_common][:publish_time]
+    @homework.homework_type = params[:homework_common][:homework_type]
+    @homework.late_penalty = params[:late_penalty]
+    @homework.user_id = User.current.id
+    @homework.course_id = @course.id
+
+    #匿评作业相关属性
+    @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+    @homework_detail_manual.evaluation_start = params[:evaluation_start]
+    @homework_detail_manual.evaluation_end = params[:evaluation_end]
+    @homework_detail_manual.evaluation_num = params[:evaluation_num]
+    @homework_detail_manual.absence_penalty = params[:absence_penalty]
+
+    if @homework.save && @homework_detail_manual.save
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_edit)
+          redirect_to homework_common_index_path(:course => @course.id)
+        }
+      end
+      return
+    else
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_failed_edit)
+          redirect_to edit_homework_common_path(@homework)
+        }
+      end
+    end
+  end
+
+  def destroy
+    if @homework.destroy
+      respond_to do |format|
+        format.html {redirect_to homework_common_index_path(:course => @course.id)}
+      end
+    end
+  end
+
+  #开启匿评
+  #statue 1:启动成功，2：启动失败，作业总数大于等于2份时才能启动匿评，3:已开启匿评，请务重复开启,4:没有开启匿评的权限
+  def start_anonymous_comment
+    @statue =4 and return unless User.current.admin? || User.current.allowed_to?(:as_teacher,@course)
+    if @homework_detail_manual.comment_status == 1
+      student_works = @homework.student_works
+      if student_works && student_works.size >=2
+        student_works.each_with_index do |work, index|
+          user = work.user
+          n = @homework_detail_manual.evaluation_num
+          n = n < student_works.size ? n : student_works.size - 1
+          assigned_homeworks = get_assigned_homeworks(student_works, n, index)
+          assigned_homeworks.each do |h|
+            student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id)
+            student_works_evaluation_distributions.save
+          end
+        end
+        @homework_detail_manual.update_column('comment_status', 2)
+        @statue = 1
+      else
+        @statue = 2
+      end
+    else
+      @statue = 3
+    end
+  end
+
+  #关闭匿评
+  def stop_anonymous_comment
+    @homework_detail_manual.update_column('comment_status', 3)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #提示
+  def alert_anonymous_comment
+    @cur_size = 0
+    @totle_size = 0
+    if @homework_detail_manual.comment_status == 1
+      @totle_size = @course.student.count
+      @cur_size = @homework.student_works.size
+    elsif @homework_detail_manual.comment_status == 2
+      @homework.student_works.map { |work| @totle_size += work.student_works_evaluation_distributions.count}
+      @cur_size = 0
+      @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
+    end
+    @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+  #获取课程
+  def find_course
+    @course = Course.find params[:course]
+  rescue
+    render_404
+  end
+  #获取作业
+  def find_homework
+    @homework = HomeworkCommon.find params[:id]
+    @homework_detail_manual = @homework.homework_detail_manual
+    @course = @homework.course
+  rescue
+    render_404
+  end
+  #是不是课程的老师
+  def teacher_of_course
+    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+  end
+
+  def get_assigned_homeworks(student_works, n, index)
+    student_works += student_works
+    student_works[index + 1 .. index + n]
+  end
+end
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -0,0 +1,300 @@
+class StudentWorkController < ApplicationController
+  layout "base_courses"
+  include StudentWorkHelper
+  require 'bigdecimal'
+  before_filter :find_homework, :only => [:new, :index, :create]
+  before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
+  before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
+  before_filter :author_of_work, :only => [:edit, :update, :destroy]
+
+  def index
+    @order,@b_sort,@name = params[:order] || "final_score",params[:sort] || "desc",params[:name] || ""
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    #老师 || 非匿评作业 || 匿评结束 显示所有的作品
+    @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3
+    if @show_all
+      if @homework.homework_type == 1 || @is_teacher || User.current.admin?
+        @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+      else
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        if my_work.empty?
+          @stundet_works = []
+        else
+          @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+        end
+      end
+    else #学生
+      if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
+        @stundet_works = @homework.student_works.where(:user_id => User.current.id)
+      elsif @homework.homework_detail_manual.comment_status == 2 #匿评列表，显示匿评作品和我的作品
+        @is_evaluation = true
+        my_work = @homework.student_works.where(:user_id => User.current.id)
+        @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id}
+      end
+    end
+    @homework_commons = @course.homework_commons.order("created_at desc")
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    respond_to do |format|
+      format.html
+      format.xls {
+        send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
+                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@homework.name}#{l(:excel_homework_list)}.xls")
+      }
+    end
+  end
+
+  def new
+    student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    if student_work.nil?
+      @stundet_work = StudentWork.new
+      respond_to do |format|
+        format.html
+      end
+    else
+      render_403
+    end
+  end
+
+  def create
+    if params[:student_work]
+      stundet_work = StudentWork.new
+      stundet_work.name = params[:student_work][:name]
+      stundet_work.description = params[:student_work][:description]
+      stundet_work.project_id = params[:student_work][:project_id]
+      stundet_work.homework_common_id = @homework.id
+      stundet_work.user_id = User.current.id
+      stundet_work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(stundet_work)
+      if stundet_work.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_create)
+            redirect_to student_work_index_url(:homework => @homework.id)
+          }
+        end
+        return
+      end
+    end
+    respond_to do |format|
+      format.html {
+        flash[:notice] = l(:notice_failed_create)
+        redirect_to new_student_work_url(:homework => @homework.id)
+      }
+    end
+  end
+
+  def edit
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def update
+    if params[:student_work]
+      @work.name = params[:student_work][:name]
+      @work.description = params[:student_work][:description]
+      @work.project_id = params[:student_work][:project]
+      @work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@work)
+      if @work.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_edit)
+            redirect_to student_work_index_url(:homework => @homework.id)
+          }
+        end
+        return
+      end
+    end
+    respond_to do |format|
+      format.html{redirect_to edit_student_work_url(@work)}
+    end
+  end
+
+  def show
+    @score = student_work_score @work,User.current
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    if @work.destroy
+      respond_to do |format|
+        format.html {
+          redirect_to student_work_index_url(:homework => @homework.id)
+        }
+      end
+    end
+  end
+
+  #添加评分，已评分则为修改评分
+  def add_score
+    render_403 and return if User.current == @work.user #不可以匿评自己的作品
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
+    render_403 and return unless @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2)
+    @score = student_work_score @work,User.current
+    if @score
+      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+      @score.score = params[:score] if params[:score]
+      @is_new = false
+    else
+      @score = StudentWorksScore.new
+      @score.score = params[:score] if params[:score]
+      @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+      @score.user_id = User.current.id
+      @score.student_work_id = @work.id
+      role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+      User.current.admin? ? @score.reviewer_role = 1 : @score.reviewer_role = get_role_by_name(role)
+      @is_new = true
+    end
+
+    @score.save_attachments(params[:attachments])
+    render_attachment_warning_if_needed(@score)
+
+    if @score.save
+      case @score.reviewer_role
+        when 1 #教师评分：最后一个教师评分为最终评分
+          @work.teacher_score = @score.score
+          @work.final_score = @score.score
+        when 2 #教辅评分 教辅评分显示平均分
+          @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+          if @work.teacher_score.nil?
+            if @work.student_score.nil?
+              @work.final_score = @work.teaching_asistant_score
+            else
+              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
+              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              @work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        when 3 #学生评分 学生评分显示平均分
+          @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+          if @work.teacher_score.nil?
+            if @work.teaching_asistant_score.nil?
+              @work.final_score = @work.student_score
+            else
+              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
+              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              @work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+      end
+
+      if @work.save
+        respond_to do |format|
+          format.js
+        end
+      end
+    end
+  end
+
+  #添加评分的回复
+  def add_score_reply
+    @score = StudentWorksScore.find params[:score_id]
+    @jour = @score.journals_for_messages.new(:user_id => User.current.id,:notes =>params[:message], :reply_id => 0)
+    if @jour.save
+      @status = 1
+    else
+      @status = 2
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #删除评分的回复
+  def destroy_score_reply
+    @jour = JournalsForMessage.find params[:jour_id]
+    if @jour.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #为作品点赞
+  def praise_student_work
+    pt = PraiseTread.new
+    pt.user_id = User.current.id
+    pt.praise_tread_object_id = @work.id
+    pt.praise_tread_object_type = "StudentWork"
+    pt.praise_or_tread = 1
+    if pt.save
+      respond_to do |format|
+        format.js
+      end
+    else
+      render_404
+    end
+  end
+
+  private
+  #获取作业
+  def find_homework
+    @homework = HomeworkCommon.find params[:homework]
+    @course = @homework.course
+  rescue
+    render_404
+  end
+  #获取作品
+  def find_work
+    @work = StudentWork.find params[:id]
+    @homework = @work.homework_common
+    @course = @homework.course
+  rescue
+    render_404
+  end
+
+  #是不是当前课程的成员
+  #当前课程成员才可以看到作品列表
+  def member_of_course
+    render_403 unless User.current.member_of_course? @course
+  end
+
+  #判断是不是当前作品的提交者
+  #提交者 && (非匿评作业 || 未开启匿评) 可以编辑作品
+  def author_of_work
+    render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
+  end
+
+  #根据条件过滤作业结果
+  def search_homework_member homeworks,name
+    name = name.downcase
+    select_homework = homeworks.select{ |homework|
+      homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+    }
+    select_homework
+  end
+
+  def homework_to_xls items
+    xls_report = StringIO.new
+    book = Spreadsheet::Workbook.new
+    sheet1 = book.create_worksheet :name => "homework"
+    blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
+    sheet1.row(0).default_format = blue
+    sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_name),
+                          l(:excel_t_score),l(:excel_ta_score),l(:excel_n_score),l(:excel_f_score),l(:excel_commit_time)])
+    count_row = 1
+    items.each do |homework|
+      sheet1[count_row,0]=homework.user.id
+      sheet1[count_row,1] = homework.user.lastname.to_s + homework.user.firstname.to_s
+      sheet1[count_row,2] = homework.user.login
+      sheet1[count_row,3] = homework.user.user_extensions.student_id
+      sheet1[count_row,4] = homework.user.mail
+      sheet1[count_row,5] = homework.name
+      sheet1[count_row,6] = homework.teacher_score.nil? ? l(:label_without_score) : format("%.2f",homework.teacher_score)
+      sheet1[count_row,7] = homework.teaching_asistant_score.nil? ? l(:label_without_score) : format("%.2f",homework.teaching_asistant_score)
+      sheet1[count_row,8] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+      sheet1[count_row,9] = homework.final_score.nil? ? l(:label_without_score) : format("%.2f",homework.final_score)
+      sheet1[count_row,10] = format_time(homework.created_at)
+      count_row += 1
+    end
+    book.write xls_report
+    xls_report.string
+  end
+end
--- a/app/controllers/test_controller.rb
+++ b/app/controllers/test_controller.rb
@ -1,3 +1,5 @@
+require 'net/http'
+
 class TestController < ApplicationController
  
  helper :UserScore
@ -5,6 +7,10 @@ class TestController < ApplicationController

  def bootstrap; end

+  def view_office
+
+  end
+
  def zip
    homeworks_attach_path = []
    homework_id = params[:homework_id]
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -462,14 +462,14 @@ class UsersController < ApplicationController
        ids = []
        ids << Issue.where(id: act_ids, project_id: p_ids).map{|x| x.id}

-        #Bid
-        act_ids = activity.where(act_type: 'Bid').select('act_id').map{|x| x.act_id}
-        course_ids = HomeworkForCourse.where(bid_id: act_ids).select('distinct course_id').map{|x| x.course_id} 
+        #HomeworkCommon
+        act_ids = activity.where(act_type: 'HomeworkCommon').select('act_id').map{|x| x.act_id}
+        course_ids = HomeworkCommon.where(id: act_ids).select('distinct course_id').map{|x| x.course_id}
        c_ids = []
        Course.where(id: course_ids).each do |x|
          c_ids << x.id unless x.is_public !=0 && User.current.member_of_course?(x)
        end
-        ids << HomeworkForCourse.where(bid_id: act_ids, course_id: c_ids).map{|x| x.id}
+        ids << HomeworkCommon.where(id: act_ids, course_id: c_ids).map{|x| x.id}

        #Journal
        act_ids = activity.where(act_type: 'Journal').select('act_id').map{|x| x.act_id}
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@ -33,26 +33,25 @@ class ZipdownController < ApplicationController
        render file: 'public/no_file_found.html'
        return
      end
+    elsif params[:obj_class] == "HomeworkCommon"
+      homework = HomeworkCommon.find params[:obj_id]
+      render_403 if User.current.allowed_to?(:as_teacher,homework.course)
+      file_count = 0
+      homework.student_works.map { |work| file_count += work.attachments.count}
+      if file_count > 0
+        zipfile = zip_homework_common homework
+      else
+        render file: 'public/no_file_found.html'
+        return
+      end
    else
      logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!"
    end
-
-    # if zipfile
-    #   if zipfile.length > 1
-    #     @mut_down_files = zipfile #zipfile.each{|x| File.basename(x)}
-    #   else
-    #     send_file zipfile.first[:real_file], :filename => bid.name + ".zip", :type => detect_content_type(zipfile.first[:real_file])
-    #     return
-    #   end
-    # end
-
    respond_to do |format|
      format.json {
        render json: zipfile.to_json
      }
    end
-  #rescue Exception => e
-  #  render file: 'public/no_file_found.html'
  end

  #下载某一学生的作业的所有文件
@ -102,29 +101,34 @@ class ZipdownController < ApplicationController
        digests << out_file.file_digest
      end
    end
-
    homework_id = bid.id
    user_id = bid.author_id
-
-
    out_file = find_or_pack(homework_id, user_id, digests.sort){
      zipping("#{Time.now.to_i}_#{bid.name}.zip",
              bid_homework_path, OUTPUT_FOLDER)
    }
+    [{files:[out_file.file_path], count: 1, index: 1,
+      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
+     }]
+  end

-
-    # zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024)
-    # x = 0
-    #
-    #
-    # zips.each { |o|
-    #   x += 1
-    #   file = zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o[:files], OUTPUT_FOLDER
-    #   o[:real_file] = file
-    #   o[:file] = File.basename(file)
-    #   o[:size] = (File.size(file) / 1024.0 / 1024.0).round(2)
-    # }
-
+  def zip_homework_common homework_common
+    bid_homework_path = []
+    digests = []
+    homework_common.student_works.each do |work|
+      unless work.attachments.empty?
+        out_file = zip_student_work_by_user(work)
+        bid_homework_path << out_file.file_path
+        digests << out_file.file_digest
+      end
+    end
+    homework_id = homework_common.id
+    user_id = homework_common.user_id
+    out_file = find_or_pack(homework_id, user_id, digests.sort){
+      zipping("#{Time.now.to_i}_#{homework_common.name}.zip",
+              bid_homework_path, OUTPUT_FOLDER)
+    }
    [{files:[out_file.file_path], count: 1, index: 1,
      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
      size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
@ -135,8 +139,6 @@ class ZipdownController < ApplicationController
    homeworks_attach_path = []
    not_exist_file = []
    # 需要将所有homework.attachments遍历加入zip
-
-
    digests = []
    homework_attach.attachments.each do |attach|
      if File.exist?(attach.diskfile)
@ -147,12 +149,30 @@ class ZipdownController < ApplicationController
        digests << 'not_exist_file'
      end
    end
-
    out_file = find_or_pack(homework_attach.bid_id, homework_attach.user_id, digests.sort){
      zipping("#{homework_attach.user.lastname}#{homework_attach.user.firstname}_#{((homework_attach.user.user_extensions.nil? || homework_attach.user.user_extensions.student_id.nil?) ? "" : homework_attach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
    }
+  end

+  def zip_student_work_by_user work
+    homeworks_attach_path = []
+    not_exist_file = []
+    # 需要将所有homework.attachments遍历加入zip
+    digests = []
+    work.attachments.each do |attach|
+      if File.exist?(attach.diskfile)
+        homeworks_attach_path << attach.diskfile
+        digests << attach.digest
+      else
+        not_exist_file << attach.filename
+        digests << 'not_exist_file'
+      end
+    end
+    out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+      zipping("#{work.user.lastname}#{work.user.firstname}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+    }
  end


--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -1824,7 +1824,7 @@ module ApplicationHelper
  def attachment_candown attachment
    candown = false
    if attachment.container
-      if attachment.container.class.to_s != "HomeworkAttach" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
+      if attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
        project = attachment.container.project
        candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
      elsif attachment.container.is_a?(Project)
@ -1844,7 +1844,11 @@ module ApplicationHelper
          attachment.container.board.course
        course = attachment.container.board.course
        candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
-      elsif attachment.container.class.to_s=="HomeworkAttach" && attachment.container.bid.reward_type == 3
+      elsif attachment.container.class.to_s=="HomeworkAttach"
+        candown = true
+      elsif attachment.container.class.to_s=="StudentWorksScore"
+        candown = true
+      elsif attachment.container.class.to_s=="StudentWork"
        candown = true
      elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
        course = attachment.container.courses.first
@ -2110,7 +2114,7 @@ module ApplicationHelper
    # courses_link = link_to l(:label_course_practice), {:controller => 'courses', :action => 'index'}
    #users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.host_user}
    # contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'}
-    bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
+    # bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
    forum_link = link_to l(:label_forum_all), {:controller => "forums", :action => "index"}
    stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
    school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
@ -2270,4 +2274,60 @@ module ApplicationHelper
    tag_list = attachment_tag_list all_attachments
    tag_list
  end
+
+  #获取匿评相关连接代码
+  def homework_anonymous_comment homework
+    if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
+      if homework.student_works.count >= 2 #作业份数大于2
+        case homework.homework_detail_manual.comment_status
+          when 1
+            link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
+          when 2
+            link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
+          when 3
+            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
+        end
+      else
+        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+      end
+    else
+      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
+    end
+    link
+  end
+  #学生根据传入作业确定显示为编辑作品还是新建作品
+  def student_new_homework homework
+    work = cur_user_works_for_homework homework
+    if work.nil?
+      link_to l(:label_commit_homework),  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+    else
+      if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+        "<span class='fr mr10 pr_join_span '>#{l(:label_edit_homework)}</span>".html_safe
+      else
+        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
+      end
+    end
+  end
+
+  def student_anonymous_comment homework
+    if homework.homework_type == 1 && homework.homework_detail_manual
+      case homework.homework_detail_manual.comment_status
+        when 1
+          "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
+        when 2
+          "<span class='fr mr10 pr_join_span '>正在匿评中</span>".html_safe
+        when 3
+          "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
+      end
+    elsif homework.homework_type == 0
+      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
+    elsif homework.homework_type == 2
+      "<span class='fr mr10 pr_join_span '>编程作业</span>".html_safe
+    end
+  end
+
+  #获取当前用户在指定作业下提交的作业的集合
+  def cur_user_works_for_homework homework
+    homework.student_works.where("user_id = ?",User.current).first
+  end
 end
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@ -201,14 +201,13 @@ module CoursesHelper
    end
    members
  end
+
  def searchStudent project
    #searchPeopleByRoles(project, StudentRoles)
    members = []
-
    project.members.each do |m|
      if m && m.user && m.user.allowed_to?(:as_student,project)
        members << m
-
      end
    end
    members
@ -428,40 +427,19 @@ module CoursesHelper

    now > cTime
  end
+
  def find_by_extra_from_project extra
    Course.find_by_extra(try(extra))
  end
+
  #判断指定用户是不是当前课程的老师
  def is_course_teacher (user,course)
-    #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{user.id}", {:role_id => TeacherRoles}).count != 0
    user.allowed_to?(:as_teacher,course)
-    #修改为根据用户是否有发布任务的权限来判断用户是否是课程的老师
-    #is_teacher = false
-    #@membership = user.memberships.all(:conditions => Project.visible_condition(User.current))
-    #@membership.each do |membership|
-    #  unless(membership.project.project_type==0)
-    #    if user.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false)
-    #      is_teacher = true
-    #    end
-    #  end
-    #end
-    #is_teacher
  end
+
  #当前用户是不是指定课程的学生
  def is_cur_course_student course
-    #course.members.joins(:member_roles).where("member_roles.role_id IN (:role_id) and members.user_id = #{User.current.id}", {:role_id => StudentRoles}).count != 0
    User.current.logged? && User.current.member_of_course?(course) && !(User.current.allowed_to?(:as_teacher,course))
-    #修改：能新建占位且不能新建任务的角色判定为学生
-    #is_student = false
-    #@membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
-    #@membership.each do |membership|
-    #  unless(membership.project.project_type==0)
-    #    if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false)
-    #      is_student = true
-    #    end
-    #  end
-    #end
-    #is_student
  end
  #获取当前用户在指定作业下提交的作业的集合
  def cur_user_homework_for_bid bid
@ -479,61 +457,6 @@ module CoursesHelper
    homework.nil? ? [] : (homework.users + [homework.user])
  end

-  #获取指定作业的最终评分
-  #最终评分 = 学生评分的平均分 * 0.4 +教师评分 * 0.6
-  def score_for_homework homework
-    if  homework.bid.is_evaluation == 1 || homework.bid.is_evaluation == nil
-      return format("%.2f",(homework.bid.proportion * 1.0 / 100) * (teacher_score_for_homework(homework).to_f) + (1 - homework.bid.proportion * 1.0 / 100) * (student_score_for_homework(homework).to_f))
-    else
-      return teacher_score_for_homework homework
-    end
-  end
-  def score_for_homework_new homework
-    if  teacher_score_for_homework(homework) != 0
-      return teacher_score_for_homework homework
-    else
-      return student_score_for_homework homework
-    end
-  end
-  #获取作业的互评得分
-  def student_score_for_homework homework
-    #member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first
-    #if member.nil?
-    #  return "0.00"
-    #end
-    #student_stars = homework.rates(:quality).where("rater_id <> #{member.user_id}").select("stars")
-    members = searchStudent(homework.bid.courses.first)
-    user_ids = []
-    members.each do |user|
-      user_ids << user.user_id
-    end
-    student_stars = homework.rates(:quality).where("rater_id in (:user_ids)",{:user_ids => user_ids}).select("stars")
-    student_stars_count = 0
-    student_stars.each do |star|
-      student_stars_count = student_stars_count +  star.stars
-    end
-    return format("%.2f",student_stars_count / (student_stars.count == 0 ? 1 : student_stars.count))
-
-
-
-  end
-
-  #获取作业的教师评分
-  #多个教师只获取一份教师评分
-  def teacher_score_for_homework homework
-    members = searchTeacherAndAssistant(homework.bid.courses.first)
-    teacher_ids = []
-    members.each do |user|
-      teacher_ids << user.user_id
-    end
-    teacher_stars = homework.rates(:quality).where("rater_id in (:teacher_ids)",{:teacher_ids => teacher_ids}).select("stars")
-    teacher_stars_count = 0
-    teacher_stars.each do |star|
-      teacher_stars_count = teacher_stars_count +  star.stars
-    end
-    return format("%.2f",teacher_stars.count > 0 ? teacher_stars_count/teacher_stars.count : 0)
-  end
-
  #获取指定项目的得分
  def project_score project
    issue_count = project.issues.count
@ -647,11 +570,6 @@ module CoursesHelper
      end
    end

-    #message_count
-    #Board.where(course_id: @course_ids).each do |board|
-    #  activities[board.course_id]+=board.messages.where("updated_on>?", date_from).count
-    #end
-
    #message_count
    Board.where(course_id: @course_ids).each do |board|
      countmessage = 0
@ -671,24 +589,15 @@ module CoursesHelper
      end  
    end

-    #feedback_count 留言目前有问题留待下一步处理
-    #JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess|
-    #  activities[jourformess.jour_id]+=1
-    #end
-
    #homework_count
-    HomeworkForCourse.where(course_id: @course_ids).each do |homework|
-      countbid=0
-      #  @bid_ids<<homework.bid_id
-      Bid.where(id: homework.bid_id).where("created_on>?",date_from).each do |bid|
-        countbid+=1
-      end
-      activities[homework.course_id]+=countbid
-    end
-
-    #@bid_ids.each do |bid_id|
-    #  activities[] +=Bid.where(id: bid_id ).where("created_on>?",date_from).count
-    #end
+    # HomeworkForCourse.where(course_id: @course_ids).each do |homework|
+    #   countbid=0
+    #   #  @bid_ids<<homework.bid_id
+    #   Bid.where(id: homework.bid_id).where("created_on>?",date_from).each do |bid|
+    #     countbid+=1
+    #   end
+    #   activities[homework.course_id]+=countbid
+    # end

    #poll_count
    # 动态目前只统计发布的问卷，关闭的问卷不在动态内显示
@ -739,54 +648,6 @@ module CoursesHelper
    link.html_safe
  end

-  def bid_anonymous_comment bid
-    if bid.open_anonymous_evaluation == 1
-      if bid.homeworks.count >= 2
-        case bid.comment_status
-          when 0
-            link = link_to '启动匿评',  alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'fr mr10 work_edit'
-          when 1
-            link = link_to '关闭匿评', alert_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true,:class => 'fr mr10 work_edit'
-          when 2
-            link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
-        end
-      else
-        link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
-      end
-    else
-      link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
-    end
-    link
-  end
-
-  def student_new_homework bid
-    user_homework = cur_user_homework_for_bid bid
-    if user_homework && user_homework.empty?
-      link_to l(:label_commit_homework),  new_exercise_book_path(bid),:class => 'fr mr10 work_edit'
-    else
-      if bid.comment_status == 1 && bid.open_anonymous_evaluation == 1
-        "<span class='fr mr10 pr_join_span ' title='已开启匿评不能修改作品'>#{l(:label_edit_homework)}</span>".html_safe
-      else
-        link_to l(:label_edit_homework),  edit_homework_attach_path(user_homework.first.id),:class => 'fr mr10 work_edit'
-      end
-    end
-  end
-
-  def student_anonymous_comment bid
-    if bid.open_anonymous_evaluation == 1
-      case bid.comment_status
-        when 0
-          "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
-        when 1
-          "<span class='fr mr10 pr_join_span '>正在匿评中</span>".html_safe
-        when 2
-          "<span class='fr mr10 pr_join_span '>匿评已结束</span>".html_safe
-      end
-    else
-      "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
-    end
-  end
-
  def visable_attachemnts_incourse course
    return[] unless course
    result = []
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@ -0,0 +1,53 @@
+# encoding: utf-8
+module HomeworkCommonHelper
+  #迟交扣分下拉框
+  def late_penalty_option
+    type = []
+    for i in (1..5)
+      option = []
+      option << i
+      option << i
+      type << option
+    end
+    type
+  end
+
+  #教辅评分比例下拉框
+  def ta_proportion_option
+    type = []
+    i = 10
+    while  i <= 100
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
+
+  #缺评扣分
+  def absence_penalty_option
+    type = []
+    i = 1
+    while  i <= 5
+      option = []
+      option << i
+      option << i
+      type << option
+      i += 1
+    end
+    type
+  end
+
+  #根据传入作业确定跳转到开启匿评还是关闭匿评功能
+  def alert_anonyoms_path homework,homework_detail_manual
+    link = ""
+    if homework_detail_manual.comment_status == 1
+      link = start_anonymous_comment_homework_common_url homework.id
+    elsif homework_detail_manual.comment_status == 2
+      link = stop_anonymous_comment_homework_common_url homework.id
+    end
+    link
+  end
+end
--- a/app/helpers/owner_type_helper.rb
+++ b/app/helpers/owner_type_helper.rb
@ -6,4 +6,5 @@ module OwnerTypeHelper
  COMMENT = 5
  BID = 6
  JOURNALSFORMESSAGE = 7
+  HOMEWORKCOMMON = 8
 end
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@ -0,0 +1,63 @@
+# encoding: utf-8
+module StudentWorkHelper
+  def user_projects_option
+    cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1"
+    memberships = User.current.memberships.all(:conditions => cond)
+    projects = memberships.map(&:project)
+    not_have_project = []
+    not_have_project << Setting.please_chose
+    not_have_project << 0
+    type = []
+    type << not_have_project
+    projects.each do |project|
+      if project != nil
+        option = []
+        option <<  project.name
+        option <<  project.id
+        type << option
+      end
+    end
+    type
+  end
+
+  #获取指定用户对某一作业的评分结果
+  def student_work_score work,user
+    StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).first
+  end
+
+  #获取指定评分的角色
+  def student_work_score_role score
+    case score.reviewer_role
+      when 1
+        role = "教师"
+      when 2
+        role = "助教"
+      when 3
+        role = "学生"
+    end
+  end
+
+  def get_role_by_name role
+    case role
+      when "Teacher"
+        result = 1
+      when "Manager"
+        result = 1
+      when "TeachingAsistant"
+        result = 2
+      when "Student"
+        result = 3
+    end
+    result
+  end
+
+  #获取赞的总数
+  def praise_homework_count obj_id
+    PraiseTread.where("praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").count
+  end
+
+  #判断指定用户是不是已经赞过该作业
+  def is_praise_homework user_id, obj_id
+    PraiseTread.where("user_id = #{user_id} AND praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").empty?
+  end
+end
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@ -72,7 +72,7 @@ class Attachment < ActiveRecord::Base
  @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")

  before_save :files_to_final_location
-  after_create :be_user_score ,:act_as_forge_activity# user_score
+  after_create :office_conver, :be_user_score ,:act_as_forge_activity# user_score
  after_update :be_user_score
  after_destroy :delete_from_disk,:down_user_score

@ -258,6 +258,15 @@ class Attachment < ActiveRecord::Base
    filename
  end

+  def office_conver
+    saved_path = File.join(Rails.root, "files", "convered_office")
+    unless Dir.exist?(saved_path)
+      Dir.mkdir(saved_path)
+    end
+    convered_file = File.join(saved_path, self.disk_filename + ".html")
+    OfficeConverTask.new.conver(self.diskfile, convered_file)
+  end
+
  # Copies the temporary file to its final location
  # and computes its MD5 hash
  def files_to_final_location
--- a/app/models/course.rb
+++ b/app/models/course.rb
@ -10,7 +10,7 @@ class Course < ActiveRecord::Base
  #belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
  belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
  belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
-  has_many :bid
+  # has_many :bid
  has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
  has_many :memberships, :class_name => 'Member'
  has_many :member_principals, :class_name => 'Member',
@ -18,9 +18,9 @@ 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 :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
+  # 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
+  # has_many :homework_for_courses, :dependent => :destroy
  has_many :student, :class_name => 'StudentsForCourse', :source => :user
  has_many :course_infos, :class_name => 'CourseInfos',:dependent => :destroy
  has_many :enabled_modules, :dependent => :delete_all
@ -29,6 +29,9 @@ class Course < ActiveRecord::Base
  has_many :news, :dependent => :destroy, :include => :author
  has_one :course_status, :class_name => "CourseStatus", :dependent => :destroy

+  has_many :homework_commons, :dependent => :destroy
+  has_many :student_works, :through => :homework_commons, :dependent => :destroy
+
  has_many :course_groups, :dependent => :destroy

  acts_as_taggable
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@ -0,0 +1,31 @@
+#老师布置的作业表
+#homework_type: 0:普通作业;1:匿评作业;2:编程作业
+class HomeworkCommon < ActiveRecord::Base
+  # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id
+  include Redmine::SafeAttributes
+  include ApplicationHelper
+
+  belongs_to :course
+  belongs_to :user
+  has_one :homework_detail_manual, :dependent => :destroy
+  has_one :homework_detail_programing, :dependent => :destroy
+  has_many :homework_tests, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
+  has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
+  acts_as_attachable
+  acts_as_event :title => Proc.new {|o| "#{l(:label_course_homework)} ##{o.id}: #{o.name}" },
+                :description => :description,
+                :author => :author,
+                :url => Proc.new {|o| {:controller => 'student_work', :action => 'index', :homework => o.id}}
+  after_create :act_as_activity
+  after_destroy :delete_kindeditor_assets
+
+  def act_as_activity
+    self.acts << Activity.new(:user_id => self.user_id)
+  end
+  #删除对应的图片
+  def delete_kindeditor_assets
+    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::HOMEWORKCOMMON
+  end
+end
--- a/app/models/homework_detail_manual.rb
+++ b/app/models/homework_detail_manual.rb
@ -0,0 +1,7 @@
+#手动评分作业表
+#comment_status: 1:未开启匿评，2：开启匿评，3：匿评结束
+class HomeworkDetailManual < ActiveRecord::Base
+   attr_accessible :ta_proportion, :comment_status, :evaluation_start, :evaluation_end, :evaluation_num, :absence_penalty, :homework_common_id
+
+  belongs_to :homework_common
+end
--- a/app/models/homework_detail_programing.rb
+++ b/app/models/homework_detail_programing.rb
@ -0,0 +1,5 @@
+class HomeworkDetailPrograming < ActiveRecord::Base
+  attr_accessible :language, :standard_code, :homework_common_id
+
+  belongs_to :homework_common
+end
--- a/app/models/homework_test.rb
+++ b/app/models/homework_test.rb
@ -0,0 +1,5 @@
+class HomeworkTest < ActiveRecord::Base
+  attr_accessible :input, :output, :homework_common_id
+
+  belongs_to :homework_common
+end
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@ -29,6 +29,7 @@ class JournalsForMessage < ActiveRecord::Base
  belongs_to :jour, :polymorphic => true
  belongs_to :user
  belongs_to :homework_attach
+  belongs_to :student_works_score
  belongs_to :at_user, :class_name => "User", :foreign_key => 'reply_id'

  acts_as_event :title => Proc.new {|o| "#{l(:label_my_message)}"},
--- a/app/models/member.rb
+++ b/app/models/member.rb
@ -117,10 +117,11 @@ class Member < ActiveRecord::Base
  # 查找每个学生每个作业的评分
  def student_homework_score
    score_count = 0
-    homework_score = HomeworkAttach.find_by_sql("SELECT bids.name, homework_attaches.score as score
-            FROM homework_attaches, bids where homework_attaches.user_id = #{self.user_id}
-							and homework_attaches.bid_id IN (SELECT bid_id FROM homework_for_courses where course_id = #{self.course_id})
-							AND homework_attaches.bid_id = bids.id  ")
+    homework_score = StudentWork.find_by_sql("SELECT homework_commons.name,student_works.final_score as score
+      FROM student_works,homework_commons
+      WHERE student_works.homework_common_id = homework_commons.id
+      AND homework_commons.course_id = #{self.course_id}
+      AND student_works.user_id = #{self.user_id}")
    homework_score.each do |homework|
      mem_score = 0
      if homework[:score]
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -30,7 +30,7 @@ class Project < ActiveRecord::Base

  # Specific overidden Activities

-  belongs_to :homework_attach
+  has_many :student_works
  has_many :time_entry_activities
  has_many :members, :include => [:principal, :roles], :conditions => "#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}"
  has_many :memberships, :class_name => 'Member'
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@ -0,0 +1,12 @@
+#学生提交作品表
+class StudentWork < ActiveRecord::Base
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id
+
+  belongs_to :homework_common
+  belongs_to :user
+  has_many :student_works_evaluation_distributions, :dependent => :destroy
+  has_many :student_works_scores, :dependent => :destroy
+  belongs_to :project
+
+  acts_as_attachable
+end
--- a/app/models/student_works_evaluation_distribution.rb
+++ b/app/models/student_works_evaluation_distribution.rb
@ -0,0 +1,7 @@
+#学生作品匿评分配表
+class StudentWorksEvaluationDistribution < ActiveRecord::Base
+  attr_accessible :student_work_id, :user_id
+
+  belongs_to :student_work
+  belongs_to :user
+end
--- a/app/models/student_works_score.rb
+++ b/app/models/student_works_score.rb
@ -0,0 +1,10 @@
+class StudentWorksScore < ActiveRecord::Base
+  #reviewer_role: 1:教师评分;2:教辅评分;3:学生匿评
+  attr_accessible :student_work_id, :user_id, :score, :comment, :reviewer_role
+
+  belongs_to :user
+  belongs_to :student_work
+  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+
+  acts_as_attachable
+end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -75,13 +75,18 @@ class User < Principal
  has_many :homework_users
  has_many :homework_attaches, :through => :homework_users
  has_many :homework_evaluations
-
  #问卷相关关关系
  has_many :poll_users, :dependent => :destroy
  has_many :poll_votes, :dependent => :destroy
  has_many :poll, :dependent => :destroy #用户创建的问卷
  has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷
  # end
+  #作业相关关系
+  has_many :homework_commons, :dependent => :destroy
+  has_many :student_works, :dependent => :destroy
+  has_many :student_works_evaluation_distributions, :dependent => :destroy
+  has_many :student_works_scores, :dependent => :destroy
+  #end

  has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                   :after_remove => Proc.new {|user, group| group.user_removed(user)}
@ -92,7 +97,7 @@ class User < Principal
  belongs_to :auth_source
  belongs_to :ucourse, :class_name => 'Course', :foreign_key => :id  #huang
 ## added by xianbo for delete 
-  has_many :biding_projects, :dependent => :destroy
+  # has_many :biding_projects, :dependent => :destroy
  has_many :contesting_projects, :dependent => :destroy
  belongs_to :softapplication, :foreign_key => 'id', :dependent => :destroy
 ##ended by xianbo
@ -100,7 +105,7 @@ class User < Principal
 #####fq
  has_many :jours, :class_name => 'JournalsForMessage', :dependent => :destroy
  has_many :journals_messages, :class_name => 'JournalsForMessage', :foreign_key => "user_id", :dependent => :destroy
-  has_many :bids, :foreign_key => 'author_id', :dependent => :destroy
+  # has_many :bids, :foreign_key => 'author_id', :dependent => :destroy
  has_many :contests, :foreign_key => 'author_id', :dependent => :destroy
  has_many :softapplications, :foreign_key => 'user_id', :dependent => :destroy
  has_many :journals_for_messages, :as => :jour, :dependent => :destroy
@ -261,16 +266,6 @@ class User < Principal
    end
  end
  
-  # 判断用户是否加入了竞赛中 fq
-  def join_in_contest?(bid)
-    joined = JoinInContest.where('user_id = ? and bid_id =?', self.id, bid.id)
-    if joined.size > 0
-      true
-    else
-      false
-    end
-  end
-  
  ### fq
  def join_in?(course)
    joined = StudentsForCourse.where('student_id = ? and course_id = ?', self.id, course.id)
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@ -245,10 +245,10 @@ class UsersService
        "show_changesets" => true
    }
    scope = User.logged.status(status)
+    search_by = params[:search_by] ? params[:search_by] : "0"
    if params[:is_search_assitant].nil?
      #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件(bug:#2270) start
      #say by yutao: params[:user_id]这个是指谁发起的搜索么? 如果是 这个值貌似应该从session获取 怪怪的赶脚-_-!
-      search_by = params[:search_by] ? params[:search_by] : "0"
      if params[:name].present?
        if !params[:user_id].nil?
          watcher = User.watched_by(params[:user_id])
--- a/app/tasks/office_conver_task.rb
+++ b/app/tasks/office_conver_task.rb
@ -0,0 +1,12 @@
+#coding=utf-8
+#
+class OfficeConverTask
+  def conver(source_file, saved_file)
+    office = Trustie::Utils::Office.new(source_file)
+    if office.conver(saved_file)
+      Rails.logger.info "process ok: #{saved_file} "
+    end
+  end
+  handle_asynchronously :conver,:queue => 'office_conver'
+end
+
--- a/app/views/attachments/upload.js.erb
+++ b/app/views/attachments/upload.js.erb
@ -11,7 +11,4 @@ fileSpan.find('a.remove-upload')
        })
        .off('click');
 $('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
-
-//var divattach = fileSpan.find('div.div_attachments');
-//divattach.html('<%= j(render :partial => 'tags/tagEx', :locals => {:obj => @attachment, :object_flag => "6"})%>');
 <% end %>
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@ -46,8 +46,8 @@

 <div class="information_for_course" >
 	<p class="stats">
-		<%= content_tag('span',  link_to("#{@course.homeworks.count}", homework_course_path(@course)), :class => "info") %>
-		<%= content_tag('span',  l(:label_x_task, :count => @course.homeworks.count)) %>
+		<%= content_tag('span',  link_to("#{@course.homework_commons.count}", homework_common_index_path(:course => @course.id)), :class => "info") %>
+		<%= content_tag('span',  l(:label_x_task, :count => @course.homework_commons.count)) %>
 	</p>
 	<p class="stats">
 		<% files_count = @course.attachments.count %>
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@ -1,65 +0,0 @@
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_homework)%>
-  </h2>
-</div>
-<div class="talk_top">
-  <p class="fl">
-    <%= l(:label_totle)%><span><%= @obj_count%></span><%= l(:label_homework_count)%>
-  </p>
-  <%= link_to( l(:label_course_homework_new), new_homework_course_path(@course), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
-  <div class="cl"></div>
-</div>
-<% @bids.each do |bid|%>
-    <div class="problem_main">
-      <%= link_to(image_tag(url_to_avatar(bid.author), :width => "42", :height => "42"), user_path(bid.author), :class => "problem_pic fl") %>
-      <div class="problem_txt fl mt5">
-        <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author),:class => 'problem_name fl') %>
-        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
-        <%= link_to(bid.name, course_for_bid_path(bid), :class => 'problem_tit fl fb c_dblue') %>
-        <div class="cl mb5"></div>
-        <p class="fl "><%= l(:lebel_homework_commit)%> ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )</p>
-        <% if @is_teacher%>
-            <%= bid_anonymous_comment(bid)%>
-            <% if bid.homeworks.empty? %>
-            <%= link_to(l(:button_delete),bids_homework_path(:id => bid.id), :method => :delete, :confirm => l(:label_delete_confirm), :class => "fr mr10 work_edit") %>
-            <% end %>
-            <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %>
-        <% elsif @is_student%>
-            <%= student_anonymous_comment bid %>
-            <%= student_new_homework bid %>
-        <% end %>
-        <div class="cl"></div>
-        <script>
-            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>360){$("#bid_show_more_des_button<%= bid.id%>").show();}});
-        </script>
-        <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
-          <div id="bid_description_<%= bid.id%>_content" class="upload_img">
-            <%= bid.description.html_safe %>
-          </div>
-        </div>
-        <div class="news_foot c_red" id="bid_show_more_des_button<%= bid.id%>" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;display: none;">
-          <%= l(:button_more)%>...
-          <span class="g-arr-down"></span>
-        </div>
-        <span class="fl"><%= l(:label_end_time)%>：<%= bid.deadline%></span>
-        <% if betweentime(bid.deadline) < 0 %>
-            <span class='fr mr10 c_red '>
-              <%= l(:label_commit_limit)%>
-            </span>
-        <% else %>
-            <script type="text/javascript">
-                window.setInterval(function(){show_bid_dead_line(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"bid_deadline_<%= bid.id%>");},1000)
-            </script>
-            <div id="bid_deadline_<%= bid.id%>">
-            </div>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-    </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>
--- a/app/views/courses/new_homework.html.erb
+++ b/app/views/courses/new_homework.html.erb
@ -1,4 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= labelled_form_for @homework, :html => { :multipart => true }, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %>
-	<%= render :partial => 'bids/new_homework_form', :locals => { :bid => @homework,:bid_id => "new_bid",:f => f,:edit_mode => false } %>
-<% end %>
--- a/app/views/courses/show_member_score.js.erb
+++ b/app/views/courses/show_member_score.js.erb
@ -7,7 +7,7 @@ showModal('ajax-modal', '400px');
 //$('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+"<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: -30px;' /></a></span>");
 //$('#ajax-modal').parent().removeClass();
 $('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
 $('#ajax-modal').parent().addClass("new-watcher");
--- a/app/views/homework_common/_alert_anonyoms.html.erb
+++ b/app/views/homework_common/_alert_anonyoms.html.erb
@ -0,0 +1,42 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <% if @homework_detail_manual.comment_status == 1%>
+        <h2>开启匿评功能</h2>
+        <p>
+          开启匿评后学生将不能对作品进行
+          <span class="c_blue">修改、删除</span>
+          等操作，目前有
+          <span class="c_pink"><%= @totle_size%>个</span>
+          学生，共提交了
+          <span class="c_pink"><%= @cur_size %></span>
+          份作品，占
+          <span class="c_pink"><%= @percent %>%</span>，
+          是否确定开启匿评？
+        </p>
+    <% elsif @homework_detail_manual.comment_status == 2 %>
+        <h2>关闭匿评功能</h2>
+        <p>
+          关闭匿评后学生将不能对作品进行
+          <span class="c_blue">匿评</span>
+          ,且作品列表将会
+          <span class="c_blue">公开</span>，
+          目前分配了
+          <span class="c_pink"><%= @totle_size%>份</span>
+          匿评作品，已评了
+          <span class="c_pink"><%= @cur_size %></span>
+          份作品，占
+          <span class="c_pink"><%= @percent %>%</span>，
+          是否确定关闭匿评？
+        </p>
+    <% end %>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>
+
--- a/app/views/homework_common/_homework_common_form.html.erb
+++ b/app/views/homework_common/_homework_common_form.html.erb
@ -0,0 +1,108 @@
+<ul class="hwork_new_basic mb10">
+  <li>
+    <label class="label02 mb20">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:field_name)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[name]" id="homework_name" class="w548 h26  fl" maxlength="<%= Bid::NAME_LENGTH_LIMIT%>" onkeyup="regex_homework_name();" value="<%= homework.name%>" >
+    <p id="homework_name_span" class="c_red ml110"></p>
+  </li>
+  <div class="cl"></div>
+  <li >
+    <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
+    <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
+    <% if edit_mode %>
+        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+    <% else %>
+        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>
+    <% end %>
+  </li>
+  <div class="cl"></div>
+  <li class="mt10">
+    <label class="label02">&nbsp;&nbsp;附件：&nbsp;</label>
+    <%= render :partial => 'attachments/new_form', :locals => {:container => homework} %>
+  </li>
+  <div class="cl"></div>
+  <li class="fl">
+    <label class="label02">
+      <span class="c_red">*</span>
+      &nbsp;<%= l(:label_limit_time)%>：&nbsp;
+    </label>
+    <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.end_time%>" >
+    <%= calendar_for('homework_end_time')%>
+    <div class="cl"></div>
+  </li>
+  <li class="fl ml100" style="display: none;">
+    <label class="label02">&nbsp;发布日期：&nbsp;</label>
+    <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.publish_time%>" >
+    <%= calendar_for('homework_publish_time')%>
+    <div class="cl"></div>
+  </li>
+  <div class="cl"></div>
+</ul><!--hwork_new_basic end--->
+<div class="hwork_new_set" >
+  <p class="fl ml20 f14 mb10 c_orange">基本规则设置（总分为100分）</p>
+  <div class="cl"></div>
+    <ul class="ml10">
+      <li>
+        <label class="label02">迟交扣分：&nbsp;</label>
+        <%= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
+        <span class="fl mt5">&nbsp;分</span>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02" >是否匿评：&nbsp;</label>
+        <%= f.check_box :homework_type, :class => "mb10 mt5 fl" %>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02">评分比例：&nbsp;</label>
+        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_manual.ta_proportion), {:class => "fl mb10 h26 w70"}  %>
+        <span class="ml5 fl mt5">×&nbsp;教辅评分</span>
+        <span class="ml5 fl mt5">&nbsp;&nbsp;+&nbsp;&nbsp;</span>
+        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion* 100).to_i%>%" class="fl mb10 h26 w70" readonly>
+        <span class="ml5 fl mt5">×&nbsp;匿评得分</span>
+        <span class="ml5 fl mt5">=&nbsp;学生得分</span>
+        <div class="cl"></div>
+      </li>
+      <li >
+        <label class="label02" >&nbsp;&nbsp;</label>
+        <span class=" fl  c_red">如果教师对学生作品进行了评分，则教师评分为学生最终得分。</span>
+        <div class="cl"></div>
+      </li>
+    </ul>
+</div><!--hwork_new_set end-->
+
+<div class="hwork_new_set" id="evaluation_setting" >
+  <p class="fl ml20 f14 mb10 c_orange">学生互评设置</p>
+  <div class="cl"></div>
+  <ul class="ml10">
+    <li style="display: none;">
+      <label class="label02">互评启动时间：&nbsp;</label>
+      <input  type="text" name="evaluation_start" id="evaluation_start_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_start%>" >
+      <%= calendar_for('evaluation_start_time')%>
+      <div class="cl"></div>
+    </li>
+    <li style="display: none;">
+      <label class="label02">互评结束时间：&nbsp;</label>
+      <input  type="text" name="evaluation_end" id="evaluation_end_time" class="hwork_input02 fl" readonly="readonly" value="<%= homework.homework_detail_manual.evaluation_end%>" >
+      <%= calendar_for('evaluation_end_time')%>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <label class="label02">匿评分配数：&nbsp;</label>
+      <input  type="text" name="evaluation_num" id="evaluation_num" class=" hwork_input02 fl"  value="<%= homework.homework_detail_manual.evaluation_num%>" maxlength="2" onkeyup="regex_evaluation_num()">
+      <p class="ml5 fl mt5" id="evaluation_num_notice">每个学生将收到<span class="c_red">&nbsp;3&nbsp;</span>份待匿评作品</p>
+      <div class="cl"></div>
+    </li>
+
+    <li >
+      <label class="label02">缺评扣分：&nbsp;</label>
+      <%= select_tag :absence_penalty,options_for_select(absence_penalty_option,homework.homework_detail_manual.absence_penalty), {:class => "fl mb10 h26 w70"}  %>
+      <span class="fl mt5">&nbsp;分</span>
+      <p class="ml5 fl mt5">学生漏评1个作品将扣<span class="c_red" id="absence_penalty_notice">&nbsp;2&nbsp;</span>分</p>
+      <div class="cl"></div>
+    </li>
+  </ul> <!-- h1 end--->
+</div><!--hwork_new_set end-->
--- a/app/views/homework_common/alert_anonymous_comment.js.erb
+++ b/app/views/homework_common/alert_anonymous_comment.js.erb
@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms') %>');
+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");
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@ -0,0 +1,16 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
+
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_course_homework_edit)%>
+  </h2>
+</div>
+<div class="hwork_new">
+  <%= form_for @homework do |f| %>
+      <%= render :partial => 'homework_common/homework_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+  <% end%>
+</div><!--hwork_new end-->
+<div class="cl"></div>
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@ -0,0 +1,81 @@
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_homework)%>
+  </h2>
+</div>
+<div class="talk_top">
+  <p class="fl">
+    <%= l(:label_totle)%>
+    <span><%= @obj_count%></span>
+    <%= l(:label_homework_count)%>
+  </p>
+  <%= link_to( l(:label_course_homework_new), new_homework_common_path(:course => @course.id), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
+  <div class="cl"></div>
+</div>
+<% @homeworks.each do |homework|%>
+    <div class="problem_main">
+      <%= link_to(image_tag(url_to_avatar(homework.user), :width => "42", :height => "42"), user_path(homework.user), :class => "problem_pic fl") %>
+      <div class="problem_txt fl mt5">
+        <%= link_to(homework.user.lastname+homework.user.firstname, user_path(homework.user),:class => 'problem_name fl') %>
+        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
+        <%= link_to(homework.name, student_work_index_path(:homework => homework.id), :class => 'problem_tit fl fb c_dblue') %>
+        <div class="cl mb5"></div>
+        <p class="fl ">
+          <%= l(:lebel_homework_commit)%>
+          ( <%= link_to homework.student_works.count, student_work_index_path(:homework => homework.id), :class => 'c_red'%> )
+        </p>
+        <% if @is_teacher%>
+            <%= homework_anonymous_comment(homework)%>
+            <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
+            <%= link_to(l(:button_edit),edit_homework_common_path(homework), :class => "fr mr10 work_edit") %>
+        <% elsif @is_student%>
+            <%= student_anonymous_comment homework %>
+            <%= student_new_homework homework %>
+        <% end %>
+        <div class="cl"></div>
+        <script>
+            $(function(){if($("#bid_description_<%= homework.id%>_content").height()>360){$("#bid_show_more_des_button<%= homework.id%>").show();}});
+        </script>
+        <div  id="bid_description_<%= homework.id%>" class="news_description mt5">
+          <div id="bid_description_<%= homework.id%>_content" class="upload_img">
+            <%= homework.description.html_safe %>
+          </div>
+        </div>
+        <div class="news_foot c_red" id="bid_show_more_des_button<%= homework.id%>" onclick="bid_show_more_des(<%= homework.id%>);" style="cursor:pointer;display: none;">
+          <%= l(:button_more)%>...
+          <span class="g-arr-down"></span>
+        </div>
+
+        <div class="cl"></div>
+        <div class="mt5">
+          <% unless homework.attachments.empty?%>
+              <span class="tit_fb"  style="width: auto;"> 附件：</span>
+              <div class="fl mb5">
+                <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %>
+              </div>
+          <% end%>
+        </div>
+
+        <div class="cl"></div>
+
+        <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>
+        <% if betweentime(homework.end_time) < 0 %>
+            <span class='fr mr10 c_red '>
+              <%= l(:label_commit_limit)%>
+            </span>
+        <% else %>
+            <script type="text/javascript">
+                window.setInterval(function(){show_bid_dead_line(<%= homework.end_time.year%>,<%= homework.end_time.month%>,<%= homework.end_time.day + 1%>,"bid_deadline_<%= homework.id%>");},1000)
+            </script>
+            <div id="bid_deadline_<%= homework.id%>">
+            </div>
+        <% end %>
+      </div>
+      <div class="cl"></div>
+    </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>
--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@ -0,0 +1,17 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
+
+<div class="project_r_h">
+  <h2 class="project_h2">
+    <%= l(:label_course_homework_new)%>
+  </h2>
+</div>
+<div class="hwork_new">
+  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+      <%= hidden_field_tag "course",@course.id%>
+      <%= render :partial => 'homework_common/homework_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+  <% end%>
+</div><!--hwork_new end-->
+<div class="cl"></div>
--- a/app/views/homework_common/start_anonymous_comment.js.erb
+++ b/app/views/homework_common/start_anonymous_comment.js.erb
@ -0,0 +1,10 @@
+<% if @statue == 1%>
+alert('启动成功');
+$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "fr mr10 work_edit")%>');
+<% elsif @statue == 2 %>
+alert('启动失败\n作业总数大于等于2份时才能启动匿评');
+<% elsif @statue == 3%>
+alert("已开启匿评，请务重复开启");
+<% elsif @statue == 3%>
+alert("您没有权限开启匿评");
+<% end %>
--- a/app/views/homework_common/stop_anonymous_comment.js.erb
+++ b/app/views/homework_common/stop_anonymous_comment.js.erb
@ -0,0 +1,2 @@
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<span class="fr  pr_join_span mr10" title="匿评结束">匿评结束</span>');
+alert('关闭成功');
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@ -18,15 +18,15 @@
        <% if User.current.logged? -%>

            <li id="current_user_li">
-              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, :class => "uses_name"%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user}, target:"_blank", :class => "uses_name"%>
              <ul id="user_sub_menu" style="right: 0px;display: none;">
                <% unless User.current.projects.empty? %>
                    <li id="my_projects_li">
-                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name}, :class => "parent" %>
-                      <ul id="my_projects_ul">
+                      <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name},target:"_blank", :class => "parent" %>
+                      <ul id="my_projects_ul" >
                        <% User.current.projects.each do |project| %>
                            <li title="<%=project.name%>">
-                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
+                              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name }, target:"_blank" %>
                            </li>
                        <% end %>
                      </ul>
@ -37,11 +37,11 @@
                    <% user_course = get_user_course User.current%>
                    <% unless user_course.empty? %>
                        <li  id="my_courses_li">
-                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id}, :class => "parent"  %>
+                          <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id},target:"_blank", :class => "parent"  %>
                          <ul id="my_courses_ul">
                            <% user_course.each do |course| %>
                                <li title="<%=course.name%>">
-                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id} %>
+                                  <%= link_to course.name, {:controller => 'courses',:action => 'show',:id => course.id},target:"_blank" %>
                                </li>
                            <% end %>
                          </ul>
--- a/app/views/layouts/_user_homework_list.html.erb
+++ b/app/views/layouts/_user_homework_list.html.erb
@ -1,12 +1,5 @@
 <% if course %>
    <li id="homework_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%=course.name%>" onmouseover="homeworkSlipMenuOver(<%= course.id%>);" onmouseout="homeworkSlipMenuOut(<%= course.id%>);">
      <%= link_to course.name, course_path(course.id, host: Setting.host_course) %>
-      <ul class="homework_sub_menu" id="homework_loggedas_ul_<%= course.id%>" style="top:<%= course_index * 28.1%>px;">
-        <% course.homework_for_courses.map(&:bid).each do |bid| %>
-            <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=bid.name%>">
-              <%= link_to bid.name,  course_for_bid_path(bid, host: Setting.host_course), :target => "_blank" %>
-            </li>
-        <% end %>
-      </ul>
    </li>
 <% end %>
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -17,8 +17,8 @@
  <%= javascript_heads %>
  <%= heads_for_theme %>
  <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses'%>
-  <%= javascript_include_tag "course","header" %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'jquery/jquery-ui-1.9.2', 'courses'%>
+  <%= javascript_include_tag "course","header","attachments" %>
  <!-- page specific tags -->
  <%= yield :header_tags -%>
 </head>
@ -116,9 +116,9 @@
          <%= link_to "(#{course_activity_count @course})", course_path(@course), :class => "subnav_num c_orange"%>
        </div>
        <div class="subNav">
-          <%= link_to l(:label_homework), homework_course_path(@course), :class => "f14 c_blue02"%>
-          <%= link_to "(#{@course.homeworks.count})", homework_course_path(@course), :class => "subnav_num c_orange"%>
-          <%= link_to( "+#{l(:label_course_homework_new)}", new_homework_course_path(@course), :class => 'subnav_green c_white') if is_teacher %>
+          <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
+          <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
+          <%= link_to( "+#{l(:label_course_homework_new)}", new_homework_common_path(:course => @course.id), :class => 'subnav_green c_white') if is_teacher %>
        </div>
        <div class="subNav">
          <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02" %>
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@ -36,8 +36,13 @@
              <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
              <br />
              <div class="cl mb5"></div>
-              <div  id="news_description_<%= news.id %>" class="news_description mt5">
-                <%= news.description.html_safe %>
+              <script>
+                  $(function(){if($("#news_description_<%= news.id%>_content").height()>360){$("#news_foot_<%= news.id%>").show();}});
+              </script>
+              <div  id="news_description_<%= news.id%>" class="news_description mt5">
+                <div id="news_description_<%= news.id%>_content" class="upload_img">
+                  <%= news.description.html_safe %>
+                </div>
              </div>
              <div class="news_foot c_red"  style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
                <%= l(:button_more)%>...
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@ -0,0 +1,22 @@
+<%= form_for('new_form', :remote => true, :method => :post,:url => add_score_student_work_path(work.id)) do |f|%>
+    <li >
+      <span class="tit_fb"> 评价：</span>
+      <%= f.text_area 'user_message', :class => 'hwork_ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+      <div class="cl"></div>
+    </li>
+    <li >
+      <span class="tit_fb mt2"> 评分：</span>
+      <input type="number" name="score" id="score_<%= work.id%>" value="<%= score.nil? ? 60 : score.score%>" min="0" max="100" size="4" data-units="dollars" />
+      <span class=" ml5">分</span>
+      <div class="cl"></div></li>
+    <li >
+      <% if @is_teacher%> <!-- 老师才可以上传批阅结果 -->
+          <span class="tit_fb"> 批阅结果：</span>
+          <div>
+            <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
+          </div>
+      <%end%>
+      <a href="javascript:void(0);" class="blue_n_btn fr" onclick="$(this).parent().parent().submit();">提交</a>
+      <div class="cl"></div>
+    </li>
+<% end%>
--- a/app/views/student_work/_add_score_reply.html.erb
+++ b/app/views/student_work/_add_score_reply.html.erb
@ -0,0 +1,4 @@
+<%= form_for('', :remote => true, :method => :post,:url => add_score_reply_student_work_index_path(:score_id => score.id)) do |f|%>
+    <%= f.text_area 'message', :class => 'ping_text', :placeholder => l(:text_caracters_maximum,:count=>250),:maxlength => 250 %>
+    <a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
+<% end%>
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -0,0 +1,27 @@
+<!-- 匿评作品列表，显示某一个作品的信息 -->
+<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+  <% is_my_work = student_work.user == User.current%>
+  <li style="min-height: 1px;width: 65px;">
+    <% if is_my_work%>
+        <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+        <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
+    <% else%>
+        <%= link_to "--", "javascript:void(0)",:class => "c_grey hwork_center"%>
+    <% end%>
+  </li>
+  <li>
+    <% if is_my_work%>
+        <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name %>
+    <% else%>
+        <%= link_to "匿名","javascript:void(0)",:class => "c_blue02 hwork_name"%>
+    <% end%>
+  </li>
+  <li class=" hwork_tit_e" style="width: 440px">
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
+  </li>
+  <% my_score = student_work_score(student_work,User.current) %>
+  <li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= my_score.nil? ? "--" : format("%.2f",my_score.score)%>
+  </li>
+  <div class="cl"></div>
+</ul><!---hwork_ul end-->
--- a/app/views/student_work/_evaluation_work_title.html.erb
+++ b/app/views/student_work/_evaluation_work_title.html.erb
@ -0,0 +1,12 @@
+<li class="w70 ">
+  <span href="javascript:void(0);" class="c_dark f14 fb fl ml15 ">学号</span>
+</li>
+<li class="w70">
+  <span class="c_dark f14 fb fl ">学生姓名</span>
+</li>
+<li class="hwork_tit_e">
+  <span class="c_dark f14 fb fl">作品名称</span>
+</li>
+<li class="w70 mr5" >
+  <%= link_to "我的评分","javascript:void(0)",:class => "c_dark f14 fb fl"%>
+</li>
--- a/app/views/student_work/_jour_replay.html.erb
+++ b/app/views/student_work/_jour_replay.html.erb
@ -0,0 +1,20 @@
+<div class="ping_back  mt10" id="jour_replay_<%= jour.id%>">
+  <%= link_to image_tag(url_to_avatar(jour.user), :width => "32", :height => "32"), user_path(jour.user),:class => "st_img fl" %>
+  <div class="ping_back_tit">
+    <a href="javascript:void(0);" class="c_blue fl" >
+      <%= link_to jour.user.show_name, user_path(jour.user), :title => jour.user.show_name, :class => "c_blue fl" %>
+    </a>
+    <% if jour.user==User.current || User.current.admin? %>
+        <%= link_to(l(:label_bid_respond_delete), destroy_score_reply_student_work_index_path(:jour_id => jour.id),
+                    :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete), :class => "fr c_purple")  %>
+    <% end %>
+    <span class=" fr c_grey mr10">
+        <%=format_time jour.created_on %>
+      </span>
+    <div class="cl mb5"></div>
+    <p class="break_word">
+      <%= jour.notes%>
+    </p>
+  </div><!---ping_box_tit end--->
+  <div class="cl"></div>
+</div><!---ping_back end--->
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@ -0,0 +1,72 @@
+<div class="show_hwork_arrow"></div>
+<div class="show_hwork">
+<ul>
+  <li class="fl">
+    <span class="tit_fb">上交时间：</span>
+    <%=format_time @work.created_at %>
+  </li>
+
+  <% if !@is_teacher && @work.user == User.current && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1) %>
+      <!-- 我的作业 && (非匿评作业 || 为开启匿评)，显示编辑和删除按钮 -->
+      <li class="fr" >
+        <%= link_to("", student_work_path(@work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>
+      </li>
+      <li class="fr" >
+        <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
+      </li>
+  <% end%>
+  <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%>
+      <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->
+      <li class="fr" id="student_work_praise_<%= @work.id%>">
+        <%= render :partial => 'student_work_praise' %>
+      </li>
+  <% end%>
+  <div class="cl"></div>
+
+  <!--<li >-->
+    <!--<span class="tit_fb"> 参与人员：</span>-->
+    <!--程梦雯&nbsp;&nbsp;王强-->
+  <!--</li>-->
+  <% if @work.project%>
+      <li >
+        <span class="tit_fb"> 关联项目：</span>
+        <%= link_to( @work.project.name, project_path(@work.project.id), :class => "c_blue02" )%>
+      </li>
+  <% end%>
+  <li >
+    <span class="tit_fb ">内容：</span>
+    <p class="show_hwork_p break_word">
+      <%= @work.description%>
+    </p>
+    <div class="cl"></div>
+  </li>
+  <li >
+    <span class="tit_fb"> 附件：</span>
+    <% if @work.attachments.empty?%>
+        <span style="color: #999999">尚未提交附件</span>
+    <% else%>
+        <div class="fl">
+          <%= render :partial => 'work_attachments', :locals => {:attachments => @work.attachments} %>
+        </div>
+    <% end%>
+  </li>
+  <div class="cl"></div>
+
+  <% if @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+      <!-- 老师 || 匿评作业 && 开启匿评状态 && 不是当前用户自己的作品 -->
+      <div id="add_student_score_<%= @work.id%>" class="mt10    ">
+        <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
+      </div>
+  <% end%>
+</ul>
+
+<div class="ping_box" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+  <%@work.student_works_scores.order("created_at desc").each do |score|%>
+      <div id="work_score_<%= score.id%>">
+        <%= render :partial => 'student_work_score',:locals => {:score => score}%>
+      </div>
+  <% end%>
+</div><!---ping_box end--->
+<a href="javascript:void(0);" class="fr c_blue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
+<div class="cl"></div>
+</div><!---show_hwork end--->
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@ -0,0 +1,37 @@
+<!-- 作品列表，显示某一个作品的信息 -->
+<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+  <li style="min-height: 1px;width: 65px;">
+    <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+    <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
+  </li>
+  <li>
+    <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name%>
+  </li>
+  <li class=" hwork_tit">
+    <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+  </li>
+  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
+  </li>
+  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
+  </li>
+  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> student_score_info">
+    <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
+    <% unless student_work.student_score.nil?%>
+        <span class="c_blue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+        </span>
+        <div class="info_ni">
+          现共有
+          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
+          名学生进行了匿评，平均分为
+          <span class="c_red">&nbsp;<%= format("%.2f",student_work.student_score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
+  <li class=" hwork_code02 <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
+    <%= student_work.final_score.nil? ? "--" : format("%.2f",student_work.final_score)%>
+  </li>
+  <div class="cl"></div>
+</ul><!---hwork_ul end-->
--- a/app/views/student_work/_student_work_attachment_form.html.erb
+++ b/app/views/student_work/_student_work_attachment_form.html.erb
@ -0,0 +1,35 @@
+<div class="fl">
+  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
+  </span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{work.id}",
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{work.id}');",
+                       :style => 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all),
+                               :containerid => "#{work.id}"
+                       } %>
+    <span id="upload_file_count<%= work.id%>">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+  </span>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
--- a/app/views/student_work/_student_work_praise.html.erb
+++ b/app/views/student_work/_student_work_praise.html.erb
@ -0,0 +1,5 @@
+<% if is_praise_homework User.current.id,@work.id  %>
+    <%= link_to "赞(#{praise_homework_count @work.id})",praise_student_work_student_work_path(@work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%>
+<% else %>
+    <%= link_to "赞(#{praise_homework_count @work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%>
+<% end %>
--- a/app/views/student_work/_student_work_score.html.erb
+++ b/app/views/student_work/_student_work_score.html.erb
@ -0,0 +1,32 @@
+<ul class="ping_box_ul ping_line">
+  <% show_real_name = @is_teacher || score.user == User.current || score.user.allowed_to?(:as_teacher,@course) %>
+  <%= link_to image_tag(url_to_avatar(show_real_name ? score.user : ""), :width => "34", :height => "34"), show_real_name ? user_path(score.user) : "javascript:void(0)",:class => "ping_pic fl" %>
+  <div class="ping_box_tit">
+    <%= link_to show_real_name ? score.user.show_name : "匿名", show_real_name ? user_path(score.user) : "javascript:void(0)", :title => show_real_name ? score.user.show_name : "匿评用户", :class => "c_blue fl" %>
+    <span class="ml5 fl">（<%= student_work_score_role score%>）</span>
+    <span class="ml20 fl">评分：</span>
+    <a href="javascript:void(0);" class="c_orange fl" ><%= score.score%>分</a>
+    <a href="javascript:void(0);" class="fr c_purple mr5" onclick="$('#add_score_reply_<%= score.id%>').slideToggle();">回复</a>
+          <span class=" fr c_grey mr20">
+            <%=format_time score.created_at %>
+          </span>
+    <div class="cl mb5"></div>
+    <p class="break_word">
+      <%= score.comment%>
+    </p>
+    <div class="cl"></div>
+    <%= render :partial => 'work_attachments', :locals => {:attachments => score.attachments} %>
+    <div class="cl"></div>
+    <div id="add_score_reply_<%= score.id%>" class="undis">
+      <%= render :partial => 'add_score_reply',:locals => {:score => score}%>
+    </div>
+    <div class="cl"></div>
+
+    <div id="replay_histroy_<%= score.id%>">
+      <% score.journals_for_messages.order("created_on desc").each do |jour|%>
+          <%= render :partial => 'jour_replay',:locals => {:jour => jour}%>
+      <% end%>
+    </div>
+  </div>
+  <div class="cl"></div>
+</ul>
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@ -0,0 +1,33 @@
+<li class="w70 ">
+  <span href="javascript:void(0);" class="c_dark f14 fb fl  ">学号</span>
+</li>
+<li class="w70">
+  <span class="c_dark f14 fb fl ">学生姓名</span>
+</li>
+<li class="hwork_tit">
+  <span class="c_dark f14 fb fl">作品名称</span>
+</li>
+<li class="w70 mr5" >
+  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+  <% if @show_all && @order == "teacher_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="w70 mr5">
+  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+  <% if @show_all && @order == "teaching_asistant_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="w60 mr5 ml10">
+  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+  <% if @show_all && @order == "student_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
+<li class="w40 ml10" id="final_sort">
+  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+  <% if @show_all && @order == "final_score"%>
+      <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
+  <% end%>
+</li>
--- a/app/views/student_work/_work_attachments.html.erb
+++ b/app/views/student_work/_work_attachments.html.erb
@ -0,0 +1,5 @@
+<% for attachment in attachments %>
+    <%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
+    <span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
+    <div class="cl"></div>
+<% end -%>
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@ -0,0 +1,29 @@
+$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @score}) %>");
+$('#score_<%= @work.id%>').peSlider({range: 'min'});
+
+<% if @is_new%>
+    $("#score_list_<%= @work.id%>").prepend("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% else %>
+    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% end%>
+$("#score_list_<%= @work.id%>").removeAttr("style");
+
+<% if @is_teacher %>
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'student_work',:locals => {:student_work => @work}) %>");
+<% else %>
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_work',:locals => {:student_work => @work}) %>");
+<% end%>
+
+
+$(function(){
+    $(".student_score_info").bind("mouseover",function(e){
+        //alert($(this).html());
+        $(this).find("div").show();
+        $(this).find("div").css("top",e.pageY);
+        $(this).find("div").css("left",e.pageX);
+    });
+    $(".student_score_info").bind("mouseout",function(e){
+        //alert($(this).html());
+        $(this).find("div").hide();
+    });
+});
--- a/app/views/student_work/add_score_reply.js.erb
+++ b/app/views/student_work/add_score_reply.js.erb
@ -0,0 +1,6 @@
+$("#add_score_reply_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'add_score_reply', :locals => {:score => @score}) %>");
+<% if @status && @status == 1%>
+    $("#replay_histroy_<%= @score.id%>").prepend("<%= escape_javascript(render :partial => 'jour_replay', :locals => {:jour => @jour}) %>");
+<% else%>
+    alert("回复内容不能为空");
+<% end%>
--- a/app/views/student_work/destroy_score_reply.js.erb
+++ b/app/views/student_work/destroy_score_reply.js.erb
@ -0,0 +1 @@
+$("#jour_replay_<%= @jour.id%>").remove();
--- a/app/views/student_work/edit.html.erb
+++ b/app/views/student_work/edit.html.erb
@ -0,0 +1,60 @@
+<div class="project_r_h">
+  <h2 class="project_h2">编辑作品</h2>
+</div>
+<div class="Newwork">
+  <!--<div id="tb_" class="hwork_tb_">-->
+    <!--<ul>-->
+      <!--<li id="tb_1" class="hwork_hovertab" onclick="x:HoverLi(1);" >-->
+        <!--课程名称课程名称课程名</li>-->
+      <!--<li id="tb_2" class="hwork_normaltab" onclick="i:HoverLi(2);">-->
+        <!--成员</li>-->
+    <!--</ul>-->
+  <!--</div>-->
+  <div class="hwork_ctt">
+    <div class="hwork_dis" id="tbc_01">
+      <%= labelled_form_for @work do |f|%>
+      <div class="N_con">
+        <p>
+          <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+          <input type="text" name="student_work[name]" id="student_work_name" class="bo  fl" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <a href="javascript:void(0)" class="fl ml10 mt3"  onclick="show_project();" >项目信息
+            <img class="ml5 " src="/images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
+          </a>
+        <div class="cl"></div>
+        <p id="student_work_name_span" class="c_red ml90 mb10"></p>
+        </p>
+        <div class="cl"></div>
+
+        <p id="about_project" class="about_project" style="<%= @work.project.nil? ? '' : 'display:block;'%>">
+          <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+          <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"}  %>
+        </p>
+        <div class="cl"></div>
+
+        <p>
+          <label class="fl">
+            <span class="c_red">*</span>
+            &nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
+          </label>
+          <textarea  name="student_work[description]" placeholder="最多3000个汉字(或6000个英文字符)" id="student_work_description"  class="w620 hwork_txt"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
+        </p>
+        <div class="cl"></div>
+        <p>
+          <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+          <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>
+        </p>
+        <div class="cl"></div>
+        <p class="ml80 ">
+          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
+          <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>
+        <div class="cl"></div>
+        </p>
+      </div><!---创建作业内容结束-->
+      <% end%>
+
+    </div>
+  </div>
+</div>
+</div><!--新建作业结束-->
+<div class="cl"></div>
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@ -0,0 +1,124 @@
+<div class="project_r_h">
+  <div id="menu_r">
+    <ul class="menu_r">
+      <li><a href="javascript:void(0);" class="parent">作业批次</a>
+        <ul>
+          <% @homework_commons.each_with_index { |homework_common,index |%>
+              <li>
+                <%= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
+              </li>
+          <%}%>
+        </ul>
+      </li><!---level1 end--->
+    </ul><!---menu_r end--->
+  </div>
+</div><!--contentbox end-->
+
+<div class="to_top" id="goTopBtn" style="display: none;">
+  返<br/>回<br/>顶<br/>部
+</div>
+<div class="cl"></div>
+
+<div id="contentbox">
+  <div id="tb_" class="hwork_tb_">
+    <ul>
+      <li id="tb_1" class="hwork_hovertab"  onclick="course_setting(1)">全部作品</li>
+      <li id="tb_2" class="hwork_normaltab" onclick="course_setting(2)">作业信息</li>
+    </ul>
+  </div>
+<div class="cl"></div>
+
+<div class="ctt">
+  <div class="dis" id="tbc_01">
+    <div class="code_list">
+      <span class="fl mt3">
+        <%= link_to "所有作品(<span class='c_red'>#{@stundet_works.count}</span>)".html_safe,student_work_index_path(:homework => @homework.id), :class => "fl"%>
+      </span>
+      <% if @show_all%>
+        <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
+      <% end%>
+      <% if @is_teacher%>
+          <div class="fr">
+            <% if @homework.student_works.empty?%>
+                <%= link_to "附件", "javascript:void(0)", class: "down_btn fr", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
+            <% else%>
+                <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
+                            remote: true, class: "down_btn fr", :id => "download_homework_attachments" %>
+            <% end%>
+
+            <%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%>
+            <span class="mt3 fr " style="color:#136b3b;">导出全部：</span>
+          </div>
+      <% end%>
+      <div class="cl"></div>
+    </div><!---code_list end--->
+    <ul class="hwork_ul">
+      <% if @is_evaluation.nil?%>
+          <%= render :partial => 'student_work_title'%>
+      <% else%>
+          <%= render :partial => 'evaluation_work_title'%>
+      <% end%>
+    </ul><!---hwork_ul end-->
+    <div class="cl"></div>
+
+    <% @stundet_works.each do |student_work|%>
+        <%= render :partial => (@is_evaluation ? 'evaluation_work' :'student_work'),:locals => {:student_work => student_work}%>
+        <div id="about_hwork_<%= student_work.id%>" ></div>
+    <% end%>
+
+    <div class="cl"></div>
+  </div><!---tbc_01 end-->
+
+  <div class="undis" id="tbc_02">
+    <div class="problem_main mt10">
+      <%= link_to(image_tag(url_to_avatar(@homework.user), :width => "42", :height => "42"), user_path(@homework.user), :class => "problem_pic fl") %>
+      <div class="problem_txt fl mt5">
+        <h4 class="r_txt_tit mb5">
+            <%= @homework.name%>
+        </h4>
+        <% if @is_teacher%>
+            <%= homework_anonymous_comment(@homework)%>
+            <%= link_to(l(:button_edit),edit_homework_common_path(@homework), :class => "fr mr10 work_edit") %>
+        <% else%>
+            <%= student_anonymous_comment @homework %>
+            <%= student_new_homework @homework %>
+        <% end %>
+
+        <div class="cl"></div>
+        <div  id="bid_description_<%= @homework.id%>" class="mt5 upload_img">
+          <%= @homework.description.html_safe %>
+        </div>
+
+        <div class="cl"></div>
+        <div class="mt5">
+          <% unless @homework.attachments.empty?%>
+              <span class="tit_fb"  style="width: auto;"> 附件：</span>
+              <div class="fl mb5">
+                <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => @homework.attachments} %>
+              </div>
+          <% end%>
+        </div>
+
+        <div class="cl"></div>
+        <span class="fl">截止时间：<%= @homework.end_time%></span>
+        <div >
+          <% if betweentime(@homework.end_time) < 0 %>
+            <span class='fr mr10 c_red '>
+              <%= l(:label_commit_limit)%>
+            </span>
+          <% else %>
+              <script type="text/javascript">
+                  window.setInterval(function(){show_bid_dead_line(<%= @homework.end_time.year%>,<%= @homework.end_time.month%>,<%= @homework.end_time.day + 1%>,"bid_deadline_<%= @homework.id%>");},1000)
+              </script>
+              <div id="bid_deadline_<%= @homework.id%>">
+              </div>
+          <% end %>
+        </div>
+      </div> <!--problem_txt end-->
+      <div class="cl"></div>
+    </div><!--problem_main end-->
+  </div><!---tbc_02 end-->
+
+
+</div><!--ctt end-->
+</div><!--contentbox end-->
--- a/app/views/student_work/new.html.erb
+++ b/app/views/student_work/new.html.erb
@ -0,0 +1,51 @@
+<div class="project_r_h">
+  <h2 class="project_h2">创建作品</h2>
+</div>
+<div class="Newwork">
+  <div class="hwork_ctt">
+    <div class="hwork_dis" id="tbc_01">
+      <%= form_for(@stundet_work,
+                   :html => { :multipart => true },
+                   :url => {:controller => 'student_work',
+                            :action => 'create',
+                            :homework => @homework.id
+                   }) do |f|%>
+          <div class="N_con">
+            <p>
+              <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <%= f.text_field "name", :required => true, :size => 60, :class => "bo  fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %>
+              <a href="javascript:void(0)" class="fl ml10 mt3"  onclick="show_project();" >项目信息
+                <img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
+              </a>
+              <div class="cl"></div>
+              <p id="student_work_name_span" class="c_red ml90 mb10"></p>
+            </p>
+            <div class="cl"></div>
+            <p id="about_project" class="about_project" >
+              <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "bo02 mb10"}  %>
+            </p>
+            <div class="cl"></div>
+            <p>
+              <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <%= f.text_area "description", :class => "w620 hwork_txt ", :maxlength => 3000, :placeholder => "最多3000个汉字", :onkeyup => "regexStudentWorkDescription();"%>
+              <div class="cl"></div>
+              <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
+            </p>
+            <div class="cl"></div>
+            <p>
+              <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
+              <%= render :partial => 'attachments/new_form' %>
+            </p>
+            <div class="cl"></div>
+            <p class="ml80 ">
+              <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="new_student_work();">提交作品</a>
+              <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>
+            <div class="cl"></div>
+            </p>
+          </div><!---创建作业内容结束-->
+      <% end%>
+    </div>
+  </div>
+</div><!--新建作业结束-->
+<div class="cl"></div>
--- a/app/views/student_work/praise_student_work.js.erb
+++ b/app/views/student_work/praise_student_work.js.erb
@ -0,0 +1 @@
+$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise')%>');
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@ -0,0 +1,7 @@
+if($("#about_hwork_<%= @work.id%>").children().length > 0)
+  {$("#about_hwork_<%= @work.id%>").html("");}
+else
+  {
+      $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'show') %>");
+      $('#score_<%= @work.id%>').peSlider({range: 'min'});
+  }
--- a/app/views/users/_course_form.html.erb
+++ b/app/views/users/_course_form.html.erb
@ -27,7 +27,7 @@
                        <%= l(:label_homework) %>
                        (
                        <span class="">
-                            <%= link_to (membership.course.homeworks.count), {:controller => 'courses', :action => 'homework', :id => membership.course.id} %>
+                            <%= link_to (membership.course.homework_commons.count), homework_common_index_path(:course => membership.course.id) %>
                        </span>
                        )
                        &nbsp;&nbsp;
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -45,7 +45,7 @@
            <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
            <% act = e.act %>
            <% unless act.nil? %>
-                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>
+                <% if e.act_type == 'JournalsForMessage' || e.act_type == 'HomeworkCommon' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>

                    <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
                    <tr>
@ -119,52 +119,28 @@
                            <div style="display: inline-block; float: right; margin-top: 0px"></div>
                          </td>
                        </tr>
-                    <% when 'Bid' %>
+                    <% when 'HomeworkCommon' %>
                        <tr>
-                          <% if act.reward_type == 3 && @show_course == 1 %>
-                              <% if e.user == User.current %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
-                                    </strong>
+                          <% if e.user == User.current %>
+                              <td colspan="2" valign="top">
+                                <strong>
+                                  <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
+                                </strong>
                                                    <span class="font_lighter">
                                                        <%= l(:label_i_new_activity) %>
                                                    </span>
-                                    <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
-                                  </td>
-                              <% else %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to(h(e.user), user_path(e.user_id)) %>
-                                    </strong>&nbsp;
+                                <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), student_work_index_path(:homework => e.act_id) %>
+                              </td>
+                          <% else %>
+                              <td colspan="2" valign="top">
+                                <strong>
+                                  <%= link_to(h(e.user), user_path(e.user_id)) %>
+                                </strong>&nbsp;
                                                    <span class="font_lighter">
                                                        <%= l(:label_new_activity) %>
                                                    </span>&nbsp;
-                                    <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
-                                  </td>
-                              <% end %>
-                          <% else %>
-                              <% if e.user == User.current %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
-                                    </strong>
-                                                    <span class="font_lighter">
-                                                      <%= l(:label_i_new_activity) %>
-                                                    </span>
-                                    <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                  </td>
-                              <% else %>
-                                  <td colspan="2" valign="top">
-                                    <strong>
-                                      <%= link_to(h(e.user), user_path(e.user_id)) %>
-                                    </strong>&nbsp;
-                                                    <span class="font_lighter">
-                                                      <%= l(:label_new_activity) %>
-                                                    </span>&nbsp;
-                                    <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
-                                  </td>
-                              <% end %>
+                                <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), student_work_index_path(:homework => e.act_id) %>
+                              </td>
                          <% end %>
                        </tr>
                        <tr>
@ -177,7 +153,7 @@
                          <td>
                            <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
                                              <span class="font_lighter">
-                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
+                                                <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_at)).to_s %>
                                              </span>
                            </div>
                            <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@ -140,9 +140,7 @@
              <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
              <% all_new_hot_course += find_all_new_hot_course(course_count-all_new_hot_course.count, @school_id, year_now, course_term)%>
          <% end%>
-          <% cache all_new_hot_course.max().created_at do %>
-             <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
-          <% end %>
+         <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
        </ul>
      </div>
  <% else %>
@ -175,9 +173,7 @@
                  <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
                  <% all_new_hot_course += find_all_new_hot_course(9-(all_new_hot_course.count + cur_school_course.count), @school_id, year_now, course_term)%>
              <% end%>
-              <% cache all_new_hot_course.max().created_at do %>
-                <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
-              <% end %>
+            <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
          <% end %>
        </ul>
      </div>
@ -195,7 +191,6 @@
  </h3>
  <span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
  <% topics = find_new_forum_topics(10) %>
-  <%# cache topics.maximum(:created_at) do%>
  <div class="d-p-projectlist-box">
    <ul class="d-p-projectlist">

@ -233,8 +228,7 @@

    </ul>
  </div>
-  <%# end %>
 </div>
 <div class="clearfix"></div>

-<%= render partial: 'link_to_another' %>
+<%= render partial: 'link_to_another' %>
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@ -68,7 +68,6 @@
 </div>

 <div style="clear:both"></div>
-<% cache :expire_in => 2.hours do%>
 <div id="J_Slide" class="d-p-index-box d-p-index-hot">
 	<h3 style="margin-left: 5px; color: #e8770d;"><strong> <%= l(:lable_hot_projects)%> </strong></h3>
 	<span style="margin-top: -20px;float: right; display: block;"> <% if User.current.logged? %>
@ -113,7 +112,6 @@
 		</ul>
 	</div>
 </div>
-<% end %>
 <div class="right" style="float: right; width: 48%; padding-top: 8px;">
 	<ul class="welcome-message-list">
 		<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
@ -123,7 +121,6 @@
 		</div>
 		<div class="welcome-box-list-new memo_activity">
 			<% topics = find_new_forum_topics(12) %>
-            <% cache topics.maximum(:created_at) do%>
 		    <% topics.includes(:forum, :last_reply, :author).each do |topic|%>
                <li class="message-brief-intro" style="line-height:1.4em;">
                    <div class='memo_title text_nowrap'>
@ -153,10 +150,9 @@
                    </div>
                </li>
              <% end %>
-            <% end %>
 		</div>
 	</ul>
 </div>

 <div class="clearfix"></div>
-<%= render partial: 'link_to_another' %>
+<%= render partial: 'link_to_another' %>
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -12,7 +12,10 @@ zh:
  notice_account_wrong_password: 密码错误
  name_can_be_empty: 可以不填写真实姓名[保密所需]
  notice_successful_create: 创建成功
+  notice_failed_create: 创建失败
  notice_successful_update: 更新成功
+  notice_successful_edit: 修改成功
+  notice_failed_edit: 修改失败
  notice_successful_delete: 删除成功
  notice_failed_delete: 删除失败
  notice_successful_connection: 连接成功
@ -881,7 +884,6 @@ zh:
  button_copy_and_follow: 复制并转到新问题
  button_annotate: 追溯

-  button_edit: 编辑
  button_configure: 配置
  button_quote: 引用
  button_duplicate: 副本
@ -1224,7 +1226,7 @@ zh:
  no_attachmens_allowed: 提交作业不能为空

  button_bidding_homework: 参加竞标 #huang
-  field_homework_type: 提交形式    #bai
+  field_homework_type: ""    #bai
  label_homework_respond: 作业情况

  label_bid_me: 我要应标
@ -1544,6 +1546,7 @@ zh:
  label_course_new_homework: 新建作业
  label_course_homework_list: 作业列表
  label_course_homework_new: 发布作业
+  label_course_homework_edit: 修改作业
  label_course_news_new: 发布通知
  label_fork_homework_new: 选为作业
  #wang
@ -1800,7 +1803,9 @@ zh:
  excel_mail: 电子邮箱
  excel_homework_name: 作品名
  excel_t_score: 教师评分
+  excel_ta_score: 教辅评分
  excel_n_score: 匿名评分
+  excel_f_score: 成绩
  excel_commit_time: 提交时间
  excel_homework_score: 作业积分
  excel_class: "班级:"
--- a/config/routes.rb
+++ b/config/routes.rb
@ -26,9 +26,6 @@
 # Example: :via =>  :get ====> :via => :get

 RedmineApp::Application.routes.draw do
-
-  #match '/discuss_demos/new',:to => 'discuss_demo#create',:via =>[:post]
-  #match '/discuss_demo/show',:to => 'discuss_demo#show'
  mount Mobile::API => '/api'

  resources :homework_users
@ -80,6 +77,28 @@ RedmineApp::Application.routes.draw do
    end
  end

+  resources :homework_common, :except => [:show]do
+    member do
+      get 'start_anonymous_comment'
+      get 'stop_anonymous_comment'
+      get 'alert_anonymous_comment'
+    end
+    collection do
+
+    end
+  end
+
+  resources :student_work do
+    member do
+      post 'add_score'
+      get 'praise_student_work'
+    end
+    collection do
+      post 'add_score_reply'
+      get 'destroy_score_reply'
+    end
+  end
+
  resources :contest_notification

  resources :open_source_projects do
@ -110,6 +129,7 @@ RedmineApp::Application.routes.draw do
    match 'courselist'
    match 'zip'
    match 'mailer'
+    match 'view_office'
  end
  ##new added by linchun #以发布应用的形式参与竞赛
  resources :softapplications do
@ -123,13 +143,6 @@ RedmineApp::Application.routes.draw do
    end
  end

-  #resources :notificationcomments do
-  #
-  #end
-
-  #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
-  # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
  ## new added by linchun #新竞赛相关
  resources :contests, only: [:index] do
    resources :contestnotifications do
@ -172,13 +185,6 @@ RedmineApp::Application.routes.draw do
  match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
  match '/contestnotifications/preview', :to => 'previews#contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]

-  #resource :previews, only: [] do
-  #  collection do
-  #    match 'news', :via => [:get, :post, :put]
-  #    match 'issue', :via => [:get, :post, :put]
-  #  end
-  #end
-
  resources :stores do
    collection do
      match 'search', :via =>  [:get, :post]
@ -251,7 +257,7 @@ RedmineApp::Application.routes.draw do
  post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
  post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
  # boards end
-  delete 'bids/homework', :to => 'bids#homework_destroy'
+  # delete 'bids/homework', :to => 'bids#homework_destroy'

  # Misc issue routes. TODO: move into resources
  match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
@ -283,7 +289,6 @@ RedmineApp::Application.routes.draw do
      match 'user_projects', :to => 'users#user_projects',  :via => :get
      match 'user_activities', :to => 'users#user_activities',  :via => :get, :as => "user_activities"
      match 'user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "user_newfeedback"
-      match 'watch_calls', :to => 'users#watch_bids', :via => [:get , :post]
      match 'info', :to => 'users#info', :via => [:get , :post], :as => 'user_info'
      match 'user_watchlist', :to => 'users#user_watchlist',  :via => :get, :as => "user_watchlist" #add by huang
      match 'user_fanslist', :to => 'users#user_fanslist',  :via => :get, :as => "user_fanslist" #add by huang
@ -317,7 +322,6 @@ RedmineApp::Application.routes.draw do
  end
  match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
  match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
-  #match 'user/:id/watch_calls', :controller => 'users', :action => 'watch_bids', :via => [:get , :post]

  #end
  match 'my/account',  :via => [:get, :post]
@ -357,14 +361,6 @@ RedmineApp::Application.routes.draw do
  post 'appliedproject/applied', :to => 'applied_project#applied_join_project', :as => 'appliedproject'
  delete 'appliedproject/applied', :to => 'applied_project#unapplied_join_project'

-  resources :bids, :only=>[:edit,:update,:show] do
-    member do
-      match 'homework_ajax_modal'
-      get 'start_anonymous_comment', as: 'start_anonymous_comment'
-      get 'stop_anonymous_comment', as: 'stop_anonymous_comment'
-      get 'alert_anonymous_comment'
-    end
-  end
  resources :projects do
    member do
      match 'change_project_type', :via =>  [:get, :post]
@ -380,9 +376,6 @@ RedmineApp::Application.routes.draw do
      get 'invite_members_by_mail', :action=> 'invite_members_by_mail'
      get 'send_mail_to_member', :action => 'send_mail_to_member'
      match 'user_watcherlist', :to => 'projects#watcherlist',  :via => :get, :as => "watcherlist" #add by huang
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
-      #get 'news', :action => 'news', :as => 'news'
      #end
      post 'modules'
      post 'archive'
@ -400,19 +393,7 @@ RedmineApp::Application.routes.draw do
    match '/member', :to => 'projects#member',  :as => 'member', :via => :get
    match '/file', :to => 'projects#file',  :as => 'file', :via => :get
    match '/statistics', :to => 'projects#statistics',  :as => 'statistics', :via => :get
-    #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
-    match '/homework', :to => 'projects#homework', :as => 'homework', :via => :get
-    
-    #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
-    #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
-    #   match '/', :controller => 'projects', :action => 'show', :as => 'project_show', :via => :get
-    #   get 'projects/:project_id/show', :to => 'projects#show', :as => 'project_show'
-    #   get 'projects/:project_id/repository', :to => 'repositories#show', :as => 'project_repository'
-
-    #   match '/show', :controller => 'projects', :action => 'show',  :as => 'project_show', :via => :get
    match '/watcherlist', :to=>'projects#watcherlist', :as => 'watcherlist', :via => :get  #add by huang
-    # matche '/news', :controller => 'news', :action => 'index', :as => 'news', :via => :get
-    #end

    resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
      collection do
@ -683,8 +664,6 @@ RedmineApp::Application.routes.draw do
    member do
      get 'settings(/:tab)', :action => 'settings', :as => 'settings'
      get 'search_member', :action => 'search_member'
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
      get 'file', :action => 'file', :as => 'file'
      get 'feedback', :action => 'feedback', :as => 'course_feedback'
      get 'member', :controller => 'courses', :action => 'member', :as => 'member'
@ -756,7 +735,6 @@ RedmineApp::Application.routes.draw do
  match 'delete_avatar', :to => 'avatar#delete_image',:via => :post
  # Endof Tao's code
  get 'robots.txt', :to => 'welcome#robots'
-  #match 'welcome/course', :to => 'welcome#course'
  ##############测试留言功能    fq
  post 'words/new', :to => 'words#new'
  post 'words/create', :to => 'words#create'
@ -767,70 +745,21 @@ RedmineApp::Application.routes.draw do
  get 'words/more', :to => 'words#more'
  get 'words/back', :to=> 'words#back'
  get 'words/destroyJournal', :to => 'words#destroyJournal'
-  ############## fq
-  post 'calls/create', :to => 'bids#create'
-  delete 'calls/destroy', :to => 'bids#destroy'
-  match 'calls/new', :to => 'bids#new', :via => [:get , :post]
-  get 'calls/more', :to => 'bids#more'
-  get 'calls/back', :to=> 'bids#back'
-  match 'calls/new_bid', :to => 'bids#new_bid'
-  match 'contest/new_contest', :to => 'bids#new_contest' #huang
-  match 'calls/:id/show_project', :to => 'bids#show_project', :as => 'project_for_bid'
-  match 'calls/:id/show_course', :to => 'bids#show_courseEx', :as => 'course_for_bid'  # nwb added
-  match 'calls/:id/new_exercise_book', :to => 'homework_attach#new', :as => 'new_exercise_book'
-  match 'calls/:id/add', :to => 'bids#add'
-  match 'calls/:id/delete', :to => 'bids#delete'
-  match 'calls/:id/add_homework', :to => 'bids#add_homework', :via =>  :post
-  match 'calls/:id/new_submit_homework', :to => 'bids#new_submit_homework', :via =>  :get, :as => 'new_submit_homework'
  match 'words/add_project_respond', :to => 'words#add_project_respond'
  match 'words/:id/leave_project_message', :to => 'words#leave_project_message'
-
  match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
-  match 'calls/create_bid', :to => 'bids#create_bid'
-  match 'contest/create_contest', :to => 'bids#create_contest' #huang
-  match 'calls/create_homework', :to => 'bids#create_homework'
-  match 'calls/:id/homework_respond', :to => 'bids#homework_respond'
-  match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
-  match 'calls/:id/fork', :to => 'bids#fork', :as => 'fork'
-  match 'calls/:id/create_fork', :to => 'bids#create_fork'
-
-  match 'calls/:id/show_course', :to => 'bids#show_course', :as => 'show_course'
-  match 'calls/:id/show_bid_project', :to => 'bids#show_bid_project', :as => 'show_bid_project'
-  match 'calls/:id/show_bid_user', :to => 'bids#show_bid_user', :as => 'show_bid_user'
-
  match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share

  post 'join_in/join', :to => 'courses#join', :as => 'join'
  delete 'join_in/join', :to => 'courses#unjoin'
  post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
  delete 'join_in/join_group', :to => 'courses#unjoin_group'
-  post 'calls/:id/join_in_contest', :to => 'bids#join_in_contest', :as => 'join_in_contest'
-  delete 'calls/:id/join_in_contest', :to => 'bids#unjoin_in_contest'
-  match 'calls/:id/show_participator', :to => 'bids#show_participator'  # bai
-  match 'calls/:id/update_contest', :to => 'bids#update_contest'    # bai
-  match 'calls/:id/settings', :to => 'bids#settings'    # bai

  delete 'attachment/:id', :to => 'attachments#delete_homework'
  match 'new_join', :to => 'courses#new_join', :as => 'try_join'
  match 'new_join_group', :to => 'courses#new_join_group', :as => 'try_join_group'
-  match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
+  # match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
  match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
-  match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]
-
-
-  #added by william
-  # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results'
-  # match 'calls/:id/set_prizes',:controller => 'bids',:action => 'set_prizes',:as => 'set_prizes'
-  match 'calls/:id/set_reward',:to => 'bids#set_reward',:as => 'set_reward'
-
-  # added by young
-  match 'calls', :to => 'bids#index'
-
-  match 'calls/:id', :to => 'bids#show', :as => 'respond'
-  # modified by longjun
-  # bids#contests is not exist
-  # match 'contest', :to => 'bids#contests', :as => 'contest' #modified @20140403
-  # end longjun

  ########################
  ##added by wen##########
@ -838,7 +767,6 @@ RedmineApp::Application.routes.draw do
  get 'welcome/search', to: 'welcome#search'
  get 'school/index', to: 'school#index'
  get 'school/:school_id', to: 'welcome#course', :as => 'school_course_list'
-  #get 'course/:school_id', to: 'welcome#course'
  post 'school/get_options/:province', :to => 'school#get_options'
  get 'school/get_options/:province', :to => 'school#get_options'

--- a/db/migrate/20150519012744_create_homework_commons.rb
+++ b/db/migrate/20150519012744_create_homework_commons.rb
@ -0,0 +1,20 @@
+class CreateHomeworkCommons < ActiveRecord::Migration
+  def up
+    create_table :homework_commons do |t|
+      t.string :name
+      t.integer  :user_id
+      t.text :description
+      t.date  :publish_time
+      t.date :end_time
+      t.integer :homework_type,  default: 1
+      t.string  :late_penalty
+      t.integer :course_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_commons
+  end
+end
--- a/db/migrate/20150519014600_create_homework_detail_manuals.rb
+++ b/db/migrate/20150519014600_create_homework_detail_manuals.rb
@ -0,0 +1,19 @@
+class CreateHomeworkDetailManuals < ActiveRecord::Migration
+  def up
+    create_table :homework_detail_manuals do |t|
+      t.float :ta_proportion
+      t.integer  :comment_status
+      t.date :evaluation_start
+      t.date  :evaluation_end
+      t.integer :evaluation_num
+      t.integer :absence_penalty,  default: 1
+      t.integer  :homework_common_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_detail_manuals
+  end
+end
--- a/db/migrate/20150519014639_create_homework_detail_programings.rb
+++ b/db/migrate/20150519014639_create_homework_detail_programings.rb
@ -0,0 +1,15 @@
+class CreateHomeworkDetailProgramings < ActiveRecord::Migration
+  def up
+    create_table :homework_detail_programings do |t|
+      t.string :language
+      t.text  :standard_code, :limit => 4294967295
+      t.integer :homework_common_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_detail_programings
+  end
+end
--- a/db/migrate/20150519020031_create_homework_tests.rb
+++ b/db/migrate/20150519020031_create_homework_tests.rb
@ -0,0 +1,15 @@
+class CreateHomeworkTests < ActiveRecord::Migration
+  def up
+    create_table :homework_tests do |t|
+      t.text :input
+      t.text  :output
+      t.integer :homework_common_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :homework_tests
+  end
+end
--- a/db/migrate/20150519022200_create_student_works.rb
+++ b/db/migrate/20150519022200_create_student_works.rb
@ -0,0 +1,21 @@
+class CreateStudentWorks < ActiveRecord::Migration
+  def up
+    create_table :student_works do |t|
+      t.string :name
+      t.text  :description
+      t.integer :homework_common_id
+      t.integer :user_id
+      t.float :final_score
+      t.float :teacher_score
+      t.float :student_score
+      t.float :teaching_asistant_score
+      t.integer :project_id, default: 0
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works
+  end
+end
--- a/db/migrate/20150519023821_create_student_works_evaluation_distributions.rb
+++ b/db/migrate/20150519023821_create_student_works_evaluation_distributions.rb
@ -0,0 +1,14 @@
+class CreateStudentWorksEvaluationDistributions < ActiveRecord::Migration
+  def up
+    create_table :student_works_evaluation_distributions do |t|
+      t.integer :student_work_id
+      t.integer  :user_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works_evaluation_distributions
+  end
+end
--- a/db/migrate/20150519030544_create_student_works_scores.rb
+++ b/db/migrate/20150519030544_create_student_works_scores.rb
@ -0,0 +1,16 @@
+class CreateStudentWorksScores < ActiveRecord::Migration
+  def up
+    create_table :student_works_scores do |t|
+      t.integer :student_work_id
+      t.integer :user_id
+      t.integer :score
+      t.text :comment
+      t.integer :reviewer_role
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :student_works_scores
+  end
+end
--- a/db/migrate/20150601032112_about_homework.rb
+++ b/db/migrate/20150601032112_about_homework.rb
@ -0,0 +1,126 @@
+#encoding=UTF-8
+class AboutHomework < ActiveRecord::Migration
+  def up
+    Bid.where("reward_type = 3").each do |bid|
+      transaction do
+        if bid.courses.first
+          # 作品基础属性
+          homework = HomeworkCommon.new
+          homework.name = bid.name
+          homework.description = bid.description
+          homework.user_id =  bid.author_id
+          homework.end_time = bid.deadline
+          homework.publish_time = bid.deadline
+          bid.open_anonymous_evaluation == 1 ? homework.homework_type = 1 : homework.homework_type = 0
+          homework.late_penalty = 0
+          homework.course_id = bid.courses.first.id
+          homework.created_at = bid.created_on
+          homework.updated_at = bid.updated_on
+          homework.save
+
+          #个人动态
+          bid.acts.each do |act|
+            act.act_type = homework.class.to_s
+            act.act_id = homework.id
+            act.save
+          end
+
+          #作业附件
+          bid.attachments.each do |attach|
+            attach.container = homework
+            attach.save
+          end
+
+          # 匿评作业相关属性
+          homework_detail_manual = HomeworkDetailManual.new
+          homework_detail_manual.ta_proportion = 0.6
+          homework_detail_manual.comment_status = bid.comment_status + 1
+          homework_detail_manual.evaluation_start = bid.created_on
+          homework_detail_manual.evaluation_end = bid.created_on
+          homework_detail_manual.evaluation_num = bid.evaluation_num
+          homework_detail_manual.absence_penalty = 0
+          homework_detail_manual.homework_common = homework
+          homework_detail_manual.save
+
+          #作品列表
+          bid.homeworks.each do |homework_attach|
+            student_work = StudentWork.new
+            student_work.name = homework_attach.name
+            student_work.description = homework_attach.description
+            student_work.user_id = homework_attach.user_id
+            student_work.project_id = homework_attach.project_id
+            student_work.homework_common = homework
+            student_work.save
+
+            #作品文件
+            homework_attach.attachments.each do |attach|
+              attach.container = student_work
+              attach.save
+            end
+
+            #作品匿评列表
+            homework_attach.homework_evaluations.each do |homework_evaluation|
+              student_work_evaluation = StudentWorksEvaluationDistribution.new
+              student_work_evaluation.user_id = homework_evaluation.user_id
+              student_work_evaluation.student_work = student_work
+              student_work_evaluation.save
+            end
+
+            #评分评论相关
+            stars_reates = homework_attach.rates(:quality)
+            if stars_reates
+              stars_reates.each do |reate|
+                student_work_score = StudentWorksScore.new
+                student_work_score.user_id = reate.rater_id
+                student_work_score.score = reate.stars * 20
+                student_work_score.student_work = student_work
+                rater = User.find reate.rater_id
+                if rater
+                  member = rater.members.where("course_id = ?",bid.courses.first.id).first
+                  if member
+                    role =  member.roles.first.name
+                    case role
+                      when "Teacher"
+                        student_work_score.reviewer_role = 1
+                      when "Manager"
+                        student_work_score.reviewer_role = 1
+                      when "TeachingAsistant"
+                        student_work_score.reviewer_role = 2
+                      when "Student"
+                        student_work_score.reviewer_role = 3
+                    end
+                  else
+                    student_work_score.reviewer_role = 3
+                  end
+                else
+                  student_work_score.reviewer_role = 3
+                end
+
+                jour = homework_attach.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{reate.rater_id}").order("created_on DESC").first
+                if jour
+                  student_work_score.comment = jour.notes
+                  student_work_score.save
+                  #老师反馈附件
+                  homework_attach.attachments.each do |attach|
+                    attach.container = student_work_score
+                    attach.save
+                  end
+                else
+                  student_work_score.save
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+    HomeworkCommon.destroy_all
+    HomeworkDetailManual.destroy_all
+    StudentWork.destroy_all
+    StudentWorksScore.destroy_all
+    StudentWorksEvaluationDistribution.destroy_all
+  end
+end
--- a/db/migrate/20150602021020_add_score_to_work.rb
+++ b/db/migrate/20150602021020_add_score_to_work.rb
@ -0,0 +1,60 @@
+class AddScoreToWork < ActiveRecord::Migration
+  require 'bigdecimal'
+
+  def up
+    count = StudentWork.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+        StudentWork.page(i).per(10).each do |work|
+          teacher_score = work.student_works_scores.where(:reviewer_role => 1).order("created_at desc")
+          unless teacher_score.empty?
+            work.teacher_score = teacher_score.first.score
+          end
+
+          teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2)
+          unless teaching_asistant_score.empty?
+            work.teaching_asistant_score = teaching_asistant_score.average(:score).try(:round, 2).to_f
+          end
+
+          student_socre = work.student_works_scores.where(:reviewer_role => 3)
+          unless student_socre.empty?
+            work.student_score = student_socre.average(:score).try(:round, 2).to_f
+          end
+
+          if work.teacher_score.nil?
+            if work.teaching_asistant_score.nil? #教辅评分为空，最终评分为学生匿评
+              work.final_score = work.student_score
+            elsif work.student_score.nil? #学生匿评评分为空，最终评分为教辅评分
+              work.final_score = work.teaching_asistant_score
+            else #都不为空，按比例来
+              final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("0.6")
+              final_s_score = BigDecimal.new("#{work.student_score}") * BigDecimal.new('0.4')
+              final_score = final_ta_score + final_s_score
+              work.final_score = format("%.2f",final_score.to_f)
+            end
+          else #教师评分不为空，最终评分为教师评分
+            work.final_score = work.teacher_score
+          end
+          work.save
+        end
+      end
+    end
+
+
+  end
+
+  def down
+    count = StudentWork.all.count / 10 + 1
+    transaction do
+      for i in 1 ... count do i
+        StudentWork.page(i).per(10).each do |work|
+          work.teacher_score = nil
+          work.teaching_asistant_score = nil
+          work.student_score = nil
+          work.final_score = nil
+          work.save
+        end
+      end
+    end
+  end
+end
--- a/db/migrate/20150602055730_remove_bid_activity.rb
+++ b/db/migrate/20150602055730_remove_bid_activity.rb
@ -0,0 +1,7 @@
+class RemoveBidActivity < ActiveRecord::Migration
+  def change
+    Activity.where(:act_type => "Bid").each do |act|
+      act.destroy
+    end
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/lib/tasks/office.rake
+++ b/lib/tasks/office.rake
@ -0,0 +1,20 @@
+namespace :office do
+  desc "conver any files to html"
+  task :conver => :environment do
+    all_count = Attachment.count
+    i = 0
+    Attachment.find_each do |a|
+      i += 1
+      puts "process [#{i}/#{all_count}] => id #{a.id}"
+      saved_path = File.join(Rails.root, "files", "convered_office")
+      unless Dir.exist?(saved_path)
+        Dir.mkdir(saved_path)
+      end
+      convered_file = File.join(saved_path, a.disk_filename + ".html")
+      office = Trustie::Utils::Office.new(a.diskfile)
+      if office.conver(convered_file)
+        puts "process ok: #{convered_file} "
+      end
+    end
+  end
+end
--- a/lib/trustie/utils/office.rb
+++ b/lib/trustie/utils/office.rb
@ -0,0 +1,42 @@
+module Trustie
+  module Utils
+    class Office
+
+      def initialize(file)
+        @file = file
+      end
+
+      def office?
+        %w(doc docx ppt pptx xls xlsx pdf).any?{|word| @file.downcase.end_with?(word)}
+      end
+
+      def conver(saved_file, force=false)
+        if force || !File.exist?(saved_file)
+          if File.exist? @file
+            if office?
+              begin
+                resource = RestClient::Resource.new(
+                 'http://192.168.80.107/Any2HtmlHandler.ashx',
+                  :timeout => -1,
+                  :open_timeout => -1
+                )
+                req = resource.post :txtDes => File.new(@file, 'rb')
+                File.open(saved_file, "wb+") do |f|
+                  f.write(req.body)
+                end
+                return true
+              rescue =>e
+                puts e.message
+              end
+            end
+          else
+            puts "can't find file #{@file}"
+          end
+        end
+        false
+      end
+
+    end
+  end
+end
+
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@ -260,7 +260,7 @@ K.options = {
 	items : [ 'emoticons',
 		'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
 		'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link',"more"
+		'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'media',"more"
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [
--- a/public/assets/kindeditor/plugins/media/media.js
+++ b/public/assets/kindeditor/plugins/media/media.js
@ -9,9 +9,9 @@

 KindEditor.plugin('media', function(K) {
 	var self = this, name = 'media', lang = self.lang(name + '.'),
-		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowMediaUpload = K.undef(self.allowMediaUpload, false),
 		allowFileManager = K.undef(self.allowFileManager, false),
-		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, false),
 		extraParams = K.undef(self.extraFileUploadParams, {}),
 		filePostName = K.undef(self.filePostName, 'imgFile'),
 		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
@ -22,10 +22,8 @@ KindEditor.plugin('media', function(K) {
 				//url
 				'<div class="ke-dialog-row">',
 				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
-				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
-				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:200px;" /> &nbsp;(<a href="http://www.youku.com/help/view/fid/4#q2">支持优酷的flash地址</a>)',
 				'<span class="ke-button-common ke-button-outer">',
-				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
 				'</span>',
 				'</div>',
 				//width
@ -38,11 +36,6 @@ KindEditor.plugin('media', function(K) {
 				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
 				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
 				'</div>',
-				//autostart
-				'<div class="ke-dialog-row">',
-				'<label for="keAutostart">' + lang.autostart + '</label>',
-				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
-				'</div>',
 				'</div>'
 			].join('');
 			var dialog = self.createDialog({
@ -72,14 +65,8 @@ KindEditor.plugin('media', function(K) {
 							heightBox[0].focus();
 							return;
 						}
-						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
-								src : url,
-								type : K.mediaType(url),
-								width : width,
-								height : height,
-								autostart : autostartBox[0].checked ? 'true' : 'false',
-								loop : 'true'
-							});
+
+						var html = '<embed src="'+url+'" allowFullScreen="true" quality="high" width="'+width+'" height="'+height+'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>';
 						self.insertHtml(html).hideDialog().focus();
 					}
 				}
--- a/public/assets/kindeditor/plugins/media/media.old.js
+++ b/public/assets/kindeditor/plugins/media/media.old.js
@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
--- a/public/images/course/arrow.png
+++ b/public/images/course/arrow.png
--- a/public/images/course/arrow_up.jpg
+++ b/public/images/course/arrow_up.jpg
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@ -897,8 +897,31 @@ $(function(){

            }
        }
+    });
+    $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
+        if(status == 'success'){
+            var res = JSON.parse(data.responseText);
+            if(res.length<1){
+                return;
+            }
+            if(res.length==1){
+                location.href = '/zipdown/download?file='+res[0].file;return;
+            }
+            document.getElementById('light').style.display='block';
+            $container = $('#light .upload_box_ul');
+            $container.empty();
+            for(var i = 0; i <res.length; ++i){
+                var des = '';
+                if(res.count > 1){
+                    des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
+                } else {
+                    des = '第'+res[i].index+'个学生的作品下载';
+                }
+                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="/zipdown/download?file='+res[i].file+'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);

-    })
+            }
+        }
+    });
 });


--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@ -2794,4 +2794,4 @@ div.repos_explain{
 	padding-bottom: 20px;
 }
 .upload_img img{max-width: 100%;}
-#activity .upload_img img{width: 580px;}
+#activity .upload_img img{max-width: 580px;}
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@ -127,14 +127,14 @@ a.re_de{ color:#6883b6; margin-left:15px;}

 /* 作业列表 */
 .ttl{ }
-.ctt{height:820px;clear:both; }
+.ctt{clear:both; }
 #contentbox{float:right;clear:both;width:670px;/*滑动门的宽度*/}
 /* TAB 切换效果 */
 .tb_{ background-color: #eaeaea; height:40px; }
 .tb_ ul{height:40px; }
 .tb_ li{float:left;height:34px;width: 90px;cursor:pointer; font-size:14px; padding-top:6px; text-align:center; }
-a.tb_all{ margin-left:212px; font-size:12px; display:block; height:23px; padding-top:4px; width:90px; color:#7a7a7a; border:1px solid #cbcbcb; background:#fff; text-align: center;}
-a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
+a.tb_all{ float:right; font-size:12px; display:block; height:18px; padding-top:2px;  width:90px; color:#ff5d31; border:1px solid #ff5d31; background:#fff; text-align: center;}
+a:hover.tb_all{ background:#ff5d31; color:#fff; text-decoration:none;}

 .work_tb_{ background-color: #eaeaea; height:40px; }
 a.work_edit{color: #64bdd9; display:block; padding:1px 5px; border:1px solid #64bdd9;}
@ -288,6 +288,18 @@ a:hover.member_btn{ background:#329cbd;}
 .ni_con p{ color:#808181;}
 .ni_con a:hover{ text-decoration:none;}
 a.xls{ margin-left:5px; color:#136b3b;}
+
+/* 开启匿评弹框 */
+.anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.ni_con { width:425px; margin:25px 30px;}
+.ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
+.ni_con p{ color:#808181; }
+.ni_con a:hover{ text-decoration:none;}
+.ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#0f99a9;}
+.c_pink{ color:#e65d5e;}
+
 /* 学生列表*/
 .st_list{ width:670px;}
 .st_search{ }
@ -343,7 +355,6 @@ a:hover.st_add{ color:#ff8e15;}
 .upload_box{ width:430px; margin:15px auto;}

 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}

 blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;}
 .respond-form{display: none;margin: auto;clear: both;}
@ -354,7 +365,7 @@ blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: br
 #attachments_fields input.description {margin-left: 4px;width: 100px;}
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
-#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px;}
+#attachments_fields input.filename {border: 0;height: 1.8em;width: 150px;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px 50%;padding-left: 18px;padding-top: 2px; white-space: nowrap; text-overflow:ellipsis;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields span {display: block;white-space: nowrap;}
 .file_selector{position: relative;opacity: 0;filter: alpha(opacity:0);}
@ -392,7 +403,7 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .ui-progressbar-value{margin:-1px;height:100%}
 .ui-widget-header{border:1px solid #628db6;background:#759fcf url(jquery/images/ui-bg_gloss-wave_35_759fcf_500x100.png) 50% 50% repeat-x;color:#fff;font-weight:bold}
 .ui-corner-left,.ui-corner-tl{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px}
-.link_file{ background:url(../images/pic_file.png) 0 7px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }
+.link_file{ background:url(../images/pic_file.png) 0 3px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }
 a:hover.link_file_board{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !important; padding-left:20px !important; color:#64bdd9 !important; }

@ -491,10 +502,7 @@ blockquote {
 }
 a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
 .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
-
-a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
-a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+.r_txt_tit{max-width:450px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}

 /*日历选择图*/
 img.ui-datepicker-trigger {
@ -549,6 +557,20 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}

+/* 20150423作业评分*/
+.ml14{ margin-left:14px;}
+.w548{ width:552px;}
+.w547{ width:544px;}
+.w196{ width:182px;}
+.w459{ width:459px;}
+.hwork_new_set{border:1px dashed #CCC; background:#f5f5f5; text-align:center; padding:10px 0; margin-bottom:10px;}
+.hwork_new_grey{background:#dbdbdb; width:610px; padding:10px 20px; margin:0 auto; text-align:left; margin-bottom:5px;}
+.hwork_new_left{ width:220px; float:left; }
+.hwork_new_right{ width:350px; float:left; margin-left:40px;}
+.w305{ width:305px;}
+.icon_add{  background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+
 /* 20150505讨论区*/
 .w664{ width:664px;}
 .w140{ width:140px;}
@ -562,7 +584,7 @@ a.talkmain_name{ color:#ff5722;}
 a:hover.talkmain_name{ color:#d33503;}
 .talkmain_tit{ color:#0781b4; width:450px; display:block; }
 .talklist_main{   }
-.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+/*.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}*/
 .talkConIpt{ background:#f2f2f2; }
 .talkWrapBox{ width:610px; margin-left:60px; }
 .inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
@ -583,12 +605,72 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 /*.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}*/
 #about_newtalk{ display:none;}

-
-
-
-
-
-
+.ml14{ margin-left:14px;}
+.w548{ width:552px;}
+.w547{ width:544px;}
+.w196{ width:196px;}
+.w459{ width:459px;}
+.hwork_new_set{border:1px dashed #CCC; background:#f5f5f5; text-align:center; padding:10px 0; margin-bottom:10px;}
+.hwork_new_grey{background:#dbdbdb; width:610px; padding:10px 20px; margin:0 auto; text-align:left; margin-bottom:5px;}
+.hwork_new_left{ width:220px; float:left; }
+.hwork_new_right{ width:350px; float:left; margin-left:40px;}
+.w305{ width:305px;}
+.icon_add{background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+
+/* 20150506上传头像*/
+.uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
+.showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
+.mr2{ margin-right:2px;}
+.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
+
+/* 20150512作品展示*/
+.hwork_ul{ height:24px; padding-top:10px;}
+.hwork_ul li{ float:left;}
+.w300{ width:300px;}
+.w80{ width:80px;}
+.t_c{ text-align:center;}
+.hwork_tit{ width:240px; float:left; }
+.hwork_tit a{ width:255px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_tit_e{ width:440px; float:left; }
+.hwork_tit_e a{ width:455px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_code{ width:60px; text-align:center; margin-right:15px;}
+.hwork_code02{ width:60px; text-align:center; margin-right:10px;}
+a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.hwork_name{ display:block;width:65px;  margin-right:10px;overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
+.show_hwork ul li{ margin-bottom:5px;}
+.show_hwork_arrow{ position:relative; top:2px; left:25px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
+.tit_fb{ font-weight:bold; width:66px; text-align:right; display:block; float:left;}
+.ml160{ margin-left:160px;}
+.show_hwork_p{ width:580px; float:left;}
+.hwork_ping_text{ float:left; border:1px solid #e4e4e4; padding:5px; width:568px; height:50px;}
+.ping_box{ width:626px; padding:10px; background:#f5f3f3;  }
+a.ping_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.ping_pic{border:1px solid #64bdd9;}
+.ping_box_tit{ float:left; width:575px; margin-left:10px;}
+.ping_box_ul{}
+.ping_line{ border-bottom:1px dashed #CCCCCC; padding-bottom:8px; margin-bottom:8px;}
+.ping_text{border:1px solid #CCCCCC; margin:5px; padding:5px; width:560px; height:50px; }
+.ping_back_tit{ float:left; width:523px; margin-left:10px; }
+a.down_btn{ border:1px solid #CCC; color:#999; padding:0px 5px; font-size:12px; text-align:center; display:block;}
+a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
+.fr{ float:right;}
+.min_search{ width:200px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 185px -193px no-repeat; cursor:pointer;}
+.li_min_search{ float:right; margin-right:-10px;}
+.info_ni{ width:100px; padding:5px;position: absolute;display:none;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left;}
+/*返回顶部*/
+.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}
+
+/* 评分插件 */
+input#score{ width:40px;}
+.ui-slider{position:relative;width:200px;float:left;margin-right:10px;height:14px; margin-top:2px;background:#e2e2e2; }
+.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:0.5em;height:1.6em;top:-.2em;margin-left:-.5em;cursor:pointer;background:#64bdd9;}
+.ui-slider .ui-slider-handle:hover,.ui-slider .ui-slider-handle:focus{background:#64bdd9;}
+.ui-slider .ui-slider-handle:active{background-image:none;}
+.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;top:0;height:100%;background:#64bdd9;left:0;}
+
+.filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px;}



--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@ -6,6 +6,8 @@ table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
+a:hover {text-decoration: none;  }
+textarea {resize: none;}

 /*常用*/
 select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
@ -34,6 +36,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .fmYh{font-family:"MicroSoft Yahei";}
 .font999{ color:#999;}
 .fontRed{color:#770000;}
+.text_c{ text-align:center;}

 /* Float & Clear */
 .cl{ clear:both; overflow:hidden; }
@ -77,6 +80,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
+.mt30{ margin-top: 30px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
 .mb20{ margin-bottom:20px;}
@ -134,6 +138,7 @@ a.c_green{ color:#28be6c;}
 .b_grey{ background: #F5F5F5;}
 .b_dgrey{ background: #CCC;}
 .c_orange{color:#e8770d;}
+.c_dark{ color:#2d2d2d;}
 .c_lorange{ color:#ff9900;}
 .c_purple{color: #6883b6;}
 .c_blue{ color:#15bccf;}
@ -154,7 +159,7 @@ a.green_btn{background:#28be6c;color:#fff;font-size:14px; font-weight:normal; pa
 a:hover.green_btn{ background:#14ad5a;}
 .blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;}
 a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;}
-a:hover.blue_btn{ background:#329cbd;}
+a:hover.blue_btn{ background:#329cbd;cursor: pointer;}
 a.orange_btn{  background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; }
 a:hover.orange_btn{ background:#d63502;}

@ -170,6 +175,9 @@ a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;}
 .blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
 a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;}
 a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
+.blue_n_btn{ background:#64bdd9; color:#fff; font-weight:normal;padding:2px 10px; text-align:center;}
+a.blue_n_btn{background:#64bdd9;color:#fff;font-weight:normal; padding:2px 10px; text-align:center;}
+a:hover.blue_n_btn{ background:#329cbd;}

 .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
@ -186,6 +194,7 @@ a:hover.blue_u_btn{background:#64bdd9; color:#fff;}
 .pic_mes{ display:block; background:url(../images/new_project/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
 .pic_img{ display:block; background:url(../images/new_project/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
 .pic_del{ display:block; background:url(../images/new_project/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
+.pic_del:hover{  background:url(../images/new_project/public_icon.png) -32px -235px no-repeat; }
 .pic_stats{display:block; background:url(../images/new_project/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
 .pic_files{display:block; background:url(../images/new_project/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
 .pic_text{display:block; background:url(../images/new_project/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}
				`@ -0,0 +1 @@`
				`$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise')%>');`